##// END OF EJS Templates
fix dirstate.change: it should walk ignored files
Benoit Boissinot -
r1476:17e8c70f default
parent child Browse files
Show More
@@ -11,7 +11,7 b' import struct, os'
11 from node import *
11 from node import *
12 from i18n import gettext as _
12 from i18n import gettext as _
13 from demandload import *
13 from demandload import *
14 demandload(globals(), "time bisect stat util re")
14 demandload(globals(), "time bisect stat util re errno")
15
15
16 class dirstate:
16 class dirstate:
17 def __init__(self, opener, ui, root):
17 def __init__(self, opener, ui, root):
@@ -372,11 +372,16 b' class dirstate:'
372 except KeyError:
372 except KeyError:
373 unknown.append(fn)
373 unknown.append(fn)
374 continue
374 continue
375 # XXX: what to do with file no longer present in the fs
375 if src == 'm':
376 # who are not removed in the dirstate ?
376 try:
377 if src == 'm' and not type == 'r':
377 st = os.stat(fn)
378 deleted.append(fn)
378 except OSError, inst:
379 continue
379 # XXX: what to do with file no longer present in the fs
380 # who are not removed in the dirstate ?
381 if inst.errno != errno.ENOENT:
382 raise
383 deleted.append(fn)
384 continue
380 # check the common case first
385 # check the common case first
381 if type == 'n':
386 if type == 'n':
382 if not st:
387 if not st:
General Comments 0
You need to be logged in to leave comments. Login now