[PATCH] cvsps: better use if commitids (when present) to detect changesets

[Bryan O'Sullivan]

On Mon, Jan 14, 2013 at 1:13 PM, Frank Kingswood
<frank at kingswood-consulting.co.uk> wrote:
>
> cvsps: better use if commitids (when present) to detect changesets
> split one cvs test for cvs 1.12 and earlier

This looks cleaner, and the test suite passes under CVS 1.12.
Unfortunately, there are new test failures with 1.11:

Failed test-convert-cvs.t: output changed
Failed test-convert-cvs-branch.t: output changed

--- /data/users/bryano/hg/hg-crew/tests/test-convert-cvs.t
+++ /data/users/bryano/hg/hg-crew/tests/test-convert-cvs.t.err
@@ -1,6 +1,8 @@

   $ "$TESTDIR/hghave" cvs || exit 80
   $ "$TESTDIR/hghave" cvs112 && exit 80
+  skipped: missing feature: cvs client/server >= 1.12
+  [1]
   $ cvscall()
   > {
   >     cvs -f "$@"

ERROR: /data/users/bryano/hg/hg-crew/tests/test-convert-cvs.t output changed
!
--- /data/users/bryano/hg/hg-crew/tests/test-convert-cvs-branch.t
+++ /data/users/bryano/hg/hg-crew/tests/test-convert-cvs-branch.t.err
@@ -67,27 +67,36 @@
   collecting CVS rlog
   7 log entries
   creating changesets
-  4 changeset entries
+  7 changeset entries
   sorting...
   converting...
-  3 Initial revision
-  2 mod a
-  1 mod b
-  0 mod a again
+  6 Initial revision
+  5 init
+  4 init
+  3 mod a
+  2 mod b
+  1 mod a again
+  0 Initial revision
   updating tags

 Check the result

   $ hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n'
-  o  4 () update tags files: .hgtags
+  o  7 () update tags files: .hgtags
   |
-  | o  3 (BRANCH) mod a again files: a
+  o  6 () Initial revision files: b
+  |
+  | o  5 (BRANCH) mod a again files: a
   | |
-  | o  2 (BRANCH) mod b files: b
+  | o  4 (BRANCH) mod b files: b
   | |
-  | o  1 (BRANCH) mod a files: a
+  | o  3 (BRANCH) mod a files: a
+  | |
+  | | o  2 (v0) init files: b
+  | |/
+  | o  1 (v0) init files:
   |/
-  o  0 () Initial revision files: a b
+  o  0 () Initial revision files: a