diff mercurial/commands.py @ 16491:bfe89d65d651 stable

update: make --check abort with dirty subrepos

Aka "we could use dirty() but... yeah let's use it"

--- a/mercurial/commands.py	Mon Apr 23 12:09:54 2012 +0200
+++ b/mercurial/commands.py	Mon Apr 23 12:12:04 2012 +0200
@@ -5660,9 +5660,8 @@
         rev = cmdutil.finddate(ui, repo, date)
 
     if check:
-        # we could use dirty() but we can ignore merge and branch trivia
         c = repo[None]
-        if c.modified() or c.added() or c.removed():
+        if c.dirty(merge=False, branch=False):
             raise util.Abort(_("uncommitted local changes"))
         if rev is None:
             rev = repo[repo[None].branch()].rev()