Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 15993:0b05e0bfdc1c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
scmutil: unify some 'no changes found' messages This keeps the wording more consistent for secret csets
author Matt Mackall <mpm@selenic.com>
date Wed, 25 Jan 2012 17:14:08 -0600
parents 963c8a553524
children ed9f40bc346f
comparison
equal deleted inserted replaced
15992:963c8a553524 15993:0b05e0bfdc1c
8 8
9 from i18n import _ 9 from i18n import _
10 from lock import release 10 from lock import release
11 from node import hex, nullid 11 from node import hex, nullid
12 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo, bookmarks 12 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo, bookmarks
13 import lock, util, extensions, error, node 13 import lock, util, extensions, error, node, scmutil
14 import cmdutil, discovery 14 import cmdutil, discovery
15 import merge as mergemod 15 import merge as mergemod
16 import verify as verifymod 16 import verify as verifymod
17 import errno, os, shutil 17 import errno, os, shutil
18 18
509 other = peer(repo, opts, dest) 509 other = peer(repo, opts, dest)
510 outgoing = discovery.findcommonoutgoing(repo, other, revs, 510 outgoing = discovery.findcommonoutgoing(repo, other, revs,
511 force=opts.get('force')) 511 force=opts.get('force'))
512 o = outgoing.missing 512 o = outgoing.missing
513 if not o: 513 if not o:
514 if outgoing.excluded: 514 scmutil.nochangesfound(repo.ui, outgoing.excluded)
515 repo.ui.status(_("no outgoing changes but %i secret changesets\n")
516 % len(outgoing.excluded))
517 else:
518 ui.status(_("no changes found\n"))
519 return None 515 return None
520 return o 516 return o
521 517
522 def outgoing(ui, repo, dest, opts): 518 def outgoing(ui, repo, dest, opts):
523 def recurse(): 519 def recurse():