Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
identify: simplify the dirty check
authorMatt Harbison <matt_harbison@yahoo.com>
Sun, 09 Jul 2017 00:19:03 -0400
changeset 33360 4a70985805c6
parent 33359 583aa1e3658b
child 33361 66fe60d5f291
identify: simplify the dirty check This is equivalent to the previous code, but it seems better to be explicit about what aspects of dirty are being ignored. Perhaps they shouldn't be, since the help text says 'followed by a "+" if the working directory has uncommitted changes'. Both merges and branch changes are committable, even if the files are unchanged. Additionally, this will make the `identify` command notice missing subrepo files, once subrepos are taught to look for missing files.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Sun Jul 09 00:05:31 2017 -0400
+++ b/mercurial/commands.py	Sun Jul 09 00:19:03 2017 -0400
@@ -2775,8 +2775,7 @@
                 taglist.extend(p.tags())
 
             dirty = ""
-            if (any(repo.status())
-                or any(ctx.sub(s).dirty() for s in ctx.substate)):
+            if ctx.dirty(missing=True, merge=False, branch=False):
                 dirty = '+'
             fm.data(dirty=dirty)
mercurial