Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 11486:d3c3e2fdeb0c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: add missing _()
author Matt Mackall <mpm@selenic.com>
date Thu, 01 Jul 2010 11:22:56 -0500
parents b602a95c21ec
children 5be142109ed4 c3e8ab80ee90
comparison
equal deleted inserted replaced
11485:b602a95c21ec 11486:d3c3e2fdeb0c
825 for s in wctx.substate: 825 for s in wctx.substate:
826 removedsubs.discard(s) 826 removedsubs.discard(s)
827 if match(s) and wctx.sub(s).dirty(): 827 if match(s) and wctx.sub(s).dirty():
828 subs.append(s) 828 subs.append(s)
829 if (subs or removedsubs): 829 if (subs or removedsubs):
830 # is hgsub modified and not included?
831 if (not match('.hgsub') and 830 if (not match('.hgsub') and
832 '.hgsub' in (wctx.modified() + wctx.added())): 831 '.hgsub' in (wctx.modified() + wctx.added())):
833 raise util.Abort("can't commit subrepos without .hgsub") 832 raise util.Abort(_("can't commit subrepos without .hgsub"))
834 if '.hgsubstate' not in changes[0]: 833 if '.hgsubstate' not in changes[0]:
835 changes[0].insert(0, '.hgsubstate') 834 changes[0].insert(0, '.hgsubstate')
836 835
837 # make sure all explicit patterns are matched 836 # make sure all explicit patterns are matched
838 if not force and match.files(): 837 if not force and match.files():