Show More
@@ -1701,12 +1701,8 b' class workingctx(committablectx):' | |||||
1701 | % uipath(f) |
|
1701 | % uipath(f) | |
1702 | ) |
|
1702 | ) | |
1703 | rejected.append(f) |
|
1703 | rejected.append(f) | |
1704 |
elif ds |
|
1704 | elif not ds.set_tracked(f): | |
1705 | ui.warn(_(b"%s already tracked!\n") % uipath(f)) |
|
1705 | ui.warn(_(b"%s already tracked!\n") % uipath(f)) | |
1706 | elif ds[f] == b'r': |
|
|||
1707 | ds.normallookup(f) |
|
|||
1708 | else: |
|
|||
1709 | ds.add(f) |
|
|||
1710 | return rejected |
|
1706 | return rejected | |
1711 |
|
1707 | |||
1712 | def forget(self, files, prefix=b""): |
|
1708 | def forget(self, files, prefix=b""): |
@@ -85,7 +85,7 b' def requires_parents_change(func):' | |||||
85 |
|
85 | |||
86 | def requires_no_parents_change(func): |
|
86 | def requires_no_parents_change(func): | |
87 | def wrap(self, *args, **kwargs): |
|
87 | def wrap(self, *args, **kwargs): | |
88 |
if |
|
88 | if self.pendingparentchange(): | |
89 | msg = 'calling `%s` inside of a parentchange context' |
|
89 | msg = 'calling `%s` inside of a parentchange context' | |
90 | msg %= func.__name__ |
|
90 | msg %= func.__name__ | |
91 | raise error.ProgrammingError(msg) |
|
91 | raise error.ProgrammingError(msg) |
General Comments 0
You need to be logged in to leave comments.
Login now