##// END OF EJS Templates
rebase: use '>= 0' to know is a revision was rebased...
Pierre-Yves David -
r23489:fe4157d8 default
parent child Browse files
Show More
@@ -817,7 +817,7 b' def inrebase(repo, originalwd, state):'
817
817
818 def abort(repo, originalwd, target, state):
818 def abort(repo, originalwd, target, state):
819 'Restore the repository to its original state'
819 'Restore the repository to its original state'
820 dstates = [s for s in state.values() if s > nullrev]
820 dstates = [s for s in state.values() if s >= 0]
821 immutable = [d for d in dstates if not repo[d].mutable()]
821 immutable = [d for d in dstates if not repo[d].mutable()]
822 cleanup = True
822 cleanup = True
823 if immutable:
823 if immutable:
@@ -840,7 +840,7 b' def abort(repo, originalwd, target, stat'
840 merge.update(repo, originalwd, False, True, False)
840 merge.update(repo, originalwd, False, True, False)
841
841
842 # Strip from the first rebased revision
842 # Strip from the first rebased revision
843 rebased = filter(lambda x: x > -1 and x != target, state.values())
843 rebased = filter(lambda x: x >= 0 and x != target, state.values())
844 if rebased:
844 if rebased:
845 strippoints = [c.node() for c in repo.set('roots(%ld)', rebased)]
845 strippoints = [c.node() for c in repo.set('roots(%ld)', rebased)]
846 # no backup of rebased cset versions needed
846 # no backup of rebased cset versions needed
@@ -1019,7 +1019,7 b' def summaryhook(ui, repo):'
1019 msg = _('rebase: (use "hg rebase --abort" to clear broken state)\n')
1019 msg = _('rebase: (use "hg rebase --abort" to clear broken state)\n')
1020 ui.write(msg)
1020 ui.write(msg)
1021 return
1021 return
1022 numrebased = len([i for i in state.itervalues() if i != -1])
1022 numrebased = len([i for i in state.itervalues() if i >= 0])
1023 # i18n: column positioning for "hg summary"
1023 # i18n: column positioning for "hg summary"
1024 ui.write(_('rebase: %s, %s (rebase --continue)\n') %
1024 ui.write(_('rebase: %s, %s (rebase --continue)\n') %
1025 (ui.label(_('%d rebased'), 'rebase.rebased') % numrebased,
1025 (ui.label(_('%d rebased'), 'rebase.rebased') % numrebased,
General Comments 0
You need to be logged in to leave comments. Login now