changeset 14182:ec5886db9dc6

tests: fix deprecated use of hg debugdata/debugindex For filelogs, debugindex and debugdata can be called with the file name directly instead of the path to the revlog. Since in the future filelogs will no longer be valid revlogs, calling with a path to the revlog is deprecated for debugdata. For debugindex it is expected to still work, but I changed them as well for consistency.
author Sune Foldager <cryo@cyanite.org>
date Wed, 04 May 2011 13:37:41 +0200
parents fa2b596db182
children 333def42e785
files tests/test-changelog-exec.t tests/test-clone-r.t tests/test-commit-copy.t tests/test-copy.t tests/test-copy2.t tests/test-encode.t tests/test-excessive-merge.t tests/test-extra-filelog-entry.t tests/test-filebranch.t tests/test-flags.t tests/test-issue522.t tests/test-merge-commit.t tests/test-merge7.t tests/test-rename-merge1.t tests/test-revlog-packentry.t tests/test-strip-cross.t
diffstat 16 files changed, 49 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-changelog-exec.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-changelog-exec.t	Wed May 04 13:37:41 2011 +0200
@@ -48,6 +48,6 @@
   
   
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       5      0       1 b004912a8510 000000000000 000000000000
--- a/tests/test-clone-r.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-clone-r.t	Wed May 04 13:37:41 2011 +0200
@@ -37,22 +37,22 @@
   $ hg mv afile anotherfile
   $ hg commit -m "0.3m"
 
-  $ hg debugindex -f 1 .hg/store/data/afile.i
+  $ hg debugindex -f 1 afile
      rev flag   offset   length     size   base   link     p1     p2       nodeid
        0 0000        0        3        2      0      0     -1     -1 362fef284ce2
        1 0000        3        5        4      1      1      0     -1 125144f7e028
        2 0000        8        7        6      2      2      1     -1 4c982badb186
        3 0000       15        9        8      3      3      2     -1 19b1fc555737
 
-  $ hg debugindex .hg/store/data/adifferentfile.i
+  $ hg debugindex adifferentfile
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      75      0       7 2565f3199a74 000000000000 000000000000
 
-  $ hg debugindex .hg/store/data/anotherfile.i
+  $ hg debugindex anotherfile
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      75      0       8 2565f3199a74 000000000000 000000000000
 
-  $ hg debugindex .hg/store/data/fred.i
+  $ hg debugindex fred
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
 
--- a/tests/test-commit-copy.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-commit-copy.t	Wed May 04 13:37:41 2011 +0200
@@ -10,7 +10,7 @@
 
   $ hg debugrename foo
   foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       6      0       0 26d3ca0dfd18 000000000000 000000000000
        1         6       7      1       1 d267bddd54f7 26d3ca0dfd18 000000000000
--- a/tests/test-copy.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-copy.t	Wed May 04 13:37:41 2011 +0200
@@ -52,7 +52,7 @@
 
 this should show a revision linked to changeset 0
 
-  $ hg debugindex .hg/store/data/a.i
+  $ hg debugindex a
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 b789fdd96dc2 000000000000 000000000000
 
@@ -68,13 +68,13 @@
 
 this should show a revision linked to changeset 1
 
-  $ hg debugindex .hg/store/data/b.i
+  $ hg debugindex b
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      65      0       1 37d9b5d994ea 000000000000 000000000000
 
 this should show the rename information in the metadata
 
-  $ hg debugdata .hg/store/data/b.d 0 | head -3 | tail -2
+  $ hg debugdata b 0 | head -3 | tail -2
   copy: a
   copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 
--- a/tests/test-copy2.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-copy2.t	Wed May 04 13:37:41 2011 +0200
@@ -46,7 +46,7 @@
   $ hg st -C
 
 should match
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
   $ hg debugrename bar
@@ -68,13 +68,13 @@
   $ hg commit -m3
 
 should show no parents for tip
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      69      0       1 7711d36246cc 000000000000 000000000000
        1        69       6      1       2 bdf70a2b8d03 7711d36246cc 000000000000
        2        75      81      1       3 b2558327ea8d 000000000000 000000000000
 should match
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
        1         5       7      1       2 dd12c926cf16 2ed2a3912a0b 000000000000
