Patchwork [3,of,3,stable] tests: test-convert-cvs-synthetic.t requires cvs 1.12

login
register
mail settings
Submitter Mads Kiilerich
Date Nov. 17, 2013, 12:57 a.m.
Message ID <3e7bfab558c78fb486a2.1384649853@localhost.localdomain>
Download mbox | patch
Permalink /patch/3004/
State Superseded
Headers show

Comments

Mads Kiilerich - Nov. 17, 2013, 12:57 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1384649813 18000
#      Sat Nov 16 19:56:53 2013 -0500
# Branch stable
# Node ID 3e7bfab558c78fb486a297edf0292ad0004b011b
# Parent  1c6f532e2965a133ba7780891e6f65e3b179bb58
tests: test-convert-cvs-synthetic.t requires cvs 1.12

9589227657bc introduced hghave cvs112 10 months ago. Let's assume it has
stabilized so much that we can start using it now.
Mads Kiilerich - Nov. 17, 2013, 10:59 p.m.
On 11/16/2013 07:57 PM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1384649813 18000
> #      Sat Nov 16 19:56:53 2013 -0500
> # Branch stable
> # Node ID 3e7bfab558c78fb486a297edf0292ad0004b011b
> # Parent  1c6f532e2965a133ba7780891e6f65e3b179bb58
> tests: test-convert-cvs-synthetic.t requires cvs 1.12

On 11/17/2013 05:46 PM, Augie Fackler wrote:
 > ... I'm going to defer the cvs one to someone that
 > knows cvs things

I am not that someone, but I can add some observations that seemed too 
vague to include in the commit message:

Adding print statements the right places and running on Fedora with 
1.11.x and Ubuntu with 1.12.x shows that 1.11.x don't include commitids 
... and that seems to explain why the test is failing on Fedora.

The code that added commitid support says:
             if match.group(7): # cvs 1.12 commitid
                 e.commitid = match.group(8)

Wikipedia says

Stable release     1.11.23 / May 8, 2008; 5 years ago
Preview release     1.12.13 / July 26, 2006; 7 years ago

CVS - the stable VCS!

/Mads


On 11/16/2013 07:57 PM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1384649813 18000
> #      Sat Nov 16 19:56:53 2013 -0500
> # Branch stable
> # Node ID 3e7bfab558c78fb486a297edf0292ad0004b011b
> # Parent  1c6f532e2965a133ba7780891e6f65e3b179bb58
> tests: test-convert-cvs-synthetic.t requires cvs 1.12
>
> 9589227657bc introduced hghave cvs112 10 months ago. Let's assume it has
> stabilized so much that we can start using it now.
>
> diff --git a/tests/test-convert-cvs-synthetic.t b/tests/test-convert-cvs-synthetic.t
> --- a/tests/test-convert-cvs-synthetic.t
> +++ b/tests/test-convert-cvs-synthetic.t
> @@ -1,6 +1,6 @@
>   This feature requires use of builtin cvsps!
>   
> -  $ "$TESTDIR/hghave" cvs || exit 80
> +  $ "$TESTDIR/hghave" cvs112 || exit 80
>     $ echo "[extensions]" >> $HGRCPATH
>     $ echo "convert = " >> $HGRCPATH
>     $ echo "graphlog = " >> $HGRCPATH
Matt Mackall - Jan. 13, 2014, 11:41 p.m.
On Sat, 2013-11-16 at 19:57 -0500, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1384649813 18000
> #      Sat Nov 16 19:56:53 2013 -0500
> # Branch stable
> # Node ID 3e7bfab558c78fb486a297edf0292ad0004b011b
> # Parent  1c6f532e2965a133ba7780891e6f65e3b179bb58
> tests: test-convert-cvs-synthetic.t requires cvs 1.12

Not really happy with this, but lacking a better fix, I'm going to go
ahead and stick it into default. Thanks.

Patch

diff --git a/tests/test-convert-cvs-synthetic.t b/tests/test-convert-cvs-synthetic.t
--- a/tests/test-convert-cvs-synthetic.t
+++ b/tests/test-convert-cvs-synthetic.t
@@ -1,6 +1,6 @@ 
 This feature requires use of builtin cvsps!
 
-  $ "$TESTDIR/hghave" cvs || exit 80
+  $ "$TESTDIR/hghave" cvs112 || exit 80
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "convert = " >> $HGRCPATH
   $ echo "graphlog = " >> $HGRCPATH