Mercurial > public > mercurial-scm > hg
comparison mercurial/scmutil.py @ 47693:46c318b9b9a4
dirstate: rename `update_file_reference` to `update_file_p1`
This is a bit clearer on the intended usage of the function. (but still not great)
Differential Revision: https://phab.mercurial-scm.org/D11135
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 15 Jul 2021 04:34:51 +0200 |
| parents | 0f5c203eb5ab |
| children | b66ae4468c9a |
comparison
equal
deleted
inserted
replaced
| 47692:e5fb14a07866 | 47693:46c318b9b9a4 |
|---|---|
| 1485 copies = dict(ds.copies()) | 1485 copies = dict(ds.copies()) |
| 1486 ds.setparents(newctx.node(), repo.nullid) | 1486 ds.setparents(newctx.node(), repo.nullid) |
| 1487 s = newctx.status(oldctx, match=match) | 1487 s = newctx.status(oldctx, match=match) |
| 1488 | 1488 |
| 1489 for f in s.modified: | 1489 for f in s.modified: |
| 1490 ds.update_file_reference(f, p1_tracked=True) | 1490 ds.update_file_p1(f, p1_tracked=True) |
| 1491 | 1491 |
| 1492 for f in s.added: | 1492 for f in s.added: |
| 1493 ds.update_file_reference(f, p1_tracked=False) | 1493 ds.update_file_p1(f, p1_tracked=False) |
| 1494 | 1494 |
| 1495 for f in s.removed: | 1495 for f in s.removed: |
| 1496 ds.update_file_reference(f, p1_tracked=True) | 1496 ds.update_file_p1(f, p1_tracked=True) |
| 1497 | 1497 |
| 1498 # Merge old parent and old working dir copies | 1498 # Merge old parent and old working dir copies |
| 1499 oldcopies = copiesmod.pathcopies(newctx, oldctx, match) | 1499 oldcopies = copiesmod.pathcopies(newctx, oldctx, match) |
| 1500 oldcopies.update(copies) | 1500 oldcopies.update(copies) |
| 1501 copies = { | 1501 copies = { |