This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7902

merge: introduce a clean_update() for that use-case
ClosedPublic

Authored by martinvonz on Jan 15 2020, 8:21 PM.

Details

Reviewers
durin42
marmoute
Group Reviewers
hg-reviewers
Commits
rHGf546d2170b0f: merge: introduce a clean_update() for that use-case
Summary

I find it hard to understand what value to pass for all the arguments
to merge.update(). I would like to introduce functions that are more
specific to each use-case. We already have graft(). This patch
introduces a clean_update() and uses it in some places to show that
it works.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 15 2020, 8:21 PM
marmoute requested changes to this revision.Feb 5 2020, 6:28 PM
marmoute added a subscriber: marmoute.
marmoute added inline comments.
mercurial/merge.py
2600

The idea is great (I also always scratch my head at merge.update. However can we can some solide documentation about what this function does ?

This revision now requires changes to proceed.Feb 5 2020, 6:28 PM
martinvonz updated this revision to Diff 19929.Feb 6 2020, 2:11 AM
martinvonz marked an inline comment as done.Feb 6 2020, 2:12 AM
martinvonz added inline comments.
mercurial/merge.py
2600

Oh, of course we should. I added a sentence. I'm not sure if you consider that solid. Let me know what's missing otherwise.

marmoute accepted this revision.Feb 6 2020, 3:47 AM
martinvonz marked an inline comment as done.Feb 6 2020, 5:20 PM
martinvonz added a commit: rHGf546d2170b0f: merge: introduce a clean_update() for that use-case.
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf546d2170b0f: merge: introduce a clean_update() for that use-case (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (2 lines)
Mhgext/rebase.py (6 lines)
Mmercurial/hg.py (2 lines)
Mmercurial/merge.py (9 lines)
Mmercurial/shelve.py (2 lines)

Diff 19970

hgext/histedit.py

@action( @action(
[b'base', b'b'], [b'base', b'b'],
_(b'checkout changeset and apply further changesets from there'), _(b'checkout changeset and apply further changesets from there'),
) )
class base(histeditaction): class base(histeditaction):
def run(self): def run(self):
if self.repo[b'.'].node() != self.node: if self.repo[b'.'].node() != self.node:
mergemod.update(self.repo, self.node, branchmerge=False, force=True) mergemod.clean_update(self.repo[self.node])
return self.continueclean() return self.continueclean()
def continuedirty(self): def continuedirty(self):
abortdirty() abortdirty()
def continueclean(self): def continueclean(self):
basectx = self.repo[b'.'] basectx = self.repo[b'.']
return basectx, [] return basectx, []

hgext/rebase.py

updateifonnodes = set(rebased) updateifonnodes = set(rebased)
updateifonnodes.update(self.destmap.values()) updateifonnodes.update(self.destmap.values())
updateifonnodes.add(self.originalwd) updateifonnodes.add(self.originalwd)
shouldupdate = repo[b'.'].rev() in updateifonnodes shouldupdate = repo[b'.'].rev() in updateifonnodes
# Update away from the rebase if necessary # Update away from the rebase if necessary
if shouldupdate: if shouldupdate:
mergemod.update( mergemod.clean_update(repo[self.originalwd])
repo, self.originalwd, branchmerge=False, force=True
)
# Strip from the first rebased revision # Strip from the first rebased revision
if rebased: if rebased:
repair.strip(repo.ui, repo, strippoints, backup=backup) repair.strip(repo.ui, repo, strippoints, backup=backup)
if self.activebookmark and self.activebookmark in repo._bookmarks: if self.activebookmark and self.activebookmark in repo._bookmarks:
bookmarks.activate(repo, self.activebookmark) bookmarks.activate(repo, self.activebookmark)
# Merge phase # Merge phase
# Update to destination and merge it with local # Update to destination and merge it with local
p1ctx = repo[p1] p1ctx = repo[p1]
if wctx.isinmemory(): if wctx.isinmemory():
wctx.setbase(p1ctx) wctx.setbase(p1ctx)
else: else:
if repo[b'.'].rev() != p1: if repo[b'.'].rev() != p1:
repo.ui.debug(b" update to %d:%s\n" % (p1, p1ctx)) repo.ui.debug(b" update to %d:%s\n" % (p1, p1ctx))
mergemod.update(repo, p1, branchmerge=False, force=True) mergemod.clean_update(p1ctx)
else: else:
repo.ui.debug(b" already in destination\n") repo.ui.debug(b" already in destination\n")
# This is, alas, necessary to invalidate workingctx's manifest cache, # This is, alas, necessary to invalidate workingctx's manifest cache,
# as well as other data we litter on it in other places. # as well as other data we litter on it in other places.
wctx = repo[None] wctx = repo[None]
repo.dirstate.write(repo.currenttransaction()) repo.dirstate.write(repo.currenttransaction())
ctx = repo[rev] ctx = repo[rev]
repo.ui.debug(b" merge against %d:%s\n" % (rev, ctx)) repo.ui.debug(b" merge against %d:%s\n" % (rev, ctx))

mercurial/hg.py

if ms.active(): if ms.active():
# there were conflicts # there were conflicts
node = ms.localctx.hex() node = ms.localctx.hex()
else: else:
# there were no conficts, mergestate was not stored # there were no conficts, mergestate was not stored
node = repo[b'.'].hex() node = repo[b'.'].hex()
repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12]) repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
stats = mergemod.update(repo, node, branchmerge=False, force=True) stats = mergemod.clean_update(repo[node])
assert stats.unresolvedcount == 0 assert stats.unresolvedcount == 0
_showstats(repo, stats) _showstats(repo, stats)
def _incoming( def _incoming(
displaychlist, subreporecurse, ui, repo, source, opts, buffered=False displaychlist, subreporecurse, ui, repo, source, opts, buffered=False
): ):
""" """

