Mercurial > hg
comparison hgext/rebase.py @ 23460:8dc45c905989
rebase: always store rev in state, also when collapsing
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 02 Dec 2014 05:12:59 +0100 |
parents | 2e047b1558a5 |
children | ffef6d503ab2 |
comparison
equal
deleted
inserted
replaced
23459:2e047b1558a5 | 23460:8dc45c905989 |
---|---|
427 commitmsg += '\n* %s' % repo[rebased].description() | 427 commitmsg += '\n* %s' % repo[rebased].description() |
428 editopt = True | 428 editopt = True |
429 editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | 429 editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) |
430 newnode = concludenode(repo, rev, p1, external, commitmsg=commitmsg, | 430 newnode = concludenode(repo, rev, p1, external, commitmsg=commitmsg, |
431 extrafn=extrafn, editor=editor) | 431 extrafn=extrafn, editor=editor) |
432 if newnode is None: | |
433 newrev = target | |
434 else: | |
435 newrev = repo[newnode].rev() | |
432 for oldrev in state.iterkeys(): | 436 for oldrev in state.iterkeys(): |
433 if state[oldrev] > nullmerge: | 437 if state[oldrev] > nullmerge: |
434 state[oldrev] = newnode | 438 state[oldrev] = newrev |
435 | 439 |
436 if 'qtip' in repo.tags(): | 440 if 'qtip' in repo.tags(): |
437 updatemq(repo, state, skipped, **opts) | 441 updatemq(repo, state, skipped, **opts) |
438 | 442 |
439 if currentbookmarks: | 443 if currentbookmarks: |