Mercurial > hg-stable
changeset 8995:7b19cda0fa10
commit: lose some pointless 'nothing changed' messages
Move message from localrepo to commands. This drops confusing messages
in subrepo, import, and rebase.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 01 Jul 2009 01:16:19 -0500 |
| parents | 4a1187d3cb00 |
| children | 23e941d7f507 |
| files | mercurial/commands.py mercurial/localrepo.py tests/test-patch.out tests/test-rebase-mq-skip.out tests/test-rebase-scenario-global.out tests/test-subrepo.out |
| diffstat | 6 files changed, 1 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Jul 01 01:05:24 2009 -0500 +++ b/mercurial/commands.py Wed Jul 01 01:16:19 2009 -0500 @@ -665,6 +665,7 @@ node = cmdutil.commit(ui, repo, commitfunc, pats, opts) if not node: + ui.status(_("nothing changed\n")) return cl = repo.changelog rev = cl.rev(node)
--- a/mercurial/localrepo.py Wed Jul 01 01:05:24 2009 -0500 +++ b/mercurial/localrepo.py Wed Jul 01 01:16:19 2009 -0500 @@ -860,7 +860,6 @@ 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)
--- a/tests/test-patch.out Wed Jul 01 01:05:24 2009 -0500 +++ b/tests/test-patch.out Wed Jul 01 01:16:19 2009 -0500 @@ -9,4 +9,3 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../a.diff Using custom patch -nothing changed
--- a/tests/test-rebase-mq-skip.out Wed Jul 01 01:05:24 2009 -0500 +++ b/tests/test-rebase-mq-skip.out Wed Jul 01 01:16:19 2009 -0500 @@ -6,7 +6,6 @@ % Rebase 1 files updated, 0 files merged, 1 files removed, 0 files unresolved -nothing changed saving bundle to adding branch adding changesets
--- a/tests/test-rebase-scenario-global.out Wed Jul 01 01:05:24 2009 -0500 +++ b/tests/test-rebase-scenario-global.out Wed Jul 01 01:16:19 2009 -0500 @@ -52,7 +52,6 @@ o 0: A % C onto F - skip of E -nothing changed saving bundle to adding branch adding changesets @@ -71,7 +70,6 @@ o 0: A % D onto C - rebase of a branching point (skip E) -nothing changed saving bundle to adding branch adding changesets
--- a/tests/test-subrepo.out Wed Jul 01 01:05:24 2009 -0500 +++ b/tests/test-subrepo.out Wed Jul 01 01:16:19 2009 -0500 @@ -3,13 +3,11 @@ % 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