Show More
@@ -175,7 +175,7 b' class converter(object):' | |||||
175 | revisions without parents. 'parents' must be a mapping of revision |
|
175 | revisions without parents. 'parents' must be a mapping of revision | |
176 | identifier to its parents ones. |
|
176 | identifier to its parents ones. | |
177 | """ |
|
177 | """ | |
178 |
visit = parents |
|
178 | visit = sorted(parents) | |
179 | seen = set() |
|
179 | seen = set() | |
180 | children = {} |
|
180 | children = {} | |
181 | roots = [] |
|
181 | roots = [] |
@@ -183,8 +183,8 b' convert to hg' | |||||
183 | sorting... |
|
183 | sorting... | |
184 | converting... |
|
184 | converting... | |
185 | 9 add file1 on trunk |
|
185 | 9 add file1 on trunk | |
186 | 8 add text |
|
186 | 8 unrelated change | |
187 | 7 unrelated change |
|
187 | 7 add text | |
188 | 6 add text [MERGE from v1_0] |
|
188 | 6 add text [MERGE from v1_0] | |
189 | 5 add text [MERGE from v1_1] |
|
189 | 5 add text [MERGE from v1_1] | |
190 | 4 add file2 on trunk |
|
190 | 4 add file2 on trunk | |
@@ -204,8 +204,8 b' complete log' | |||||
204 | 5: '' add file2 on trunk |
|
204 | 5: '' add file2 on trunk | |
205 | 4: '' add text [MERGE from v1_1] |
|
205 | 4: '' add text [MERGE from v1_1] | |
206 | 3: 'v1_1' add text [MERGE from v1_0] |
|
206 | 3: 'v1_1' add text [MERGE from v1_0] | |
207 | 2: 'v1_1' unrelated change |
|
207 | 2: 'v1_0' add text | |
208 |
1: 'v1_ |
|
208 | 1: 'v1_1' unrelated change | |
209 | 0: '' add file1 on trunk |
|
209 | 0: '' add file1 on trunk | |
210 |
|
210 | |||
211 | graphical log |
|
211 | graphical log | |
@@ -225,9 +225,9 b' graphical log' | |||||
225 | |\| |
|
225 | |\| | |
226 | | o 3: 'v1_1' add text [MERGE from v1_0] |
|
226 | | o 3: 'v1_1' add text [MERGE from v1_0] | |
227 | | |\ |
|
227 | | |\ | |
228 |
+---o 2: 'v1_ |
|
228 | +---o 2: 'v1_0' add text | |
229 | | | |
|
229 | | | | |
230 |
| o 1: 'v1_ |
|
230 | | o 1: 'v1_1' unrelated change | |
231 | |/ |
|
231 | |/ | |
232 | o 0: '' add file1 on trunk |
|
232 | o 0: '' add file1 on trunk | |
233 |
|
233 |
@@ -91,8 +91,8 b' a fixed difference from UTC.' | |||||
91 | sorting... |
|
91 | sorting... | |
92 | converting... |
|
92 | converting... | |
93 | 2 Initial revision |
|
93 | 2 Initial revision | |
94 | 1 import |
|
94 | 1 ci0 | |
95 | 0 ci0 |
|
95 | 0 import | |
96 | updating tags |
|
96 | updating tags | |
97 | $ hgcat a |
|
97 | $ hgcat a | |
98 | a |
|
98 | a | |
@@ -116,10 +116,10 b' convert fresh repo with --filemap' | |||||
116 | sorting... |
|
116 | sorting... | |
117 | converting... |
|
117 | converting... | |
118 | 2 Initial revision |
|
118 | 2 Initial revision | |
119 | 1 import |
|
119 | 1 ci0 | |
|
120 | 0 import | |||
120 | filtering out empty revision |
|
121 | filtering out empty revision | |
121 |
repository tip rolled back to revision |
|
122 | repository tip rolled back to revision 1 (undo commit) | |
122 | 0 ci0 |
|
|||
123 | updating tags |
|
123 | updating tags | |
124 | $ hgcat b/c |
|
124 | $ hgcat b/c | |
125 | c |
|
125 | c | |
@@ -321,9 +321,9 b' convert again' | |||||
321 | | |
|
321 | | | |
322 | o 3 () update tags date: * +0000 files: .hgtags (glob) |
|
322 | o 3 () update tags date: * +0000 files: .hgtags (glob) | |
323 | | |
|
323 | | | |
324 |
o 2 ( |
|
324 | | o 2 (INITIAL) import date: * -1000 files: (glob) | |
325 | | |
|
325 | | | | |
326 |
|
|
326 | o | 1 () ci0 date: * -1000 files: b/c (glob) | |
327 | |/ |
|
327 | |/ | |
328 | o 0 () Initial revision date: * -1000 files: a b/c (glob) |
|
328 | o 0 () Initial revision date: * -1000 files: a b/c (glob) | |
329 |
|
329 |
@@ -100,8 +100,8 b' Convert files being replaced by director' | |||||
100 | 4 clobber1 |
|
100 | 4 clobber1 | |
101 | 3 clobber2 |
|
101 | 3 clobber2 | |
102 | 2 adddb |
|
102 | 2 adddb | |
103 | 1 branch |
|
103 | 1 clobberdir | |
104 | 0 clobberdir |
|
104 | 0 branch | |
105 |
|
105 | |||
106 | $ cd hg-repo |
|
106 | $ cd hg-repo | |
107 |
|
107 | |||
@@ -210,9 +210,7 b" Test convert progress bar'" | |||||
210 | \r (no-eol) (esc) |
|
210 | \r (no-eol) (esc) | |
211 | \r (no-eol) (esc) |
|
211 | \r (no-eol) (esc) | |
212 | converting [=============================> ] 5/7\r (no-eol) (esc) |
|
212 | converting [=============================> ] 5/7\r (no-eol) (esc) | |
213 |
scanning paths [ ] 0/ |
|
213 | scanning paths [ ] 0/1\r (no-eol) (esc) | |
214 | scanning paths [===========> ] 1/3\r (no-eol) (esc) |
|
|||
215 | scanning paths [========================> ] 2/3\r (no-eol) (esc) |
|
|||
216 | getting files [===> ] 1/8\r (no-eol) (esc) |
|
214 | getting files [===> ] 1/8\r (no-eol) (esc) | |
217 | getting files [========> ] 2/8\r (no-eol) (esc) |
|
215 | getting files [========> ] 2/8\r (no-eol) (esc) | |
218 | getting files [=============> ] 3/8\r (no-eol) (esc) |
|
216 | getting files [=============> ] 3/8\r (no-eol) (esc) | |
@@ -224,7 +222,9 b" Test convert progress bar'" | |||||
224 | \r (no-eol) (esc) |
|
222 | \r (no-eol) (esc) | |
225 | \r (no-eol) (esc) |
|
223 | \r (no-eol) (esc) | |
226 | converting [===================================> ] 6/7\r (no-eol) (esc) |
|
224 | converting [===================================> ] 6/7\r (no-eol) (esc) | |
227 |
scanning paths [ ] 0/ |
|
225 | scanning paths [ ] 0/3\r (no-eol) (esc) | |
|
226 | scanning paths [===========> ] 1/3\r (no-eol) (esc) | |||
|
227 | scanning paths [========================> ] 2/3\r (no-eol) (esc) | |||
228 | getting files [===> ] 1/8\r (no-eol) (esc) |
|
228 | getting files [===> ] 1/8\r (no-eol) (esc) | |
229 | getting files [========> ] 2/8\r (no-eol) (esc) |
|
229 | getting files [========> ] 2/8\r (no-eol) (esc) | |
230 | getting files [=============> ] 3/8\r (no-eol) (esc) |
|
230 | getting files [=============> ] 3/8\r (no-eol) (esc) | |
@@ -243,7 +243,7 b" Test convert progress bar'" | |||||
243 | 4 clobber1 |
|
243 | 4 clobber1 | |
244 | 3 clobber2 |
|
244 | 3 clobber2 | |
245 | 2 adddb |
|
245 | 2 adddb | |
246 | 1 branch |
|
246 | 1 clobberdir | |
247 | 0 clobberdir |
|
247 | 0 branch | |
248 |
|
248 | |||
249 | $ cd .. |
|
249 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now