Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: note when files are missing
authorMartin Geisler <mg@aragost.com>
Wed, 06 Apr 2011 16:21:12 +0200
changeset 13899 a7cd0eee396b
parent 13898 77b09a7fc8fc
child 13903 a6c69abd91a0
commit: note when files are missing Before, you could experience the following strange interaction: $ hg commit nothing changed $ hg merge abort: outstanding uncommitted changes which confused at least one user in #mercurial.
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-commit.t file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Wed Apr 06 15:26:49 2011 +0200
+++ b/mercurial/commands.py	Wed Apr 06 16:21:12 2011 +0200
@@ -894,7 +894,12 @@
 
     node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
     if not node:
-        ui.status(_("nothing changed\n"))
+        stat = repo.status(match=cmdutil.match(repo, pats, opts))
+        if stat[3]:
+            ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
+                      % len(stat[3]))
+        else:
+            ui.status(_("nothing changed\n"))
         return 1
 
     ctx = repo[node]
--- a/tests/test-commit.t	Wed Apr 06 15:26:49 2011 +0200
+++ b/tests/test-commit.t	Wed Apr 06 16:21:12 2011 +0200
@@ -32,7 +32,7 @@
   $ hg add bar
   $ rm bar
   $ hg commit -m commit-8
-  nothing changed
+  nothing changed (1 missing files, see 'hg status')
   [1]
   $ hg commit -m commit-8-2 bar
   abort: bar: file not found!
Mercurial