Show More
@@ -919,7 +919,7 b' def _definedestmap(ui, repo, rbsrt, dest' | |||||
919 | dest = scmutil.revsingle(repo, destf) |
|
919 | dest = scmutil.revsingle(repo, destf) | |
920 | else: |
|
920 | else: | |
921 | dest = repo[_destrebase(repo, base, destspace=destspace)] |
|
921 | dest = repo[_destrebase(repo, base, destspace=destspace)] | |
922 |
destf = |
|
922 | destf = bytes(dest) | |
923 |
|
923 | |||
924 | roots = [] # selected children of branching points |
|
924 | roots = [] # selected children of branching points | |
925 | bpbase = {} # {branchingpoint: [origbase]} |
|
925 | bpbase = {} # {branchingpoint: [origbase]} | |
@@ -951,7 +951,7 b' def _definedestmap(ui, repo, rbsrt, dest' | |||||
951 | ui.status(_('nothing to rebase - "base" %s is ' |
|
951 | ui.status(_('nothing to rebase - "base" %s is ' | |
952 | 'already an ancestor of destination ' |
|
952 | 'already an ancestor of destination ' | |
953 | '%s\n') % |
|
953 | '%s\n') % | |
954 |
('+'.join( |
|
954 | ('+'.join(bytes(repo[r]) for r in base), | |
955 | dest)) |
|
955 | dest)) | |
956 | else: |
|
956 | else: | |
957 | ui.status(_('nothing to rebase - working ' |
|
957 | ui.status(_('nothing to rebase - working ' | |
@@ -959,7 +959,7 b' def _definedestmap(ui, repo, rbsrt, dest' | |||||
959 | 'ancestor of destination %s\n') % dest) |
|
959 | 'ancestor of destination %s\n') % dest) | |
960 | else: # can it happen? |
|
960 | else: # can it happen? | |
961 | ui.status(_('nothing to rebase from %s to %s\n') % |
|
961 | ui.status(_('nothing to rebase from %s to %s\n') % | |
962 |
('+'.join( |
|
962 | ('+'.join(bytes(repo[r]) for r in base), dest)) | |
963 | return None |
|
963 | return None | |
964 | # If rebasing the working copy parent, force in-memory merge to be off. |
|
964 | # If rebasing the working copy parent, force in-memory merge to be off. | |
965 | # |
|
965 | # | |
@@ -981,7 +981,7 b' def _definedestmap(ui, repo, rbsrt, dest' | |||||
981 |
|
981 | |||
982 | if not destf: |
|
982 | if not destf: | |
983 | dest = repo[_destrebase(repo, rebaseset, destspace=destspace)] |
|
983 | dest = repo[_destrebase(repo, rebaseset, destspace=destspace)] | |
984 |
destf = |
|
984 | destf = bytes(dest) | |
985 |
|
985 | |||
986 | allsrc = revsetlang.formatspec('%ld', rebaseset) |
|
986 | allsrc = revsetlang.formatspec('%ld', rebaseset) | |
987 | alias = {'ALLSRC': allsrc} |
|
987 | alias = {'ALLSRC': allsrc} | |
@@ -1039,7 +1039,7 b' def externalparent(repo, state, destance' | |||||
1039 | raise error.Abort(_('unable to collapse on top of %s, there is more ' |
|
1039 | raise error.Abort(_('unable to collapse on top of %s, there is more ' | |
1040 | 'than one external parent: %s') % |
|
1040 | 'than one external parent: %s') % | |
1041 | (max(destancestors), |
|
1041 | (max(destancestors), | |
1042 |
', '.join( |
|
1042 | ', '.join("%d" % p for p in sorted(parents)))) | |
1043 |
|
1043 | |||
1044 | def concludememorynode(repo, rev, p1, p2, wctx=None, |
|
1044 | def concludememorynode(repo, rev, p1, p2, wctx=None, | |
1045 | commitmsg=None, editor=None, extrafn=None, |
|
1045 | commitmsg=None, editor=None, extrafn=None, | |
@@ -1233,7 +1233,7 b' def _checkobsrebase(repo, ui, rebaseobsr' | |||||
1233 | divergencebasecandidates = rebaseobsrevs - rebaseobsskipped |
|
1233 | divergencebasecandidates = rebaseobsrevs - rebaseobsskipped | |
1234 |
|
1234 | |||
1235 | if divergencebasecandidates and not divergenceok: |
|
1235 | if divergencebasecandidates and not divergenceok: | |
1236 |
divhashes = ( |
|
1236 | divhashes = (bytes(repo[r]) | |
1237 | for r in divergencebasecandidates) |
|
1237 | for r in divergencebasecandidates) | |
1238 | msg = _("this rebase will cause " |
|
1238 | msg = _("this rebase will cause " | |
1239 | "divergences from: %s") |
|
1239 | "divergences from: %s") | |
@@ -1470,10 +1470,10 b' def updatemq(repo, state, skipped, **opt' | |||||
1470 | for rev in sorted(mqrebase, reverse=True): |
|
1470 | for rev in sorted(mqrebase, reverse=True): | |
1471 | if rev not in skipped: |
|
1471 | if rev not in skipped: | |
1472 | name, isgit = mqrebase[rev] |
|
1472 | name, isgit = mqrebase[rev] | |
1473 |
repo.ui.note(_('updating mq patch %s to % |
|
1473 | repo.ui.note(_('updating mq patch %s to %d:%s\n') % | |
1474 | (name, state[rev], repo[state[rev]])) |
|
1474 | (name, state[rev], repo[state[rev]])) | |
1475 | mq.qimport(repo, (), patchname=name, git=isgit, |
|
1475 | mq.qimport(repo, (), patchname=name, git=isgit, | |
1476 |
rev=[ |
|
1476 | rev=["%d" % state[rev]]) | |
1477 | else: |
|
1477 | else: | |
1478 | # Rebased and skipped |
|
1478 | # Rebased and skipped | |
1479 | skippedpatches.add(mqrebase[rev][0]) |
|
1479 | skippedpatches.add(mqrebase[rev][0]) | |
@@ -1554,7 +1554,7 b' def abort(repo, originalwd, destmap, sta' | |||||
1554 | cleanup = True |
|
1554 | cleanup = True | |
1555 | if immutable: |
|
1555 | if immutable: | |
1556 | repo.ui.warn(_("warning: can't clean up public changesets %s\n") |
|
1556 | repo.ui.warn(_("warning: can't clean up public changesets %s\n") | |
1557 |
% ', '.join( |
|
1557 | % ', '.join(bytes(repo[r]) for r in immutable), | |
1558 | hint=_("see 'hg help phases' for details")) |
|
1558 | hint=_("see 'hg help phases' for details")) | |
1559 | cleanup = False |
|
1559 | cleanup = False | |
1560 |
|
1560 |
General Comments 0
You need to be logged in to leave comments.
Login now