Mercurial > public > mercurial-scm > hg
comparison contrib/phabricator.py @ 38423:32fba6fe893d
scmutil: make cleanupnodes optionally also fix the phase
We have had multiple bugs where the phase wasn't correctly carried
forward to a rewritten changeset (for example: phabricator, split,
evolve, fix). Handling the phase update in cleanupnodes() makes it
less likely to happen again, especially once we have made it fix the
phase by default (perhaps in the next release cycle).
This patch also updates all applicable callers so we get some testing
of it.
Note that rebase and histedit can't be fixed yet because they call
cleanupnodes() only at the end and the phase may have been changed by
the user when the rebase/histedit was interrupted (due to merge
conflicts). I think we should make them write one commit at a time (as
it already does), along with associated obsmarkers, bookmark moves,
etc. When that's done, we can switch them over to cleanupnodes().
Differential Revision: https://phab.mercurial-scm.org/D3818
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 19 Jun 2018 11:07:40 -0700 |
| parents | 81a4be7099fa |
| children | 0dce1297dd01 |
comparison
equal
deleted
inserted
replaced
| 38422:a6addfd64507 | 38423:32fba6fe893d |
|---|---|
| 578 ] | 578 ] |
| 579 new = context.metadataonlyctx( | 579 new = context.metadataonlyctx( |
| 580 repo, old, parents=parents, text=newdesc, | 580 repo, old, parents=parents, text=newdesc, |
| 581 user=old.user(), date=old.date(), extra=old.extra()) | 581 user=old.user(), date=old.date(), extra=old.extra()) |
| 582 | 582 |
| 583 overrides = {(b'phases', b'new-commit'): old.phase()} | 583 newnode = new.commit() |
| 584 with ui.configoverride(overrides, b'phabsend'): | |
| 585 newnode = new.commit() | |
| 586 | 584 |
| 587 mapping[old.node()] = [newnode] | 585 mapping[old.node()] = [newnode] |
| 588 # Update diff property | 586 # Update diff property |
| 589 writediffproperties(unfi[newnode], diffmap[old.node()]) | 587 writediffproperties(unfi[newnode], diffmap[old.node()]) |
| 590 # Remove local tags since it's no longer necessary | 588 # Remove local tags since it's no longer necessary |
| 591 tagname = b'D%d' % drevid | 589 tagname = b'D%d' % drevid |
| 592 if tagname in repo.tags(): | 590 if tagname in repo.tags(): |
| 593 tags.tag(repo, tagname, nullid, message=None, user=None, | 591 tags.tag(repo, tagname, nullid, message=None, user=None, |
| 594 date=None, local=True) | 592 date=None, local=True) |
| 595 scmutil.cleanupnodes(repo, mapping, b'phabsend') | 593 scmutil.cleanupnodes(repo, mapping, b'phabsend', fixphase=True) |
| 596 if wnode in mapping: | 594 if wnode in mapping: |
| 597 unfi.setparents(mapping[wnode][0]) | 595 unfi.setparents(mapping[wnode][0]) |
| 598 | 596 |
| 599 # Map from "hg:meta" keys to header understood by "hg import". The order is | 597 # Map from "hg:meta" keys to header understood by "hg import". The order is |
| 600 # consistent with "hg export" output. | 598 # consistent with "hg export" output. |