mercurial/merge.py

if updatedirstate: if updatedirstate:
repo.hook( repo.hook(
b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
) )
return stats return stats
def clean_update(ctx, wc=None):
marmouteUnsubmitted
Done

The idea is great (I also always scratch my head at merge.update. However can we can some solide documentation about what this function does ?

marmoute: The idea is great (I also always scratch my head at `merge.update`. However can we can some…
martinvonzAuthorUnsubmitted
Done

Oh, of course we should. I added a sentence. I'm not sure if you consider that solid. Let me know what's missing otherwise.

martinvonz: Oh, of course we should. I added a sentence. I'm not sure if you consider that solid. Let me…
"""Do a clean update to the given commit.
This involves updating to the commit and discarding any changes in the
working copy.
"""
return update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc)
def graft( def graft(
repo, repo,
ctx, ctx,
base=None, base=None,
labels=None, labels=None,
keepparent=False, keepparent=False,
keepconflictparent=False, keepconflictparent=False,
wctx=None, wctx=None,

mercurial/shelve.py

def unshelveabort(ui, repo, state): def unshelveabort(ui, repo, state):
"""subcommand that abort an in-progress unshelve""" """subcommand that abort an in-progress unshelve"""
with repo.lock(): with repo.lock():
try: try:
checkparents(repo, state) checkparents(repo, state)
merge.update(repo, state.pendingctx, branchmerge=False, force=True) merge.clean_update(state.pendingctx)
if state.activebookmark and state.activebookmark in repo._bookmarks: if state.activebookmark and state.activebookmark in repo._bookmarks:
bookmarks.activate(repo, state.activebookmark) bookmarks.activate(repo, state.activebookmark)
mergefiles(ui, repo, state.wctx, state.pendingctx) mergefiles(ui, repo, state.wctx, state.pendingctx)
if not phases.supportinternal(repo): if not phases.supportinternal(repo):
repair.strip( repair.strip(
ui, repo, state.nodestoremove, backup=False, topic=b'shelve' ui, repo, state.nodestoremove, backup=False, topic=b'shelve'
) )
finally: finally: