This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7984

clean: check that there are no conflicts after
ClosedPublic

Authored by martinvonz on Jan 24 2020, 12:36 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGabcc82bf0717: clean: check that there are no conflicts after
Summary

As noted by Pulkit, there should never be any conflicts after doing a
clean update, so hg.clean() should never return True. Let's check
that assertion instead to clarify the code. The callers will now get a
None instead of a False returned, but that should be fine (both
result in a 0 exit status).

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 24 2020, 12:36 PM
pulkit accepted this revision.Jan 24 2020, 5:10 PM
This revision is now accepted and ready to land.Jan 24 2020, 5:10 PM
martinvonz added a commit: rHGabcc82bf0717: clean: check that there are no conflicts after.Jan 24 2020, 6:26 PM
Closed by commit rHGabcc82bf0717: clean: check that there are no conflicts after (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (2 lines)

Diff 19571

mercurial/hg.py

# naming conflict in clone() # naming conflict in clone()
_update = update _update = update
def clean(repo, node, show_stats=True, quietempty=False): def clean(repo, node, show_stats=True, quietempty=False):
"""forcibly switch the working directory to node, clobbering changes""" """forcibly switch the working directory to node, clobbering changes"""
stats = updaterepo(repo, node, True) stats = updaterepo(repo, node, True)
assert stats.unresolvedcount == 0
repo.vfs.unlinkpath(b'graftstate', ignoremissing=True) repo.vfs.unlinkpath(b'graftstate', ignoremissing=True)
if show_stats: if show_stats:
_showstats(repo, stats, quietempty) _showstats(repo, stats, quietempty)
return stats.unresolvedcount > 0
# naming conflict in updatetotally() # naming conflict in updatetotally()
_clean = clean _clean = clean
_VALID_UPDATECHECKS = { _VALID_UPDATECHECKS = {
mergemod.UPDATECHECK_ABORT, mergemod.UPDATECHECK_ABORT,
mergemod.UPDATECHECK_NONE, mergemod.UPDATECHECK_NONE,