Patchwork D7984: clean: check that there are no conflicts after

login
register
mail settings
Submitter phabricator
Date Jan. 24, 2020, 5:36 p.m.
Message ID <differential-rev-PHID-DREV-ygojg627ovenz2iqirnc-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/44615/
State Superseded
Headers show

Comments

phabricator - Jan. 24, 2020, 5:36 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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).

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D7984

AFFECTED FILES
  mercurial/hg.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1040,10 +1040,10 @@ 
 def clean(repo, node, show_stats=True, quietempty=False):
     """forcibly switch the working directory to node, clobbering changes"""
     stats = updaterepo(repo, node, True)
+    assert stats.unresolvedcount == 0
     repo.vfs.unlinkpath(b'graftstate', ignoremissing=True)
     if show_stats:
         _showstats(repo, stats, quietempty)
-    return stats.unresolvedcount > 0
 
 
 # naming conflict in updatetotally()