Show More
@@ -417,4 +417,4 b' class dirstate(object):' | |||||
417 | elif type == 'r': |
|
417 | elif type == 'r': | |
418 | removed.append(fn) |
|
418 | removed.append(fn) | |
419 |
|
419 | |||
420 |
return (lookup, modified, added, removed |
|
420 | return (lookup, modified, added, removed, deleted, unknown) |
@@ -501,7 +501,7 b' class localrepository(object):' | |||||
501 | wlock = self.wlock(wait=0) |
|
501 | wlock = self.wlock(wait=0) | |
502 | except lock.LockHeld: |
|
502 | except lock.LockHeld: | |
503 | wlock = None |
|
503 | wlock = None | |
504 | lookup, modified, added, deleted, unknown = ( |
|
504 | lookup, modified, added, removed, deleted, unknown = ( | |
505 | self.dirstate.changes(files, match)) |
|
505 | self.dirstate.changes(files, match)) | |
506 |
|
506 | |||
507 | # are we comparing working dir against its parent? |
|
507 | # are we comparing working dir against its parent? | |
@@ -520,12 +520,12 b' class localrepository(object):' | |||||
520 | mf2 = mfmatches(self.dirstate.parents()[0]) |
|
520 | mf2 = mfmatches(self.dirstate.parents()[0]) | |
521 | for f in lookup + modified + added: |
|
521 | for f in lookup + modified + added: | |
522 | mf2[f] = "" |
|
522 | mf2[f] = "" | |
523 |
for f in |
|
523 | for f in removed: | |
524 | if f in mf2: |
|
524 | if f in mf2: | |
525 | del mf2[f] |
|
525 | del mf2[f] | |
526 | else: |
|
526 | else: | |
527 | # we are comparing two revisions |
|
527 | # we are comparing two revisions | |
528 | unknown = [] |
|
528 | deleted, unknown = [], [] | |
529 | mf2 = mfmatches(node2) |
|
529 | mf2 = mfmatches(node2) | |
530 |
|
530 | |||
531 | if node1: |
|
531 | if node1: | |
@@ -542,12 +542,14 b' class localrepository(object):' | |||||
542 | else: |
|
542 | else: | |
543 | added.append(fn) |
|
543 | added.append(fn) | |
544 |
|
544 | |||
545 |
|
|
545 | removed = mf1.keys() | |
|
546 | ||||
|
547 | removed.extend(deleted) #XXX get rid of this when returning deleted | |||
546 |
|
548 | |||
547 | # sort and return results: |
|
549 | # sort and return results: | |
548 |
for l in modified, added, |
|
550 | for l in modified, added, removed, unknown: | |
549 | l.sort() |
|
551 | l.sort() | |
550 |
return (modified, added, |
|
552 | return (modified, added, removed, unknown) | |
551 |
|
553 | |||
552 | def add(self, list): |
|
554 | def add(self, list): | |
553 | wlock = self.wlock() |
|
555 | wlock = self.wlock() |
General Comments 0
You need to be logged in to leave comments.
Login now