##// END OF EJS Templates
debugcommands: drop base revision from debugindex...
Gregory Szorc -
r37300:009d0283 default
parent child Browse files
Show More
@@ -1059,12 +1059,6 b' def debugindex(ui, repo, file_=None, **o'
1059 if format not in (0, 1):
1059 if format not in (0, 1):
1060 raise error.Abort(_("unknown format %d") % format)
1060 raise error.Abort(_("unknown format %d") % format)
1061
1061
1062 generaldelta = r.version & revlog.FLAG_GENERALDELTA
1063 if generaldelta:
1064 basehdr = ' delta'
1065 else:
1066 basehdr = ' base'
1067
1068 if ui.debugflag:
1062 if ui.debugflag:
1069 shortfn = hex
1063 shortfn = hex
1070 else:
1064 else:
@@ -1077,32 +1071,27 b' def debugindex(ui, repo, file_=None, **o'
1077 break
1071 break
1078
1072
1079 if format == 0:
1073 if format == 0:
1080 ui.write((" rev offset length " + basehdr + " linkrev"
1074 ui.write((" rev offset length linkrev"
1081 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
1075 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
1082 elif format == 1:
1076 elif format == 1:
1083 ui.write((" rev flag offset length"
1077 ui.write((" rev flag offset length size link p1 p2"
1084 " size " + basehdr + " link p1 p2"
1085 " %s\n") % "nodeid".rjust(idlen))
1078 " %s\n") % "nodeid".rjust(idlen))
1086
1079
1087 for i in r:
1080 for i in r:
1088 node = r.node(i)
1081 node = r.node(i)
1089 if generaldelta:
1090 base = r.deltaparent(i)
1091 else:
1092 base = r.chainbase(i)
1093 if format == 0:
1082 if format == 0:
1094 try:
1083 try:
1095 pp = r.parents(node)
1084 pp = r.parents(node)
1096 except Exception:
1085 except Exception:
1097 pp = [nullid, nullid]
1086 pp = [nullid, nullid]
1098 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1087 ui.write("% 6d % 9d % 7d % 7d %s %s %s\n" % (
1099 i, r.start(i), r.length(i), base, r.linkrev(i),
1088 i, r.start(i), r.length(i), r.linkrev(i),
1100 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
1089 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
1101 elif format == 1:
1090 elif format == 1:
1102 pr = r.parentrevs(i)
1091 pr = r.parentrevs(i)
1103 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1092 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d %s\n" % (
1104 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1093 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1105 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
1094 r.linkrev(i), pr[0], pr[1], shortfn(node)))
1106
1095
1107 @command('debugindexdot', cmdutil.debugrevlogopts,
1096 @command('debugindexdot', cmdutil.debugrevlogopts,
1108 _('-c|-m|FILE'), optionalrepo=True)
1097 _('-c|-m|FILE'), optionalrepo=True)
@@ -51,7 +51,7 b' this should not mention bar but should m'
51
51
52
52
53 $ hg debugindex bar
53 $ hg debugindex bar
54 rev offset length ..... linkrev nodeid p1 p2 (re)
54 rev offset length linkrev nodeid p1 p2
55 0 0 5 ..... 1 b004912a8510 000000000000 000000000000 (re)
55 0 0 5 1 b004912a8510 000000000000 000000000000
56
56
57 $ cd ..
57 $ cd ..
@@ -38,33 +38,33 b''
38 $ hg commit -m "0.3m"
38 $ hg commit -m "0.3m"
39
39
40 $ hg debugindex -f 1 afile
40 $ hg debugindex -f 1 afile
41 rev flag offset length size ..... link p1 p2 nodeid (re)
41 rev flag offset length size link p1 p2 nodeid
42 0 0000 0 3 2 ..... 0 -1 -1 362fef284ce2 (re)
42 0 0000 0 3 2 0 -1 -1 362fef284ce2
43 1 0000 3 5 4 ..... 1 0 -1 125144f7e028 (re)
43 1 0000 3 5 4 1 0 -1 125144f7e028
44 2 0000 8 7 6 ..... 2 1 -1 4c982badb186 (re)
44 2 0000 8 7 6 2 1 -1 4c982badb186
45 3 0000 15 9 8 ..... 3 2 -1 19b1fc555737 (re)
45 3 0000 15 9 8 3 2 -1 19b1fc555737
46
46
47 $ hg debugindex adifferentfile
47 $ hg debugindex adifferentfile
48 rev offset length ..... linkrev nodeid p1 p2 (re)
48 rev offset length linkrev nodeid p1 p2
49 0 0 75 ..... 7 2565f3199a74 000000000000 000000000000 (re)
49 0 0 75 7 2565f3199a74 000000000000 000000000000
50
50
51 $ hg debugindex anotherfile
51 $ hg debugindex anotherfile
52 rev offset length ..... linkrev nodeid p1 p2 (re)
52 rev offset length linkrev nodeid p1 p2
53 0 0 75 ..... 8 2565f3199a74 000000000000 000000000000 (re)
53 0 0 75 8 2565f3199a74 000000000000 000000000000
54
54
55 $ hg debugindex fred
55 $ hg debugindex fred
56 rev offset length ..... linkrev nodeid p1 p2 (re)
56 rev offset length linkrev nodeid p1 p2
57 0 0 8 ..... 6 12ab3bcc5ea4 000000000000 000000000000 (re)
57 0 0 8 6 12ab3bcc5ea4 000000000000 000000000000
58
58
59 $ hg debugindex --manifest
59 $ hg debugindex --manifest
60 rev offset length ..... linkrev nodeid p1 p2 (re)
60 rev offset length linkrev nodeid p1 p2
61 0 0 48 ..... 0 43eadb1d2d06 000000000000 000000000000 (re)
61 0 0 48 0 43eadb1d2d06 000000000000 000000000000
62 1 48 48 ..... 1 8b89697eba2c 43eadb1d2d06 000000000000 (re)
62 1 48 48 1 8b89697eba2c 43eadb1d2d06 000000000000
63 2 96 48 ..... 2 626a32663c2f 8b89697eba2c 000000000000 (re)
63 2 96 48 2 626a32663c2f 8b89697eba2c 000000000000
64 3 144 48 ..... 3 f54c32f13478 626a32663c2f 000000000000 (re)
64 3 144 48 3 f54c32f13478 626a32663c2f 000000000000
65 4 192 .. ..... 6 de68e904d169 626a32663c2f 000000000000 (re)
65 4 192 .. 6 de68e904d169 626a32663c2f 000000000000 (re)
66 5 2.. .. ..... 7 09bb521d218d de68e904d169 000000000000 (re)
66 5 2.. .. 7 09bb521d218d de68e904d169 000000000000 (re)
67 6 3.. 54 ..... 8 1fde233dfb0f f54c32f13478 000000000000 (re)
67 6 3.. 54 8 1fde233dfb0f f54c32f13478 000000000000 (re)
68
68
69 $ hg verify
69 $ hg verify
70 checking changesets
70 checking changesets
@@ -1161,16 +1161,16 b' directory)'
1161 R olddirname/commonfile.py
1161 R olddirname/commonfile.py
1162 R olddirname/newfile.py
1162 R olddirname/newfile.py
1163 $ hg debugindex newdirname/newfile.py
1163 $ hg debugindex newdirname/newfile.py
1164 rev offset length delta linkrev nodeid p1 p2
1164 rev offset length linkrev nodeid p1 p2
1165 0 0 89 -1 3 34a4d536c0c0 000000000000 000000000000
1165 0 0 89 3 34a4d536c0c0 000000000000 000000000000
1166
1166
1167 $ echo a >> newdirname/commonfile.py
1167 $ echo a >> newdirname/commonfile.py
1168 $ hg ci --amend -m bug
1168 $ hg ci --amend -m bug
1169 $ hg debugrename newdirname/newfile.py
1169 $ hg debugrename newdirname/newfile.py
1170 newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def
1170 newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def
1171 $ hg debugindex newdirname/newfile.py
1171 $ hg debugindex newdirname/newfile.py
1172 rev offset length delta linkrev nodeid p1 p2
1172 rev offset length linkrev nodeid p1 p2
1173 0 0 89 -1 3 34a4d536c0c0 000000000000 000000000000
1173 0 0 89 3 34a4d536c0c0 000000000000 000000000000
1174
1174
1175 #if execbit
1175 #if execbit
1176
1176
@@ -624,9 +624,9 b' commit copy'
624 $ hg debugrename foo
624 $ hg debugrename foo
625 foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
625 foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
626 $ hg debugindex bar
626 $ hg debugindex bar
627 rev offset length ..... linkrev nodeid p1 p2 (re)
627 rev offset length linkrev nodeid p1 p2
628 0 0 6 ..... 0 26d3ca0dfd18 000000000000 000000000000 (re)
628 0 0 6 0 26d3ca0dfd18 000000000000 000000000000
629 1 6 7 ..... 1 d267bddd54f7 26d3ca0dfd18 000000000000 (re)
629 1 6 7 1 d267bddd54f7 26d3ca0dfd18 000000000000
630
630
631 Test making empty commits
631 Test making empty commits
632 $ hg commit --config ui.allowemptycommit=True -m "empty commit"
632 $ hg commit --config ui.allowemptycommit=True -m "empty commit"
@@ -68,8 +68,8 b' we should see one log entry for a'
68 this should show a revision linked to changeset 0
68 this should show a revision linked to changeset 0
69
69
70 $ hg debugindex a
70 $ hg debugindex a
71 rev offset length ..... linkrev nodeid p1 p2 (re)
71 rev offset length linkrev nodeid p1 p2
72 0 0 3 ..... 0 b789fdd96dc2 000000000000 000000000000 (re)
72 0 0 3 0 b789fdd96dc2 000000000000 000000000000
73
73
74 we should see one log entry for b
74 we should see one log entry for b
75
75
@@ -84,8 +84,8 b' we should see one log entry for b'
84 this should show a revision linked to changeset 1
84 this should show a revision linked to changeset 1
85
85
86 $ hg debugindex b
86 $ hg debugindex b
87 rev offset length ..... linkrev nodeid p1 p2 (re)
87 rev offset length linkrev nodeid p1 p2
88 0 0 65 ..... 1 37d9b5d994ea 000000000000 000000000000 (re)
88 0 0 65 1 37d9b5d994ea 000000000000 000000000000
89
89
90 this should show the rename information in the metadata
90 this should show the rename information in the metadata
91
91
@@ -170,8 +170,8 b" shouldn't show copy"
170
170
171 should match
171 should match
172 $ hg debugindex foo
172 $ hg debugindex foo
173 rev offset length ..... linkrev nodeid p1 p2 (re)
173 rev offset length linkrev nodeid p1 p2
174 0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re)
174 0 0 5 0 2ed2a3912a0b 000000000000 000000000000
175 $ hg debugrename bar
175 $ hg debugrename bar
176 bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
176 bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
177
177
@@ -200,15 +200,15 b' displayed.'
200
200
201 should show no parents for tip
201 should show no parents for tip
202 $ hg debugindex bar
202 $ hg debugindex bar
203 rev offset length ..... linkrev nodeid p1 p2 (re)
203 rev offset length linkrev nodeid p1 p2
204 0 0 69 ..... 1 7711d36246cc 000000000000 000000000000 (re)
204 0 0 69 1 7711d36246cc 000000000000 000000000000
205 1 69 6 ..... 2 bdf70a2b8d03 7711d36246cc 000000000000 (re)
205 1 69 6 2 bdf70a2b8d03 7711d36246cc 000000000000
206 2 75 71 ..... 3 b2558327ea8d 000000000000 000000000000 (re)
206 2 75 71 3 b2558327ea8d 000000000000 000000000000
207 should match
207 should match
208 $ hg debugindex foo
208 $ hg debugindex foo
209 rev offset length ..... linkrev nodeid p1 p2 (re)
209 rev offset length linkrev nodeid p1 p2
210 0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re)
210 0 0 5 0 2ed2a3912a0b 000000000000 000000000000
211 1 5 7 ..... 2 dd12c926cf16 2ed2a3912a0b 000000000000 (re)
211 1 5 7 2 dd12c926cf16 2ed2a3912a0b 000000000000
212 $ hg debugrename bar
212 $ hg debugrename bar
213 bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
213 bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
214
214
@@ -40,17 +40,17 b''
40
40
41 Test debugindex, with and without the --debug flag
41 Test debugindex, with and without the --debug flag
42 $ hg debugindex a
42 $ hg debugindex a
43 rev offset length ..... linkrev nodeid p1 p2 (re)
43 rev offset length linkrev nodeid p1 p2
44 0 0 3 .... 0 b789fdd96dc2 000000000000 000000000000 (re)
44 0 0 3 0 b789fdd96dc2 000000000000 000000000000
45 $ hg --debug debugindex a
45 $ hg --debug debugindex a
46 rev offset length ..... linkrev nodeid p1 p2 (re)
46 rev offset length linkrev nodeid p1 p2
47 0 0 3 .... 0 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 (re)
47 0 0 3 0 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
48 $ hg debugindex -f 1 a
48 $ hg debugindex -f 1 a
49 rev flag offset length size ..... link p1 p2 nodeid (re)
49 rev flag offset length size link p1 p2 nodeid
50 0 0000 0 3 2 .... 0 -1 -1 b789fdd96dc2 (re)
50 0 0000 0 3 2 0 -1 -1 b789fdd96dc2
51 $ hg --debug debugindex -f 1 a
51 $ hg --debug debugindex -f 1 a
52 rev flag offset length size ..... link p1 p2 nodeid (re)
52 rev flag offset length size link p1 p2 nodeid
53 0 0000 0 3 2 .... 0 -1 -1 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 (re)
53 0 0000 0 3 2 0 -1 -1 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
54
54
55 debugdelta chain basic output
55 debugdelta chain basic output
56
56
@@ -64,12 +64,12 b''
64 summary: test
64 summary: test
65
65
66 $ hg debugindex --changelog
66 $ hg debugindex --changelog
67 rev offset length ..... linkrev nodeid p1 p2 (re)
67 rev offset length linkrev nodeid p1 p2
68 0 0 60 ..... 0 5e0375449e74 000000000000 000000000000 (re)
68 0 0 60 0 5e0375449e74 000000000000 000000000000
69 1 60 62 ..... 1 96155394af80 5e0375449e74 000000000000 (re)
69 1 60 62 1 96155394af80 5e0375449e74 000000000000
70 2 122 62 ..... 2 92cc4c306b19 5e0375449e74 000000000000 (re)
70 2 122 62 2 92cc4c306b19 5e0375449e74 000000000000
71 3 184 69 ..... 3 e16a66a37edd 92cc4c306b19 96155394af80 (re)
71 3 184 69 3 e16a66a37edd 92cc4c306b19 96155394af80
72 4 253 69 ..... 4 2ee31f665a86 96155394af80 92cc4c306b19 (re)
72 4 253 69 4 2ee31f665a86 96155394af80 92cc4c306b19
73
73
74 revision 1
74 revision 1
75 $ hg manifest --debug 1
75 $ hg manifest --debug 1
@@ -89,9 +89,9 b' revision 4'
89 79d7492df40aa0fa093ec4209be78043c181f094 644 b
89 79d7492df40aa0fa093ec4209be78043c181f094 644 b
90
90
91 $ hg debugindex a
91 $ hg debugindex a
92 rev offset length ..... linkrev nodeid p1 p2 (re)
92 rev offset length linkrev nodeid p1 p2
93 0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re)
93 0 0 5 0 2ed2a3912a0b 000000000000 000000000000
94 1 5 6 ..... 1 79d7492df40a 2ed2a3912a0b 000000000000 (re)
94 1 5 6 1 79d7492df40a 2ed2a3912a0b 000000000000
95
95
96 $ hg verify
96 $ hg verify
97 checking changesets
97 checking changesets
@@ -16,6 +16,6 b' Issue351: mq: qrefresh can create extra '
16 $ hg qrefresh
16 $ hg qrefresh
17
17
18 $ hg debugindex b
18 $ hg debugindex b
19 rev offset length ..... linkrev nodeid p1 p2 (re)
19 rev offset length linkrev nodeid p1 p2
20 0 0 3 ..... 0 1e88685f5dde 000000000000 000000000000 (re)
20 0 0 3 0 1e88685f5dde 000000000000 000000000000
21
21
@@ -73,11 +73,11 b' Merging:'
73 main: we should have a merge here:
73 main: we should have a merge here:
74
74
75 $ hg debugindex --changelog
75 $ hg debugindex --changelog
76 rev offset length ..... linkrev nodeid p1 p2 (re)
76 rev offset length linkrev nodeid p1 p2
77 0 0 73 ..... 0 cdca01651b96 000000000000 000000000000 (re)
77 0 0 73 0 cdca01651b96 000000000000 000000000000
78 1 73 68 ..... 1 f6718a9cb7f3 cdca01651b96 000000000000 (re)
78 1 73 68 1 f6718a9cb7f3 cdca01651b96 000000000000
79 2 141 68 ..... 2 bdd988058d16 cdca01651b96 000000000000 (re)
79 2 141 68 2 bdd988058d16 cdca01651b96 000000000000
80 3 209 66 ..... 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 (re)
80 3 209 66 3 d8a521142a3c f6718a9cb7f3 bdd988058d16
81
81
82 log should show foo and quux changed:
82 log should show foo and quux changed:
83
83
@@ -97,32 +97,32 b' log should show foo and quux changed:'
97 foo: we should have a merge here:
97 foo: we should have a merge here:
98
98
99 $ hg debugindex foo
99 $ hg debugindex foo
100 rev offset length ..... linkrev nodeid p1 p2 (re)
100 rev offset length linkrev nodeid p1 p2
101 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re)
101 0 0 3 0 b8e02f643373 000000000000 000000000000
102 1 3 4 ..... 1 2ffeddde1b65 b8e02f643373 000000000000 (re)
102 1 3 4 1 2ffeddde1b65 b8e02f643373 000000000000
103 2 7 4 ..... 2 33d1fb69067a b8e02f643373 000000000000 (re)
103 2 7 4 2 33d1fb69067a b8e02f643373 000000000000
104 3 11 4 ..... 3 aa27919ee430 2ffeddde1b65 33d1fb69067a (re)
104 3 11 4 3 aa27919ee430 2ffeddde1b65 33d1fb69067a
105
105
106 bar: we should not have a merge here:
106 bar: we should not have a merge here:
107
107
108 $ hg debugindex bar
108 $ hg debugindex bar
109 rev offset length ..... linkrev nodeid p1 p2 (re)
109 rev offset length linkrev nodeid p1 p2
110 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re)
110 0 0 3 0 b8e02f643373 000000000000 000000000000
111 1 3 4 ..... 2 33d1fb69067a b8e02f643373 000000000000 (re)
111 1 3 4 2 33d1fb69067a b8e02f643373 000000000000
112
112
113 baz: we should not have a merge here:
113 baz: we should not have a merge here:
114
114
115 $ hg debugindex baz
115 $ hg debugindex baz
116 rev offset length ..... linkrev nodeid p1 p2 (re)
116 rev offset length linkrev nodeid p1 p2
117 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re)
117 0 0 3 0 b8e02f643373 000000000000 000000000000
118 1 3 4 ..... 1 2ffeddde1b65 b8e02f643373 000000000000 (re)
118 1 3 4 1 2ffeddde1b65 b8e02f643373 000000000000
119
119
120 quux: we should not have a merge here:
120 quux: we should not have a merge here:
121
121
122 $ hg debugindex quux
122 $ hg debugindex quux
123 rev offset length ..... linkrev nodeid p1 p2 (re)
123 rev offset length linkrev nodeid p1 p2
124 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re)
124 0 0 3 0 b8e02f643373 000000000000 000000000000
125 1 3 5 ..... 3 6128c0f33108 b8e02f643373 000000000000 (re)
125 1 3 5 3 6128c0f33108 b8e02f643373 000000000000
126
126
127 Manifest entries should match tips of all files:
127 Manifest entries should match tips of all files:
128
128
@@ -144,14 +144,14 b' the changelog should mention file a:'
144 -rwxr-x---
144 -rwxr-x---
145
145
146 $ hg debugindex a
146 $ hg debugindex a
147 rev offset length ..... linkrev nodeid p1 p2 (re)
147 rev offset length linkrev nodeid p1 p2
148 0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re)
148 0 0 0 0 b80de5d13875 000000000000 000000000000
149 $ hg debugindex -R ../test2 a
149 $ hg debugindex -R ../test2 a
150 rev offset length ..... linkrev nodeid p1 p2 (re)
150 rev offset length linkrev nodeid p1 p2
151 0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re)
151 0 0 0 0 b80de5d13875 000000000000 000000000000
152 $ hg debugindex -R ../test1 a
152 $ hg debugindex -R ../test1 a
153 rev offset length ..... linkrev nodeid p1 p2 (re)
153 rev offset length linkrev nodeid p1 p2
154 0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re)
154 0 0 0 0 b80de5d13875 000000000000 000000000000
155 1 0 5 ..... 1 7fe919cc0336 b80de5d13875 000000000000 (re)
155 1 0 5 1 7fe919cc0336 b80de5d13875 000000000000
156
156
157 $ cd ..
157 $ cd ..
@@ -48,8 +48,8 b' revision.'
48 c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo
48 c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo
49
49
50 $ hg debugindex foo
50 $ hg debugindex foo
51 rev offset length ..... linkrev nodeid p1 p2 (re)
51 rev offset length linkrev nodeid p1 p2
52 0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re)
52 0 0 5 0 2ed2a3912a0b 000000000000 000000000000
53 1 5 9 ..... 1 6f4310b00b9a 2ed2a3912a0b 000000000000 (re)
53 1 5 9 1 6f4310b00b9a 2ed2a3912a0b 000000000000
54 2 14 5 ..... 2 c6fc755d7e68 6f4310b00b9a 000000000000 (re)
54 2 14 5 2 c6fc755d7e68 6f4310b00b9a 000000000000
55
55
@@ -35,17 +35,17 b' Test with the merge on 3 having the rena'
35 $ hg ci -m '3: merge with local rename'
35 $ hg ci -m '3: merge with local rename'
36
36
37 $ hg debugindex bar
37 $ hg debugindex bar
38 rev offset length ..... linkrev nodeid p1 p2 (re)
38 rev offset length linkrev nodeid p1 p2
39 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
39 0 0 77 2 d35118874825 000000000000 000000000000
40 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)
40 1 77 76 3 5345f5ab8abd 000000000000 d35118874825
41
41
42 $ hg debugrename bar
42 $ hg debugrename bar
43 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
43 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
44
44
45 $ hg debugindex foo
45 $ hg debugindex foo
46 rev offset length ..... linkrev nodeid p1 p2 (re)
46 rev offset length linkrev nodeid p1 p2
47 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re)
47 0 0 7 0 690b295714ae 000000000000 000000000000
48 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re)
48 1 7 13 1 9e25c27b8757 690b295714ae 000000000000
49
49
50
50
51 Revert the content change from rev 2:
51 Revert the content change from rev 2:
@@ -88,11 +88,11 b' This should use bar@rev2 as the ancestor'
88 $ hg ci -m '5: merge'
88 $ hg ci -m '5: merge'
89
89
90 $ hg debugindex bar
90 $ hg debugindex bar
91 rev offset length ..... linkrev nodeid p1 p2 (re)
91 rev offset length linkrev nodeid p1 p2
92 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
92 0 0 77 2 d35118874825 000000000000 000000000000
93 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)
93 1 77 76 3 5345f5ab8abd 000000000000 d35118874825
94 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re)
94 2 153 7 4 ff4b45017382 d35118874825 000000000000
95 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re)
95 3 160 13 5 3701b4893544 ff4b45017382 5345f5ab8abd
96
96
97
97
98 Same thing, but with the merge on 3 having the rename
98 Same thing, but with the merge on 3 having the rename
@@ -123,17 +123,17 b' on the remote parent:'
123 $ hg ci -m '3: merge with remote rename'
123 $ hg ci -m '3: merge with remote rename'
124
124
125 $ hg debugindex bar
125 $ hg debugindex bar
126 rev offset length ..... linkrev nodeid p1 p2 (re)
126 rev offset length linkrev nodeid p1 p2
127 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
127 0 0 77 2 d35118874825 000000000000 000000000000
128 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)
128 1 77 76 3 5345f5ab8abd 000000000000 d35118874825
129
129
130 $ hg debugrename bar
130 $ hg debugrename bar
131 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
131 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
132
132
133 $ hg debugindex foo
133 $ hg debugindex foo
134 rev offset length ..... linkrev nodeid p1 p2 (re)
134 rev offset length linkrev nodeid p1 p2
135 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re)
135 0 0 7 0 690b295714ae 000000000000 000000000000
136 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re)
136 1 7 13 1 9e25c27b8757 690b295714ae 000000000000
137
137
138
138
139 Revert the content change from rev 2:
139 Revert the content change from rev 2:
@@ -176,10 +176,10 b' This should use bar@rev2 as the ancestor'
176 $ hg ci -m '5: merge'
176 $ hg ci -m '5: merge'
177
177
178 $ hg debugindex bar
178 $ hg debugindex bar
179 rev offset length ..... linkrev nodeid p1 p2 (re)
179 rev offset length linkrev nodeid p1 p2
180 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
180 0 0 77 2 d35118874825 000000000000 000000000000
181 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)
181 1 77 76 3 5345f5ab8abd 000000000000 d35118874825
182 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re)
182 2 153 7 4 ff4b45017382 d35118874825 000000000000
183 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re)
183 3 160 13 5 3701b4893544 ff4b45017382 5345f5ab8abd
184
184
185 $ cd ..
185 $ cd ..
@@ -109,12 +109,12 b' pull and merge from test-a again'
109 three
109 three
110
110
111 $ hg debugindex test.txt
111 $ hg debugindex test.txt
112 rev offset length ..... linkrev nodeid p1 p2 (re)
112 rev offset length linkrev nodeid p1 p2
113 0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re)
113 0 0 7 0 01365c4cca56 000000000000 000000000000
114 1 7 9 ..... 1 7b013192566a 01365c4cca56 000000000000 (re)
114 1 7 9 1 7b013192566a 01365c4cca56 000000000000
115 2 16 15 ..... 2 8fe46a3eb557 01365c4cca56 000000000000 (re)
115 2 16 15 2 8fe46a3eb557 01365c4cca56 000000000000
116 3 31 2. ..... 3 fc3148072371 7b013192566a 8fe46a3eb557 (re)
116 3 31 2. 3 fc3148072371 7b013192566a 8fe46a3eb557 (re)
117 4 5. 25 ..... 4 d40249267ae3 8fe46a3eb557 000000000000 (re)
117 4 5. 25 4 d40249267ae3 8fe46a3eb557 000000000000 (re)
118
118
119 $ hg log
119 $ hg log
120 changeset: 4:40d11a4173a8
120 changeset: 4:40d11a4173a8
@@ -15,20 +15,20 b''
15 adding foo/bar/f
15 adding foo/bar/f
16 adding foo/f
16 adding foo/f
17 $ hg debugindex -m
17 $ hg debugindex -m
18 rev offset length delta linkrev nodeid p1 p2
18 rev offset length linkrev nodeid p1 p2
19 0 0 47 -1 0 14a5d056d75a 000000000000 000000000000
19 0 0 47 0 14a5d056d75a 000000000000 000000000000
20 $ hg debugindex --dir foo
20 $ hg debugindex --dir foo
21 rev offset length delta linkrev nodeid p1 p2
21 rev offset length linkrev nodeid p1 p2
22 0 0 77 -1 0 e635c7857aef 000000000000 000000000000
22 0 0 77 0 e635c7857aef 000000000000 000000000000
23 $ hg debugindex --dir foo/
23 $ hg debugindex --dir foo/
24 rev offset length delta linkrev nodeid p1 p2
24 rev offset length linkrev nodeid p1 p2
25 0 0 77 -1 0 e635c7857aef 000000000000 000000000000
25 0 0 77 0 e635c7857aef 000000000000 000000000000
26 $ hg debugindex --dir foo/bar
26 $ hg debugindex --dir foo/bar
27 rev offset length delta linkrev nodeid p1 p2
27 rev offset length linkrev nodeid p1 p2
28 0 0 44 -1 0 e091d4224761 000000000000 000000000000
28 0 0 44 0 e091d4224761 000000000000 000000000000
29 $ hg debugindex --dir foo/bar/
29 $ hg debugindex --dir foo/bar/
30 rev offset length delta linkrev nodeid p1 p2
30 rev offset length linkrev nodeid p1 p2
31 0 0 44 -1 0 e091d4224761 000000000000 000000000000
31 0 0 44 0 e091d4224761 000000000000 000000000000
32 $ hg debugdata -m 0
32 $ hg debugdata -m 0
33 foo\x00e635c7857aef92ac761ce5741a99da159abbbb24t (esc)
33 foo\x00e635c7857aef92ac761ce5741a99da159abbbb24t (esc)
34 $ hg debugdata --dir foo 0
34 $ hg debugdata --dir foo 0
@@ -33,11 +33,11 b' create full repo'
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
34 $ cd narrow
34 $ cd narrow
35 $ hg debugindex -c
35 $ hg debugindex -c
36 rev offset length base linkrev nodeid p1 p2
36 rev offset length linkrev nodeid p1 p2
37 0 0 64 0 0 9958b1af2add 000000000000 000000000000
37 0 0 64 0 9958b1af2add 000000000000 000000000000
38 1 64 81 1 1 2db4ce2a3bfe 9958b1af2add 000000000000
38 1 64 81 1 2db4ce2a3bfe 9958b1af2add 000000000000
39 2 145 75 2 2 0980ee31a742 2db4ce2a3bfe 000000000000
39 2 145 75 2 0980ee31a742 2db4ce2a3bfe 000000000000
40 3 220 (76|77) 3 3 4410145019b7 0980ee31a742 000000000000 (re)
40 3 220 (76|77) 3 4410145019b7 0980ee31a742 000000000000 (re)
41
41
42 $ hg update -q 0
42 $ hg update -q 0
43
43
@@ -144,9 +144,9 b' Test corrupted p1/p2 fields that could c'
144 > EOF
144 > EOF
145
145
146 $ hg -R limit debugindex -f1 -c
146 $ hg -R limit debugindex -f1 -c
147 rev flag offset length size base link p1 p2 nodeid
147 rev flag offset length size link p1 p2 nodeid
148 0 0000 0 63 62 0 0 2 -1 7c31755bf9b5
148 0 0000 0 63 62 0 2 -1 7c31755bf9b5
149 1 0000 63 66 65 1 1 0 2 26333235a41c
149 1 0000 63 66 65 1 0 2 26333235a41c
150
150
151 $ hg -R limit debugdeltachain -c
151 $ hg -R limit debugdeltachain -c
152 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
152 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
@@ -154,9 +154,9 b' Test corrupted p1/p2 fields that could c'
154 1 2 1 -1 base 66 65 66 1.01538 66 0 0.00000
154 1 2 1 -1 base 66 65 66 1.01538 66 0 0.00000
155
155
156 $ hg -R segv debugindex -f1 -c
156 $ hg -R segv debugindex -f1 -c
157 rev flag offset length size base link p1 p2 nodeid
157 rev flag offset length size link p1 p2 nodeid
158 0 0000 0 63 62 0 0 65536 -1 7c31755bf9b5
158 0 0000 0 63 62 0 65536 -1 7c31755bf9b5
159 1 0000 63 66 65 1 1 0 65536 26333235a41c
159 1 0000 63 66 65 1 0 65536 26333235a41c
160
160
161 $ hg -R segv debugdeltachain -c
161 $ hg -R segv debugdeltachain -c
162 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
162 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
@@ -64,9 +64,9 b''
64 $ hg ci -m "merge"
64 $ hg ci -m "merge"
65
65
66 $ hg debugindex b
66 $ hg debugindex b
67 rev offset length ..... linkrev nodeid p1 p2 (re)
67 rev offset length linkrev nodeid p1 p2
68 0 0 67 ..... 1 57eacc201a7f 000000000000 000000000000 (re)
68 0 0 67 1 57eacc201a7f 000000000000 000000000000
69 1 67 72 ..... 3 4727ba907962 000000000000 57eacc201a7f (re)
69 1 67 72 3 4727ba907962 000000000000 57eacc201a7f
70
70
71 $ hg debugrename b
71 $ hg debugrename b
72 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66
72 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66
@@ -16,8 +16,8 b' this should be stored as a delta against'
16 created new head
16 created new head
17
17
18 $ hg debugindex foo
18 $ hg debugindex foo
19 rev offset length ..... linkrev nodeid p1 p2 (re)
19 rev offset length linkrev nodeid p1 p2
20 0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re)
20 0 0 0 0 b80de5d13875 000000000000 000000000000
21 1 0 13 ..... 1 0376abec49b8 000000000000 000000000000 (re)
21 1 0 13 1 0376abec49b8 000000000000 000000000000
22
22
23 $ cd ..
23 $ cd ..
@@ -40,8 +40,8 b' Test for CVE-2016-3630'
40 ... .decode("base64").decode("zlib"))
40 ... .decode("base64").decode("zlib"))
41
41
42 $ hg debugindex a.i
42 $ hg debugindex a.i
43 rev offset length delta linkrev nodeid p1 p2
43 rev offset length linkrev nodeid p1 p2
44 0 0 19 -1 2 99e0332bd498 000000000000 000000000000
44 0 0 19 2 99e0332bd498 000000000000 000000000000
45 1 19 12 0 3 6674f57a23d8 99e0332bd498 000000000000
45 1 19 12 3 6674f57a23d8 99e0332bd498 000000000000
46 $ hg debugdata a.i 1 2>&1 | egrep 'Error:.*decoded'
46 $ hg debugdata a.i 1 2>&1 | egrep 'Error:.*decoded'
47 (mercurial\.\w+\.mpatch\.)?mpatchError: patch cannot be decoded (re)
47 (mercurial\.\w+\.mpatch\.)?mpatchError: patch cannot be decoded (re)
@@ -34,12 +34,12 b' 2 1 0 2 0 1 2'
34 $ hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed
34 $ hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed
35 $ cd crossed
35 $ cd crossed
36 $ hg debugindex --manifest
36 $ hg debugindex --manifest
37 rev offset length ..... linkrev nodeid p1 p2 (re)
37 rev offset length linkrev nodeid p1 p2
38 0 0 112 ..... 0 6f105cbb914d 000000000000 000000000000 (re)
38 0 0 112 0 6f105cbb914d 000000000000 000000000000
39 1 112 56 ..... 3 1b55917b3699 000000000000 000000000000 (re)
39 1 112 56 3 1b55917b3699 000000000000 000000000000
40 2 168 123 ..... 1 8f3d04e263e5 000000000000 000000000000 (re)
40 2 168 123 1 8f3d04e263e5 000000000000 000000000000
41 3 291 122 ..... 2 f0ef8726ac4f 000000000000 000000000000 (re)
41 3 291 122 2 f0ef8726ac4f 000000000000 000000000000
42 4 413 87 ..... 4 0b76e38b4070 000000000000 000000000000 (re)
42 4 413 87 4 0b76e38b4070 000000000000 000000000000
43
43
44 $ for i in 012 021 102 120 201 210 manifest-file; do
44 $ for i in 012 021 102 120 201 210 manifest-file; do
45 > echo $i
45 > echo $i
@@ -47,45 +47,45 b' 2 1 0 2 0 1 2'
47 > echo
47 > echo
48 > done
48 > done
49 012
49 012
50 rev offset length ..... linkrev nodeid p1 p2 (re)
50 rev offset length linkrev nodeid p1 p2
51 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re)
51 0 0 3 0 b8e02f643373 000000000000 000000000000
52 1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re)
52 1 3 3 1 5d9299349fc0 000000000000 000000000000
53 2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re)
53 2 6 3 2 2661d26c6496 000000000000 000000000000
54
54
55 021
55 021
56 rev offset length ..... linkrev nodeid p1 p2 (re)
56 rev offset length linkrev nodeid p1 p2
57 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re)
57 0 0 3 0 b8e02f643373 000000000000 000000000000
58 1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re)
58 1 3 3 2 5d9299349fc0 000000000000 000000000000
59 2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re)
59 2 6 3 1 2661d26c6496 000000000000 000000000000
60
60
61 102
61 102
62 rev offset length ..... linkrev nodeid p1 p2 (re)
62 rev offset length linkrev nodeid p1 p2
63 0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re)
63 0 0 3 1 b8e02f643373 000000000000 000000000000
64 1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re)
64 1 3 3 0 5d9299349fc0 000000000000 000000000000
65 2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re)
65 2 6 3 2 2661d26c6496 000000000000 000000000000
66
66
67 120
67 120
68 rev offset length ..... linkrev nodeid p1 p2 (re)
68 rev offset length linkrev nodeid p1 p2
69 0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re)
69 0 0 3 1 b8e02f643373 000000000000 000000000000
70 1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re)
70 1 3 3 2 5d9299349fc0 000000000000 000000000000
71 2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re)
71 2 6 3 0 2661d26c6496 000000000000 000000000000
72
72
73 201
73 201
74 rev offset length ..... linkrev nodeid p1 p2 (re)
74 rev offset length linkrev nodeid p1 p2
75 0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re)
75 0 0 3 2 b8e02f643373 000000000000 000000000000
76 1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re)
76 1 3 3 0 5d9299349fc0 000000000000 000000000000
77 2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re)
77 2 6 3 1 2661d26c6496 000000000000 000000000000
78
78
79 210
79 210
80 rev offset length ..... linkrev nodeid p1 p2 (re)
80 rev offset length linkrev nodeid p1 p2
81 0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re)
81 0 0 3 2 b8e02f643373 000000000000 000000000000
82 1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re)
82 1 3 3 1 5d9299349fc0 000000000000 000000000000
83 2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re)
83 2 6 3 0 2661d26c6496 000000000000 000000000000
84
84
85 manifest-file
85 manifest-file
86 rev offset length ..... linkrev nodeid p1 p2 (re)
86 rev offset length linkrev nodeid p1 p2
87 0 0 3 ..... 3 b8e02f643373 000000000000 000000000000 (re)
87 0 0 3 3 b8e02f643373 000000000000 000000000000
88 1 3 3 ..... 4 5d9299349fc0 000000000000 000000000000 (re)
88 1 3 3 4 5d9299349fc0 000000000000 000000000000
89
89
90 $ cd ..
90 $ cd ..
91 $ for i in 0 1 2 3 4; do
91 $ for i in 0 1 2 3 4; do
@@ -139,13 +139,13 b' Merge creates 2-parent revision of direc'
139 $ cat dir1/b
139 $ cat dir1/b
140 6
140 6
141 $ hg debugindex --dir dir1
141 $ hg debugindex --dir dir1
142 rev offset length delta linkrev nodeid p1 p2
142 rev offset length linkrev nodeid p1 p2
143 0 0 54 -1 1 8b3ffd73f901 000000000000 000000000000
143 0 0 54 1 8b3ffd73f901 000000000000 000000000000
144 1 54 68 0 2 68e9d057c5a8 8b3ffd73f901 000000000000
144 1 54 68 2 68e9d057c5a8 8b3ffd73f901 000000000000
145 2 122 12 1 4 4698198d2624 68e9d057c5a8 000000000000
145 2 122 12 4 4698198d2624 68e9d057c5a8 000000000000
146 3 134 55 1 5 44844058ccce 68e9d057c5a8 000000000000
146 3 134 55 5 44844058ccce 68e9d057c5a8 000000000000
147 4 189 55 1 6 bf3d9b744927 68e9d057c5a8 000000000000
147 4 189 55 6 bf3d9b744927 68e9d057c5a8 000000000000
148 5 244 55 4 7 dde7c0af2a03 bf3d9b744927 44844058ccce
148 5 244 55 7 dde7c0af2a03 bf3d9b744927 44844058ccce
149
149
150 Merge keeping directory from parent 1 does not create revlog entry. (Note that
150 Merge keeping directory from parent 1 does not create revlog entry. (Note that
151 dir1's manifest does change, but only because dir1/a's filelog changes.)
151 dir1's manifest does change, but only because dir1/a's filelog changes.)
@@ -285,13 +285,13 b' Merge of two trees'
285 Parent of tree root manifest should be flat manifest, and two for merge
285 Parent of tree root manifest should be flat manifest, and two for merge
286
286
287 $ hg debugindex -m
287 $ hg debugindex -m
288 rev offset length delta linkrev nodeid p1 p2
288 rev offset length linkrev nodeid p1 p2
289 0 0 80 -1 0 40536115ed9e 000000000000 000000000000
289 0 0 80 0 40536115ed9e 000000000000 000000000000
290 1 80 83 0 1 f3376063c255 40536115ed9e 000000000000
290 1 80 83 1 f3376063c255 40536115ed9e 000000000000
291 2 163 89 0 2 5d9b9da231a2 40536115ed9e 000000000000
291 2 163 89 2 5d9b9da231a2 40536115ed9e 000000000000
292 3 252 83 2 3 d17d663cbd8a 5d9b9da231a2 f3376063c255
292 3 252 83 3 d17d663cbd8a 5d9b9da231a2 f3376063c255
293 4 335 124 1 4 51e32a8c60ee f3376063c255 000000000000
293 4 335 124 4 51e32a8c60ee f3376063c255 000000000000
294 5 459 126 2 5 cc5baa78b230 5d9b9da231a2 f3376063c255
294 5 459 126 5 cc5baa78b230 5d9b9da231a2 f3376063c255
295
295
296
296
297 Status across flat/tree boundary should work
297 Status across flat/tree boundary should work
@@ -305,16 +305,16 b' Status across flat/tree boundary should '
305 Turning off treemanifest config has no effect
305 Turning off treemanifest config has no effect
306
306
307 $ hg debugindex --dir dir1
307 $ hg debugindex --dir dir1
308 rev offset length delta linkrev nodeid p1 p2
308 rev offset length linkrev nodeid p1 p2
309 0 0 127 -1 4 064927a0648a 000000000000 000000000000
309 0 0 127 4 064927a0648a 000000000000 000000000000
310 1 127 111 0 5 25ecb8cb8618 000000000000 000000000000
310 1 127 111 5 25ecb8cb8618 000000000000 000000000000
311 $ echo 2 > dir1/a
311 $ echo 2 > dir1/a
312 $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'
312 $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'
313 $ hg debugindex --dir dir1
313 $ hg debugindex --dir dir1
314 rev offset length delta linkrev nodeid p1 p2
314 rev offset length linkrev nodeid p1 p2
315 0 0 127 -1 4 064927a0648a 000000000000 000000000000
315 0 0 127 4 064927a0648a 000000000000 000000000000
316 1 127 111 0 5 25ecb8cb8618 000000000000 000000000000
316 1 127 111 5 25ecb8cb8618 000000000000 000000000000
317 2 238 55 1 6 5b16163a30c6 25ecb8cb8618 000000000000
317 2 238 55 6 5b16163a30c6 25ecb8cb8618 000000000000
318
318
319 Stripping and recovering changes should work
319 Stripping and recovering changes should work
320
320
@@ -324,9 +324,9 b' Stripping and recovering changes should '
324 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
324 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
325 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
325 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
326 $ hg debugindex --dir dir1
326 $ hg debugindex --dir dir1
327 rev offset length delta linkrev nodeid p1 p2
327 rev offset length linkrev nodeid p1 p2
328 0 0 127 -1 4 064927a0648a 000000000000 000000000000
328 0 0 127 4 064927a0648a 000000000000 000000000000
329 1 127 111 0 5 25ecb8cb8618 000000000000 000000000000
329 1 127 111 5 25ecb8cb8618 000000000000 000000000000
330 $ hg incoming .hg/strip-backup/*
330 $ hg incoming .hg/strip-backup/*
331 comparing with .hg/strip-backup/*-backup.hg (glob)
331 comparing with .hg/strip-backup/*-backup.hg (glob)
332 searching for changes
332 searching for changes
@@ -349,10 +349,10 b' Stripping and recovering changes should '
349 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)
349 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)
350 $ hg unbundle -q .hg/strip-backup/*
350 $ hg unbundle -q .hg/strip-backup/*
351 $ hg debugindex --dir dir1
351 $ hg debugindex --dir dir1
352 rev offset length delta linkrev nodeid p1 p2
352 rev offset length linkrev nodeid p1 p2
353 0 0 127 -1 4 064927a0648a 000000000000 000000000000
353 0 0 127 4 064927a0648a 000000000000 000000000000
354 1 127 111 0 5 25ecb8cb8618 000000000000 000000000000
354 1 127 111 5 25ecb8cb8618 000000000000 000000000000
355 2 238 55 1 6 5b16163a30c6 25ecb8cb8618 000000000000
355 2 238 55 6 5b16163a30c6 25ecb8cb8618 000000000000
356 $ hg st --change tip
356 $ hg st --change tip
357 M dir1/a
357 M dir1/a
358
358
General Comments 0
You need to be logged in to leave comments. Login now