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.
crecord: check for untracked arguments
authortimeless <timeless@mozdev.org>
Wed, 06 Apr 2016 18:19:36 +0000
changeset 28815 44611ad4fbd9
parent 28814 1f65f291a5b7
child 28816 f4a42bb7c2ec
crecord: check for untracked arguments hg commit tracked untracked -- fails complaining about untracked prior to this commit, hg commit -i tracked untracked -- did not fail This is corrected by calling the refactored localrepo.checkcommitpatterns
mercurial/cmdutil.py file | annotate | diff | comparison | revisions
tests/test-commit-interactive.t file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Wed Apr 06 18:08:38 2016 +0000
+++ b/mercurial/cmdutil.py	Wed Apr 06 18:19:36 2016 +0000
@@ -135,12 +135,24 @@
         """
 
         checkunfinished(repo, commit=True)
-        merge = len(repo[None].parents()) > 1
+        wctx = repo[None]
+        merge = len(wctx.parents()) > 1
         if merge:
             raise error.Abort(_('cannot partially commit a merge '
                                '(use "hg commit" instead)'))
 
+        def fail(f, msg):
+            raise error.Abort('%s: %s' % (f, msg))
+
+        force = opts.get('force')
+        if not force:
+            vdirs = []
+            match.explicitdir = vdirs.append
+            match.bad = fail
+
         status = repo.status(match=match)
+        if not force:
+            repo.checkcommitpatterns(wctx, vdirs, match, status, fail)
         diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
         diffopts.nodates = True
         diffopts.git = True
--- a/tests/test-commit-interactive.t	Wed Apr 06 18:08:38 2016 +0000
+++ b/tests/test-commit-interactive.t	Wed Apr 06 18:19:36 2016 +0000
@@ -59,6 +59,14 @@
   
   
 
+Abort for untracked
+
+  $ touch untracked
+  $ hg commit -i -m should-fail empty-rw untracked
+  abort: untracked: file not tracked!
+  [255]
+  $ rm untracked
+
 Record empty file
 
   $ hg commit -i -d '0 0' -m empty empty-rw<<EOF
mercurial