Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 8995:7b19cda0fa10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1fa80c5428b8 0b2b269ba3d0
comparison
equal deleted inserted replaced
8994:4a1187d3cb00 8995:7b19cda0fa10
858 fail(f, _("file not tracked!")) 858 fail(f, _("file not tracked!"))
859 859
860 if (not force and not extra.get("close") and p2 == nullid 860 if (not force and not extra.get("close") and p2 == nullid
861 and not (changes[0] or changes[1] or changes[2]) 861 and not (changes[0] or changes[1] or changes[2])
862 and self[None].branch() == self['.'].branch()): 862 and self[None].branch() == self['.'].branch()):
863 self.ui.status(_("nothing changed\n"))
864 return None 863 return None
865 864
866 ms = merge_.mergestate(self) 865 ms = merge_.mergestate(self)
867 for f in changes[0]: 866 for f in changes[0]:
868 if f in ms and ms[f] == 'u': 867 if f in ms and ms[f] == 'u':