equal
deleted
inserted
replaced
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) |