# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2009-07-01 06:16:19
# Node ID 7b19cda0fa105c163f016791ec728fe5bcdc2b96
# Parent  4a1187d3cb0047c4422c94a5cdd08ad47d28304b

commit: lose some pointless 'nothing changed' messages

Move message from localrepo to commands. This drops confusing messages
in subrepo, import, and rebase.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -665,6 +665,7 @@ def commit(ui, repo, *pats, **opts):
 
     node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
     if not node:
+        ui.status(_("nothing changed\n"))
         return
     cl = repo.changelog
     rev = cl.rev(node)
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -860,7 +860,6 @@ class localrepository(repo.repository):
             if (not force and not extra.get("close") and p2 == nullid
                 and not (changes[0] or changes[1] or changes[2])
                 and self[None].branch() == self['.'].branch()):
-                self.ui.status(_("nothing changed\n"))
                 return None
 
             ms = merge_.mergestate(self)
diff --git a/tests/test-patch.out b/tests/test-patch.out
--- a/tests/test-patch.out
+++ b/tests/test-patch.out
@@ -9,4 +9,3 @@ updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 applying ../a.diff
 Using custom patch
-nothing changed
diff --git a/tests/test-rebase-mq-skip.out b/tests/test-rebase-mq-skip.out
--- a/tests/test-rebase-mq-skip.out
+++ b/tests/test-rebase-mq-skip.out
@@ -6,7 +6,6 @@ applying p1.patch
 
 % Rebase
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-nothing changed
 saving bundle to 
 adding branch
 adding changesets
diff --git a/tests/test-rebase-scenario-global.out b/tests/test-rebase-scenario-global.out
--- a/tests/test-rebase-scenario-global.out
+++ b/tests/test-rebase-scenario-global.out
@@ -52,7 +52,6 @@ o |  2: D
 o  0: A
 
 % C onto F - skip of E
-nothing changed
 saving bundle to 
 adding branch
 adding changesets
@@ -71,7 +70,6 @@ o  2: D
 o  0: A
 
 % D onto C - rebase of a branching point (skip E)
-nothing changed
 saving bundle to 
 adding branch
 adding changesets
diff --git a/tests/test-subrepo.out b/tests/test-subrepo.out
--- a/tests/test-subrepo.out
+++ b/tests/test-subrepo.out
@@ -3,13 +3,11 @@ adding a
 % add first sub
 adding a
 committing subrepository s
-nothing changed
 % add sub sub
 committing subrepository s
 committing subrepository ss
 % bump sub rev
 committing subrepository s
-nothing changed
 % leave sub dirty
 committing subrepository s
 changeset:   3:1c833a7a9e3a