| Alphare | |
| pulkit |
| hg-reviewers |
This is a bit clearer on the intended usage of the function. (but still not great)
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (2 lines) | |||
| M | mercurial/scmutil.py (6 lines) |
| elif entry.added: | elif entry.added: | ||||
| self._drop(filename) | self._drop(filename) | ||||
| return True | return True | ||||
| else: | else: | ||||
| self._remove(filename) | self._remove(filename) | ||||
| return True | return True | ||||
| @requires_parents_change | @requires_parents_change | ||||
| def update_file_reference( | def update_file_p1( | ||||
| self, | self, | ||||
| filename, | filename, | ||||
| p1_tracked, | p1_tracked, | ||||
| ): | ): | ||||
| """Set a file as tracked in the parent (or not) | """Set a file as tracked in the parent (or not) | ||||
| This is to be called when adjust the dirstate to a new parent after an history | This is to be called when adjust the dirstate to a new parent after an history | ||||
| rewriting operation. | rewriting operation. | ||||
| """ | """ | ||||
| oldctx = repo[b'.'] | oldctx = repo[b'.'] | ||||
| ds = repo.dirstate | ds = repo.dirstate | ||||
| copies = dict(ds.copies()) | copies = dict(ds.copies()) | ||||
| ds.setparents(newctx.node(), repo.nullid) | ds.setparents(newctx.node(), repo.nullid) | ||||
| s = newctx.status(oldctx, match=match) | s = newctx.status(oldctx, match=match) | ||||
| for f in s.modified: | for f in s.modified: | ||||
| ds.update_file_reference(f, p1_tracked=True) | ds.update_file_p1(f, p1_tracked=True) | ||||
| for f in s.added: | for f in s.added: | ||||
| ds.update_file_reference(f, p1_tracked=False) | ds.update_file_p1(f, p1_tracked=False) | ||||
| for f in s.removed: | for f in s.removed: | ||||
| ds.update_file_reference(f, p1_tracked=True) | ds.update_file_p1(f, p1_tracked=True) | ||||
| # Merge old parent and old working dir copies | # Merge old parent and old working dir copies | ||||
| oldcopies = copiesmod.pathcopies(newctx, oldctx, match) | oldcopies = copiesmod.pathcopies(newctx, oldctx, match) | ||||
| oldcopies.update(copies) | oldcopies.update(copies) | ||||
| copies = { | copies = { | ||||
| dst: oldcopies.get(src, src) | dst: oldcopies.get(src, src) | ||||
| for dst, src in pycompat.iteritems(oldcopies) | for dst, src in pycompat.iteritems(oldcopies) | ||||
| } | } | ||||