##// END OF EJS Templates
rebase: add a 'revtodo' constant...
Pierre-Yves David -
r23490:102f144f default
parent child Browse files
Show More
@@ -23,6 +23,7 b' from mercurial.lock import release'
23 23 from mercurial.i18n import _
24 24 import os, errno
25 25
26 revtodo = -1
26 27 nullmerge = -2
27 28 revignored = -3
28 29
@@ -367,7 +368,7 b' def rebase(ui, repo, **opts):'
367 368 pos = 0
368 369 for rev in sortedstate:
369 370 pos += 1
370 if state[rev] == -1:
371 if state[rev] == revtodo:
371 372 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])),
372 373 _('changesets'), total)
373 374 p1, p2, base = defineparents(repo, rev, target, state,
@@ -790,7 +791,7 b' def restorestatus(repo):'
790 791 if not collapse:
791 792 seen = set([target])
792 793 for old, new in sorted(state.items()):
793 if new != nullrev and new in seen:
794 if new != revtodo and new in seen:
794 795 skipped.add(old)
795 796 seen.add(new)
796 797 repo.ui.debug('computed skipped revs: %s\n' %
@@ -882,7 +883,7 b' def buildstate(repo, dest, rebaseset, co'
882 883 return None
883 884
884 885 repo.ui.debug('rebase onto %d starting from %s\n' % (dest, root))
885 state.update(dict.fromkeys(rebaseset, nullrev))
886 state.update(dict.fromkeys(rebaseset, revtodo))
886 887 # Rebase tries to turn <dest> into a parent of <root> while
887 888 # preserving the number of parents of rebased changesets:
888 889 #
General Comments 0
You need to be logged in to leave comments. Login now