Show More
@@ -11,7 +11,7 b' import struct, os' | |||
|
11 | 11 | from node import * |
|
12 | 12 | from i18n import gettext as _ |
|
13 | 13 | from demandload import * |
|
14 | demandload(globals(), "time bisect stat util re") | |
|
14 | demandload(globals(), "time bisect stat util re errno") | |
|
15 | 15 | |
|
16 | 16 | class dirstate: |
|
17 | 17 | def __init__(self, opener, ui, root): |
@@ -372,11 +372,16 b' class dirstate:' | |||
|
372 | 372 | except KeyError: |
|
373 | 373 | unknown.append(fn) |
|
374 | 374 | continue |
|
375 | # XXX: what to do with file no longer present in the fs | |
|
376 | # who are not removed in the dirstate ? | |
|
377 | if src == 'm' and not type == 'r': | |
|
378 | deleted.append(fn) | |
|
379 | continue | |
|
375 | if src == 'm': | |
|
376 | try: | |
|
377 | st = os.stat(fn) | |
|
378 | except OSError, inst: | |
|
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 | 385 | # check the common case first |
|
381 | 386 | if type == 'n': |
|
382 | 387 | if not st: |
General Comments 0
You need to be logged in to leave comments.
Login now