D7900: merge: avoid a negation in the definition of updatedirstate
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Jan 24 11:43:35 EST 2020
martinvonz marked an inline comment as done.
martinvonz updated this revision to Diff 19554.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7900?vs=19336&id=19554
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7900/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7900
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -2501,13 +2501,9 @@
if not branchmerge: # just jump to the new rev
fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b''
# If we're doing a partial update, we need to skip updating
- # the dirstate, so make a note of any partial-ness to the
- # update here.
- if matcher is None or matcher.always():
- partial = False
- else:
- partial = True
- updatedirstate = not partial and not wc.isinmemory()
+ # the dirstate.
+ always = matcher is None or matcher.always()
+ updatedirstate = always and not wc.isinmemory()
if updatedirstate:
repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
# note that we're in the middle of an update
To: martinvonz, #hg-reviewers
Cc: pulkit, mercurial-devel
More information about the Mercurial-devel
mailing list