This revision was automatically updated to reflect the committed changes. Closed by commit rHG7d9ed7fb760f: py3: replace str() calls with their preferred bytes equivalent (authored by pulkit, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2499?vs=6199&id=6231 REVISION DETAIL https://phab.mercurial-scm.org/D2499 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -919,7 +919,7 @@ dest = scmutil.revsingle(repo, destf) else: dest = repo[_destrebase(repo, base, destspace=destspace)] - destf = str(dest) + destf = bytes(dest) roots = [] # selected children of branching points bpbase = {} # {branchingpoint: [origbase]} @@ -951,15 +951,15 @@ ui.status(_('nothing to rebase - "base" %s is ' 'already an ancestor of destination ' '%s\n') % - ('+'.join(str(repo[r]) for r in base), + ('+'.join(bytes(repo[r]) for r in base), dest)) else: ui.status(_('nothing to rebase - working ' 'directory parent is already an ' 'ancestor of destination %s\n') % dest) else: # can it happen? ui.status(_('nothing to rebase from %s to %s\n') % - ('+'.join(str(repo[r]) for r in base), dest)) + ('+'.join(bytes(repo[r]) for r in base), dest)) return None # If rebasing the working copy parent, force in-memory merge to be off. # @@ -981,7 +981,7 @@ if not destf: dest = repo[_destrebase(repo, rebaseset, destspace=destspace)] - destf = str(dest) + destf = bytes(dest) allsrc = revsetlang.formatspec('%ld', rebaseset) alias = {'ALLSRC': allsrc} @@ -1039,7 +1039,7 @@ raise error.Abort(_('unable to collapse on top of %s, there is more ' 'than one external parent: %s') % (max(destancestors), - ', '.join(str(p) for p in sorted(parents)))) + ', '.join("%d" % p for p in sorted(parents)))) def concludememorynode(repo, rev, p1, p2, wctx=None, commitmsg=None, editor=None, extrafn=None, @@ -1233,7 +1233,7 @@ divergencebasecandidates = rebaseobsrevs - rebaseobsskipped if divergencebasecandidates and not divergenceok: - divhashes = (str(repo[r]) + divhashes = (bytes(repo[r]) for r in divergencebasecandidates) msg = _("this rebase will cause " "divergences from: %s") @@ -1470,10 +1470,10 @@ for rev in sorted(mqrebase, reverse=True): if rev not in skipped: name, isgit = mqrebase[rev] - repo.ui.note(_('updating mq patch %s to %s:%s\n') % + repo.ui.note(_('updating mq patch %s to %d:%s\n') % (name, state[rev], repo[state[rev]])) mq.qimport(repo, (), patchname=name, git=isgit, - rev=[str(state[rev])]) + rev=["%d" % state[rev]]) else: # Rebased and skipped skippedpatches.add(mqrebase[rev][0]) @@ -1554,7 +1554,7 @@ cleanup = True if immutable: repo.ui.warn(_("warning: can't clean up public changesets %s\n") - % ', '.join(str(repo[r]) for r in immutable), + % ', '.join(bytes(repo[r]) for r in immutable), hint=_("see 'hg help phases' for details")) cleanup = False To: pulkit, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