--- a/tests/test-encode.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-encode.t	Wed May 04 13:37:41 2011 +0200
@@ -25,9 +25,9 @@
 
 check contents in repo are encoded
 
-  $ hg debugdata .hg/store/data/a.gz.d 0
+  $ hg debugdata a.gz 0
   this is a test
-  $ hg debugdata .hg/store/data/not.gz.d 0
+  $ hg debugdata not.gz 0
   THIS IS A TEST
 
 check committed content was decoded
--- a/tests/test-excessive-merge.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-excessive-merge.t	Wed May 04 13:37:41 2011 +0200
@@ -88,7 +88,7 @@
   79d7492df40aa0fa093ec4209be78043c181f094 644   a
   79d7492df40aa0fa093ec4209be78043c181f094 644   b
 
-  $ hg debugindex .hg/store/data/a.i
+  $ hg debugindex a
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
        1         5       6      1       1 79d7492df40a 2ed2a3912a0b 000000000000
--- a/tests/test-extra-filelog-entry.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-extra-filelog-entry.t	Wed May 04 13:37:41 2011 +0200
@@ -15,7 +15,7 @@
   $ echo b > b
   $ hg qrefresh
 
-  $ hg debugindex .hg/store/data/b.i
+  $ hg debugindex b
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 1e88685f5dde 000000000000 000000000000
 
--- a/tests/test-filebranch.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-filebranch.t	Wed May 04 13:37:41 2011 +0200
@@ -99,7 +99,7 @@
 
 foo: we should have a merge here:
 
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 b8e02f643373 000000000000 000000000000
        1         3       4      1       1 2ffeddde1b65 b8e02f643373 000000000000
@@ -108,21 +108,21 @@
 
 bar: we should not have a merge here:
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 b8e02f643373 000000000000 000000000000
        1         3       4      1       2 33d1fb69067a b8e02f643373 000000000000
 
 baz: we should not have a merge here:
 
-  $ hg debugindex .hg/store/data/baz.i
+  $ hg debugindex baz
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 b8e02f643373 000000000000 000000000000
        1         3       4      1       1 2ffeddde1b65 b8e02f643373 000000000000
 
 quux: we should not have a merge here:
 
-  $ hg debugindex .hg/store/data/quux.i
+  $ hg debugindex quux
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 b8e02f643373 000000000000 000000000000
        1         3       5      1       3 6128c0f33108 b8e02f643373 000000000000
--- a/tests/test-flags.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-flags.t	Wed May 04 13:37:41 2011 +0200
@@ -135,13 +135,13 @@
   -rwxr-x---
   -rwxr-x---
 
-  $ hg debugindex .hg/store/data/a.i
+  $ hg debugindex a
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
-  $ hg debugindex ../test2/.hg/store/data/a.i
+  $ hg debugindex -R ../test2 a
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
-  $ hg debugindex ../test1/.hg/store/data/a.i
+  $ hg debugindex -R ../test1 a
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
        1         0       5      1       1 7fe919cc0336 b80de5d13875 000000000000
--- a/tests/test-issue522.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-issue522.t	Wed May 04 13:37:41 2011 +0200
@@ -48,7 +48,7 @@
   $ hg manifest --debug | grep foo
   c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo
 
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
        1         5       9      1       1 6f4310b00b9a 2ed2a3912a0b 000000000000
--- a/tests/test-merge-commit.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-merge-commit.t	Wed May 04 13:37:41 2011 +0200
@@ -34,7 +34,7 @@
 
   $ hg ci -m '3: merge with local rename'
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      77      0       2 d35118874825 000000000000 000000000000
        1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
@@ -42,7 +42,7 @@
   $ hg debugrename bar
   bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
 
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       7      0       0 690b295714ae 000000000000 000000000000
        1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
@@ -87,7 +87,7 @@
 
   $ hg ci -m '5: merge'
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      77      0       2 d35118874825 000000000000 000000000000
        1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
