This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8118

mergestate: determine if active without looking for state files on disk
ClosedPublic

Authored by martinvonz on Feb 14 2020, 1:20 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5e3402a0b868: mergestate: determine if active without looking for state files on disk
Summary

I couldn't think of a reason that we need to check state files on disk
to determine if a merge is active. I could imagine them being for
there for detecting broken state files that would then be cleaned up
by some later command, but we always delete the entire .hg/merge/
tree, so that doesn't seem to be it.

The checks were added in 4e932dc5c113 (resolve: abort when not
applicable (BC), 2014-04-18). Perhaps there were needed for that and
then made obsolete by 6062593d8b06 (resolve: don't abort resolve -l
even when no merge is in progress, 2014-05-23).

The reason I want to delete the checks is that I think `ms =
mergestate.read(repo); ms.active() and ms.local` should be a valid
pattern, but it crashes when the merge state file is an empty file if
we consider mere presence of the file as "active".

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Feb 14 2020, 1:20 AM
pulkit accepted this revision.Feb 27 2020, 2:36 AM
This revision is now accepted and ready to land.Feb 27 2020, 2:36 AM
pulkit added a comment.Feb 27 2020, 2:57 AM

This series fails to apply on current default tip.

martinvonz added a comment.Feb 27 2020, 11:39 AM
In D8118#121598, @pulkit wrote:

This series fails to apply on current default tip.

Fixed

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (9 lines)

Diff 20212

mercurial/merge.py

return self._repo[self.other] return self._repo[self.other]
def active(self): def active(self):
"""Whether mergestate is active. """Whether mergestate is active.
Returns True if there appears to be mergestate. This is a rough proxy Returns True if there appears to be mergestate. This is a rough proxy
for "is a merge in progress." for "is a merge in progress."
""" """
# Check local variables before looking at filesystem for performance return bool(self._local) or bool(self._state)
# reasons.
return (
bool(self._local)
or bool(self._state)
or self._repo.vfs.exists(self.statepathv1)
or self._repo.vfs.exists(self.statepathv2)
)
def commit(self): def commit(self):
"""Write current state on disk (if necessary)""" """Write current state on disk (if necessary)"""
if self._dirty: if self._dirty:
records = self._makerecords() records = self._makerecords()
self._writerecords(records) self._writerecords(records)
self._dirty = False self._dirty = False