Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 16151:a01d2fb5ba65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 22 Feb 2012 17:36:33 -0600
parents 004982e5d782 4546a8513dcd
children 85db991780b7
comparison
equal deleted inserted replaced
16150:0424f3c7d7ac 16151:a01d2fb5ba65
1369 if not working and ctx2.rev() < ctx1.rev(): 1369 if not working and ctx2.rev() < ctx1.rev():
1370 ctx2.manifest() 1370 ctx2.manifest()
1371 1371
1372 if not parentworking: 1372 if not parentworking:
1373 def bad(f, msg): 1373 def bad(f, msg):
1374 if f not in ctx1: 1374 # 'f' may be a directory pattern from 'match.files()',
1375 # so 'f not in ctx1' is not enough
1376 if f not in ctx1 and f not in ctx1.dirs():
1375 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) 1377 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg))
1376 match.bad = bad 1378 match.bad = bad
1377 1379
1378 if working: # we need to scan the working dir 1380 if working: # we need to scan the working dir
1379 subrepos = [] 1381 subrepos = []