Patchwork D6558: cmdutil: updated description for bailifchanged()

login
register
mail settings
Submitter phabricator
Date June 20, 2019, 7:11 p.m.
Message ID <differential-rev-PHID-DREV-fdt3wkbmpj54gdq67xlu-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/40630/
State Superseded
Headers show

Comments

phabricator - June 20, 2019, 7:11 p.m.
taapas1128 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This is added to establish a connection between `statemod.checkunfinished()`
  and `bailifchanged()`.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS




To: taapas1128, #hg-reviewers
Cc: mercurial-devel
phabricator - June 24, 2019, 9:44 a.m.
taapas1128 added a comment.
taapas1128 abandoned this revision.




REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6558/new/

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

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

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -787,6 +787,9 @@ 
     ignored (such as when 'update --check' runs).
 
     'hint' is the usual hint given to Abort exception.
+
+    It's probably good to check statemod.checkunfinished() right before
+    this.
     """
 
     if merge and repo.dirstate.p2() != nullid: