Mercurial > hg-stable

changeset 33362:e48fb90f80c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: simplify the dirty check in howtocontinue() This is equivalent to the previous code. But it seems to me that if the user is going to be prompted that a commit is needed, missing files should be ignored, but branch and merge changes shouldn't be.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 09 Jul 2017 00:53:16 -0400
parents 66fe60d5f291
children 3047167733dc
files mercurial/cmdutil.py
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Sun Jul 09 00:23:03 2017 -0400
+++ b/mercurial/cmdutil.py	Sun Jul 09 00:53:16 2017 -0400
@@ -3547,10 +3547,7 @@
     for f, msg in afterresolvedstates:
         if repo.vfs.exists(f):
             return contmsg % msg, True
-    workingctx = repo[None]
-    dirty = any(repo.status()) or any(workingctx.sub(s).dirty()
-                                         for s in workingctx.substate)
-    if dirty:
+    if repo[None].dirty(missing=True, merge=False, branch=False):
         return contmsg % _("hg commit"), False
     return None, None