@@ -121,7 +121,7 @@
 
   $ hg ci -m '3: merge with remote rename'
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      77      0       2 d35118874825 000000000000 000000000000
        1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
@@ -129,7 +129,7 @@
   $ hg debugrename bar
   bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
 
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       7      0       0 690b295714ae 000000000000 000000000000
        1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
@@ -174,7 +174,7 @@
 
   $ hg ci -m '5: merge'
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      77      0       2 d35118874825 000000000000 000000000000
        1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
--- a/tests/test-merge7.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-merge7.t	Wed May 04 13:37:41 2011 +0200
@@ -104,7 +104,7 @@
   >>>>>>> other
   three
 
-  $ hg debugindex .hg/store/data/test.txt.i
+  $ hg debugindex test.txt
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       7      0       0 01365c4cca56 000000000000 000000000000
        1         7       9      1       1 7b013192566a 01365c4cca56 000000000000
--- a/tests/test-rename-merge1.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-rename-merge1.t	Wed May 04 13:37:41 2011 +0200
@@ -67,7 +67,7 @@
 
   $ hg ci -m "merge"
 
-  $ hg debugindex .hg/store/data/b.i
+  $ hg debugindex b
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      67      0       1 57eacc201a7f 000000000000 000000000000
        1        67      72      1       3 4727ba907962 000000000000 57eacc201a7f
--- a/tests/test-revlog-packentry.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-revlog-packentry.t	Wed May 04 13:37:41 2011 +0200
@@ -15,7 +15,7 @@
   adding foo
   created new head
 
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
        1         0      24      0       1 0376abec49b8 000000000000 000000000000
--- a/tests/test-strip-cross.t	Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-strip-cross.t	Wed May 04 13:37:41 2011 +0200
@@ -32,60 +32,62 @@
   $ commit '012' 'manifest-file'
   $ cd ..
   $ hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed
-  $ for i in crossed/.hg/store/00manifest.i crossed/.hg/store/data/*.i; do
-  >     echo $i
-  >     hg debugindex $i
-  >     echo
-  > done
-  crossed/.hg/store/00manifest.i
+  $ cd crossed
+  $ hg debugindex .hg/store/00manifest.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0     112      0       0 6f105cbb914d 000000000000 000000000000
        1       112      56      1       3 1b55917b3699 000000000000 000000000000
        2       168     123      1       1 8f3d04e263e5 000000000000 000000000000
        3       291     122      1       2 f0ef8726ac4f 000000000000 000000000000
        4       413      87      4       4 0b76e38b4070 000000000000 000000000000
-  
-  crossed/.hg/store/data/012.i
+
+  $ for i in 012 021 102 120 201 210 manifest-file; do
+  >     echo $i
+  >     hg debugindex $i
+  >     echo
+  > done
+  012
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 b8e02f643373 000000000000 000000000000
        1         3       3      1       1 5d9299349fc0 000000000000 000000000000
        2         6       3      2       2 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/021.i
+  021
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 b8e02f643373 000000000000 000000000000
        1         3       3      1       2 5d9299349fc0 000000000000 000000000000
        2         6       3      2       1 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/102.i
+  102
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       1 b8e02f643373 000000000000 000000000000
        1         3       3      1       0 5d9299349fc0 000000000000 000000000000
        2         6       3      2       2 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/120.i
+  120
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       1 b8e02f643373 000000000000 000000000000
        1         3       3      1       2 5d9299349fc0 000000000000 000000000000
        2         6       3      2       0 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/201.i
+  201
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       2 b8e02f643373 000000000000 000000000000
        1         3       3      1       0 5d9299349fc0 000000000000 000000000000
        2         6       3      2       1 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/210.i
+  210
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       2 b8e02f643373 000000000000 000000000000
        1         3       3      1       1 5d9299349fc0 000000000000 000000000000
        2         6       3      2       0 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/manifest-file.i
+  manifest-file
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       3 b8e02f643373 000000000000 000000000000
        1         3       3      1       4 5d9299349fc0 000000000000 000000000000
   
+  $ cd ..
   $ for i in 0 1 2 3 4; do
   >     hg clone -q -U --pull crossed $i
   >     echo "% Trying to strip revision $i"