Mercurial > hg
comparison hgext/rebase.py @ 19477:e9351f0d9a2a stable
rebase: reorder parent check and state storage
This could cause a rebase to be 'in progress' even though it aborted.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 24 Jul 2013 23:51:44 -0500 |
parents | f7bcc2e56279 |
children | e5a5790a3185 |
comparison
equal
deleted
inserted
replaced
19476:4fed15d4c5aa | 19477:e9351f0d9a2a |
---|---|
256 for rev in sortedstate: | 256 for rev in sortedstate: |
257 pos += 1 | 257 pos += 1 |
258 if state[rev] == -1: | 258 if state[rev] == -1: |
259 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])), | 259 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])), |
260 _('changesets'), total) | 260 _('changesets'), total) |
261 p1, p2 = defineparents(repo, rev, target, state, | |
262 targetancestors) | |
261 storestatus(repo, originalwd, target, state, collapsef, keepf, | 263 storestatus(repo, originalwd, target, state, collapsef, keepf, |
262 keepbranchesf, external, activebookmark) | 264 keepbranchesf, external, activebookmark) |
263 p1, p2 = defineparents(repo, rev, target, state, | |
264 targetancestors) | |
265 if len(repo.parents()) == 2: | 265 if len(repo.parents()) == 2: |
266 repo.ui.debug('resuming interrupted rebase\n') | 266 repo.ui.debug('resuming interrupted rebase\n') |
267 else: | 267 else: |
268 try: | 268 try: |
269 ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | 269 ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |