Show More
@@ -206,7 +206,7 b' class converter(object):' | |||||
206 | _('Overriding mapping for author %s, was %s, will be %s\n') |
|
206 | _('Overriding mapping for author %s, was %s, will be %s\n') | |
207 | % (srcauthor, self.authors[srcauthor], dstauthor)) |
|
207 | % (srcauthor, self.authors[srcauthor], dstauthor)) | |
208 | else: |
|
208 | else: | |
209 |
self.ui.debug(_(' |
|
209 | self.ui.debug(_('mapping author %s to %s\n') | |
210 | % (srcauthor, dstauthor)) |
|
210 | % (srcauthor, dstauthor)) | |
211 | self.authors[srcauthor] = dstauthor |
|
211 | self.authors[srcauthor] = dstauthor | |
212 | except IndexError: |
|
212 | except IndexError: |
@@ -263,7 +263,7 b' def createlog(ui, directory=None, root="' | |||||
263 | if re_31.match(line): |
|
263 | if re_31.match(line): | |
264 | state = 5 |
|
264 | state = 5 | |
265 | else: |
|
265 | else: | |
266 |
assert not re_32.match(line), _(' |
|
266 | assert not re_32.match(line), _('must have at least some revisions') | |
267 |
|
267 | |||
268 | elif state == 5: |
|
268 | elif state == 5: | |
269 | # expecting revision number and possibly (ignored) lock indication |
|
269 | # expecting revision number and possibly (ignored) lock indication |
@@ -601,7 +601,7 b' class svn_source(converter_source):' | |||||
601 | part = "/".join(parts[:i]) |
|
601 | part = "/".join(parts[:i]) | |
602 | info = part, copyfrom.get(part, None) |
|
602 | info = part, copyfrom.get(part, None) | |
603 | if info[1] is not None: |
|
603 | if info[1] is not None: | |
604 |
self.ui.debug(_(" |
|
604 | self.ui.debug(_("found parent directory %s\n") % info[1]) | |
605 | rc = info |
|
605 | rc = info | |
606 | return rc |
|
606 | return rc | |
607 |
|
607 | |||
@@ -616,7 +616,7 b' class svn_source(converter_source):' | |||||
616 | self.ui.debug(entrypath[len(frompath):] + '\n') |
|
616 | self.ui.debug(entrypath[len(frompath):] + '\n') | |
617 | entrypath = froment.copyfrom_path + entrypath[len(frompath):] |
|
617 | entrypath = froment.copyfrom_path + entrypath[len(frompath):] | |
618 | fromrev = froment.copyfrom_rev |
|
618 | fromrev = froment.copyfrom_rev | |
619 |
self.ui.debug(_(" |
|
619 | self.ui.debug(_("info: %s %s %s %s\n") % (frompath, froment, ent, entrypath)) | |
620 |
|
620 | |||
621 | # We can avoid the reparent calls if the module has not changed |
|
621 | # We can avoid the reparent calls if the module has not changed | |
622 | # but it probably does not worth the pain. |
|
622 | # but it probably does not worth the pain. | |
@@ -757,7 +757,7 b' class svn_source(converter_source):' | |||||
757 | self.ui.note(_('found parent of branch %s at %d: %s\n') % |
|
757 | self.ui.note(_('found parent of branch %s at %d: %s\n') % | |
758 | (self.module, prevnum, prevmodule)) |
|
758 | (self.module, prevnum, prevmodule)) | |
759 | else: |
|
759 | else: | |
760 |
self.ui.debug(_(" |
|
760 | self.ui.debug(_("no copyfrom path, don't know what to do.\n")) | |
761 |
|
761 | |||
762 | paths = [] |
|
762 | paths = [] | |
763 | # filter out unrelated paths |
|
763 | # filter out unrelated paths |
@@ -166,7 +166,7 b' def dodiff(ui, repo, diffcmd, diffopts, ' | |||||
166 |
|
166 | |||
167 | for copy_fn, working_fn, mtime in fns_and_mtime: |
|
167 | for copy_fn, working_fn, mtime in fns_and_mtime: | |
168 | if os.path.getmtime(copy_fn) != mtime: |
|
168 | if os.path.getmtime(copy_fn) != mtime: | |
169 |
ui.debug(_(' |
|
169 | ui.debug(_('file changed while diffing. ' | |
170 | 'Overwriting: %s (src: %s)\n') % (working_fn, copy_fn)) |
|
170 | 'Overwriting: %s (src: %s)\n') % (working_fn, copy_fn)) | |
171 | util.copyfile(copy_fn, working_fn) |
|
171 | util.copyfile(copy_fn, working_fn) | |
172 |
|
172 |
@@ -34,7 +34,7 b' def rebasemerge(repo, rev, first=False):' | |||||
34 | if not first: |
|
34 | if not first: | |
35 | ancestor.ancestor = newancestor |
|
35 | ancestor.ancestor = newancestor | |
36 | else: |
|
36 | else: | |
37 |
repo.ui.debug(_(" |
|
37 | repo.ui.debug(_("first revision, do not change ancestor\n")) | |
38 | stats = merge.update(repo, rev, True, True, False) |
|
38 | stats = merge.update(repo, rev, True, True, False) | |
39 | return stats |
|
39 | return stats | |
40 |
|
40 |
@@ -1579,7 +1579,7 b' class localrepository(repo.repository):' | |||||
1579 | if self.ui.verbose or source == 'bundle': |
|
1579 | if self.ui.verbose or source == 'bundle': | |
1580 | self.ui.status(_("%d changesets found\n") % len(nodes)) |
|
1580 | self.ui.status(_("%d changesets found\n") % len(nodes)) | |
1581 | if self.ui.debugflag: |
|
1581 | if self.ui.debugflag: | |
1582 |
self.ui.debug(_(" |
|
1582 | self.ui.debug(_("list of changesets:\n")) | |
1583 | for node in nodes: |
|
1583 | for node in nodes: | |
1584 | self.ui.debug("%s\n" % hex(node)) |
|
1584 | self.ui.debug("%s\n" % hex(node)) | |
1585 |
|
1585 |
@@ -15,7 +15,7 b' pushing to ../b' | |||||
15 | searching for changes |
|
15 | searching for changes | |
16 | common changesets up to 6675d58eff77 |
|
16 | common changesets up to 6675d58eff77 | |
17 | 3 changesets found |
|
17 | 3 changesets found | |
18 |
|
|
18 | list of changesets: | |
19 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
19 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
20 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
20 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
21 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
21 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -43,7 +43,7 b' pushing to ../b' | |||||
43 | searching for changes |
|
43 | searching for changes | |
44 | common changesets up to 6675d58eff77 |
|
44 | common changesets up to 6675d58eff77 | |
45 | 3 changesets found |
|
45 | 3 changesets found | |
46 |
|
|
46 | list of changesets: | |
47 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
47 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
48 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
48 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
49 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
49 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -75,7 +75,7 b' pushing to ../b' | |||||
75 | searching for changes |
|
75 | searching for changes | |
76 | common changesets up to 6675d58eff77 |
|
76 | common changesets up to 6675d58eff77 | |
77 | 3 changesets found |
|
77 | 3 changesets found | |
78 |
|
|
78 | list of changesets: | |
79 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
79 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
80 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
80 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
81 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
81 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -112,7 +112,7 b' pushing to ../b' | |||||
112 | searching for changes |
|
112 | searching for changes | |
113 | common changesets up to 6675d58eff77 |
|
113 | common changesets up to 6675d58eff77 | |
114 | 3 changesets found |
|
114 | 3 changesets found | |
115 |
|
|
115 | list of changesets: | |
116 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
116 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
117 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
117 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
118 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
118 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -151,7 +151,7 b' pushing to ../b' | |||||
151 | searching for changes |
|
151 | searching for changes | |
152 | common changesets up to 6675d58eff77 |
|
152 | common changesets up to 6675d58eff77 | |
153 | 3 changesets found |
|
153 | 3 changesets found | |
154 |
|
|
154 | list of changesets: | |
155 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
155 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
156 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
156 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
157 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
157 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -193,7 +193,7 b' pushing to ../b' | |||||
193 | searching for changes |
|
193 | searching for changes | |
194 | common changesets up to 6675d58eff77 |
|
194 | common changesets up to 6675d58eff77 | |
195 | 3 changesets found |
|
195 | 3 changesets found | |
196 |
|
|
196 | list of changesets: | |
197 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
197 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
198 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
198 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
199 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
199 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -234,7 +234,7 b' pushing to ../b' | |||||
234 | searching for changes |
|
234 | searching for changes | |
235 | common changesets up to 6675d58eff77 |
|
235 | common changesets up to 6675d58eff77 | |
236 | 3 changesets found |
|
236 | 3 changesets found | |
237 |
|
|
237 | list of changesets: | |
238 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
238 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
239 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
239 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
240 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
240 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -278,7 +278,7 b' pushing to ../b' | |||||
278 | searching for changes |
|
278 | searching for changes | |
279 | common changesets up to 6675d58eff77 |
|
279 | common changesets up to 6675d58eff77 | |
280 | 3 changesets found |
|
280 | 3 changesets found | |
281 |
|
|
281 | list of changesets: | |
282 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
282 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
283 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
283 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
284 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
284 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -321,7 +321,7 b' pushing to ../b' | |||||
321 | searching for changes |
|
321 | searching for changes | |
322 | common changesets up to 6675d58eff77 |
|
322 | common changesets up to 6675d58eff77 | |
323 | 3 changesets found |
|
323 | 3 changesets found | |
324 |
|
|
324 | list of changesets: | |
325 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
325 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
326 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
326 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
327 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
327 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -365,7 +365,7 b' pushing to ../b' | |||||
365 | searching for changes |
|
365 | searching for changes | |
366 | common changesets up to 6675d58eff77 |
|
366 | common changesets up to 6675d58eff77 | |
367 | 3 changesets found |
|
367 | 3 changesets found | |
368 |
|
|
368 | list of changesets: | |
369 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
369 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
370 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
370 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
371 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
371 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -409,7 +409,7 b' pushing to ../b' | |||||
409 | searching for changes |
|
409 | searching for changes | |
410 | common changesets up to 6675d58eff77 |
|
410 | common changesets up to 6675d58eff77 | |
411 | 3 changesets found |
|
411 | 3 changesets found | |
412 |
|
|
412 | list of changesets: | |
413 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
413 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
414 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
414 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
415 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
415 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -458,7 +458,7 b' pushing to ../b' | |||||
458 | searching for changes |
|
458 | searching for changes | |
459 | common changesets up to 6675d58eff77 |
|
459 | common changesets up to 6675d58eff77 | |
460 | 3 changesets found |
|
460 | 3 changesets found | |
461 |
|
|
461 | list of changesets: | |
462 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
462 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
463 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
463 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
464 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
464 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -506,7 +506,7 b' pushing to ../b' | |||||
506 | searching for changes |
|
506 | searching for changes | |
507 | common changesets up to 6675d58eff77 |
|
507 | common changesets up to 6675d58eff77 | |
508 | 3 changesets found |
|
508 | 3 changesets found | |
509 |
|
|
509 | list of changesets: | |
510 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
510 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
511 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
511 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
512 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
512 | 911600dab2ae7a9baff75958b84fe606851ce955 | |
@@ -561,7 +561,7 b' pushing to ../b' | |||||
561 | searching for changes |
|
561 | searching for changes | |
562 | common changesets up to 6675d58eff77 |
|
562 | common changesets up to 6675d58eff77 | |
563 | 3 changesets found |
|
563 | 3 changesets found | |
564 |
|
|
564 | list of changesets: | |
565 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 |
|
565 | ef1ea85a6374b77d6da9dcda9541f498f2d17df7 | |
566 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd |
|
566 | f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd | |
567 | 911600dab2ae7a9baff75958b84fe606851ce955 |
|
567 | 911600dab2ae7a9baff75958b84fe606851ce955 |
General Comments 0
You need to be logged in to leave comments.
Login now