Show More
@@ -2590,13 +2590,13 b' def revert(ui, repo, ctx, parents, *pats' | |||||
2590 |
|
2590 | |||
2591 | m = scmutil.matchfiles(repo, names) |
|
2591 | m = scmutil.matchfiles(repo, names) | |
2592 |
|
2592 | |||
2593 |
modified = set(changes |
|
2593 | modified = set(changes.modified) | |
2594 |
added = set(changes |
|
2594 | added = set(changes.added) | |
2595 |
removed = set(changes |
|
2595 | removed = set(changes.removed) | |
2596 |
_deleted = set(changes |
|
2596 | _deleted = set(changes.deleted) | |
2597 |
unknown = set(changes |
|
2597 | unknown = set(changes.unknown) | |
2598 |
unknown.update(changes |
|
2598 | unknown.update(changes.ignored) | |
2599 |
clean = set(changes |
|
2599 | clean = set(changes.clean) | |
2600 | modadded = set() |
|
2600 | modadded = set() | |
2601 |
|
2601 | |||
2602 | # split between files known in target manifest and the others |
|
2602 | # split between files known in target manifest and the others | |
@@ -2618,9 +2618,9 b' def revert(ui, repo, ctx, parents, *pats' | |||||
2618 | modified, added, removed = set(), set(), set() |
|
2618 | modified, added, removed = set(), set(), set() | |
2619 | else: |
|
2619 | else: | |
2620 | changes = repo.status(node1=parent, match=m) |
|
2620 | changes = repo.status(node1=parent, match=m) | |
2621 |
dsmodified = set(changes |
|
2621 | dsmodified = set(changes.modified) | |
2622 |
dsadded = set(changes |
|
2622 | dsadded = set(changes.added) | |
2623 |
dsremoved = set(changes |
|
2623 | dsremoved = set(changes.removed) | |
2624 |
|
2624 | |||
2625 | # only take into account for removes between wc and target |
|
2625 | # only take into account for removes between wc and target | |
2626 | clean |= dsremoved - removed |
|
2626 | clean |= dsremoved - removed |
General Comments 0
You need to be logged in to leave comments.
Login now