Mercurial > hg
comparison hgext/rebase.py @ 32594:517841766994
rebase: drop unnecessary parentchange call
We're calling localrepo.setparents here, not dirstate.setparents.
localrepo.setparents calls dirstate.parentchange already.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 31 May 2017 19:46:04 -0700 |
parents | 47e4c6bb39f1 |
children | 07d5a503124c |
comparison
equal
deleted
inserted
replaced
32593:e4d0b2efb8b5 | 32594:517841766994 |
---|---|
425 # merge state clean-up path doesn't happen, so do it | 425 # merge state clean-up path doesn't happen, so do it |
426 # here. Fix issue5494 | 426 # here. Fix issue5494 |
427 mergemod.mergestate.clean(repo) | 427 mergemod.mergestate.clean(repo) |
428 else: | 428 else: |
429 # Skip commit if we are collapsing | 429 # Skip commit if we are collapsing |
430 with repo.dirstate.parentchange(): | 430 repo.setparents(repo[p1].node()) |
431 repo.setparents(repo[p1].node()) | |
432 newnode = None | 431 newnode = None |
433 # Update the state | 432 # Update the state |
434 if newnode is not None: | 433 if newnode is not None: |
435 self.state[rev] = repo[newnode].rev() | 434 self.state[rev] = repo[newnode].rev() |
436 ui.debug('rebased as %s\n' % short(newnode)) | 435 ui.debug('rebased as %s\n' % short(newnode)) |