Mercurial > hg > pyhgsh

comparison mercurial/dirstate.py @ 1564:34579a67fa71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re: [PATCH 2 of 3] remove walk warning about nonexistent files On 11/15/05, Robin Farine <robin.farine@terminus.org> wrote: > # HG changeset patch > # User Robin Farine <robin.farine@terminus.org> > # Node ID ce0a3cc309a8d1e81278ec01a3c61fbb99c691f4 > # Parent feb77e0951e74d75c213e8471f107fdcc124c876 > remove walk warning about nonexistent files > > diff -r feb77e0951e7 -r ce0a3cc309a8 mercurial/dirstate.py > --- a/mercurial/dirstate.py Tue Nov 15 08:42:45 2005 +0100 > +++ b/mercurial/dirstate.py Tue Nov 15 08:59:50 2005 +0100 > @@ -336,9 +336,6 @@ > try: > st = os.lstat(f) > except OSError, inst: > - if ff not in dc: self.ui.warn('%s: %s\n' % ( > - util.pathto(self.getcwd(), ff), > - inst.strerror)) > continue > if stat.S_ISDIR(st.st_mode): > cmp1 = (lambda x, y: cmp(x[1], y[1])) this break some tests, a better fix would be to check if ff can be a directory prefix from files in dc you can try the attached patch. Benoit
author Benoit Boissinot <bboissin@gmail.com>
date Thu, 01 Dec 2005 10:48:29 -0600
parents 2f97af0b522c
children 84e9b3484ff6
comparison
equal deleted inserted replaced
1563:cc2a2e12f4ad 1564:34579a67fa71
333 for ff in util.unique(files): 333 for ff in util.unique(files):
334 f = self.wjoin(ff) 334 f = self.wjoin(ff)
335 try: 335 try:
336 st = os.lstat(f) 336 st = os.lstat(f)
337 except OSError, inst: 337 except OSError, inst:
338 if ff not in dc: self.ui.warn('%s: %s\n' % ( 338 nf = util.normpath(ff)
339 util.pathto(self.getcwd(), ff), 339 found = False
340 inst.strerror)) 340 for fn in dc:
341 if nf == fn or (fn.startswith(nf) and fn[len(nf)] == '/'):
342 found = True
343 break
344 if not found:
345 self.ui.warn('%s: %s\n' % (
346 util.pathto(self.getcwd(), ff),
347 inst.strerror))
341 continue 348 continue
342 if stat.S_ISDIR(st.st_mode): 349 if stat.S_ISDIR(st.st_mode):
343 cmp1 = (lambda x, y: cmp(x[1], y[1])) 350 cmp1 = (lambda x, y: cmp(x[1], y[1]))
344 sorted = [ x for x in findfiles(f) ] 351 sorted = [ x for x in findfiles(f) ]
345 sorted.sort(cmp1) 352 sorted.sort(cmp1)