| pulkit |
| hg-reviewers |
Semantically these changes are made to adjust the dirstate after a commit, so it
should be in a parentchange context.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/largefiles/lfutil.py (29 lines) |
| lfdirstate.add(lfile) | lfdirstate.add(lfile) | ||||
| elif state == b'?': | elif state == b'?': | ||||
| lfdirstate.drop(lfile) | lfdirstate.drop(lfile) | ||||
| def markcommitted(orig, ctx, node): | def markcommitted(orig, ctx, node): | ||||
| repo = ctx.repo() | repo = ctx.repo() | ||||
| with ctx._repo.dirstate.parentchange(): | |||||
| orig(node) | orig(node) | ||||
| # ATTENTION: "ctx.files()" may differ from "repo[node].files()" | # ATTENTION: "ctx.files()" may differ from "repo[node].files()" | ||||
| # because files coming from the 2nd parent are omitted in the latter. | # because files coming from the 2nd parent are omitted in the latter. | ||||
| # | # | ||||
| # The former should be used to get targets of "synclfdirstate", | # The former should be used to get targets of "synclfdirstate", | ||||
| # because such files: | # because such files: | ||||
| # - are marked as "a" by "patch.patch()" (e.g. via transplant), and | # - are marked as "a" by "patch.patch()" (e.g. via transplant), and | ||||
| # - have to be marked as "n" after commit, but | # - have to be marked as "n" after commit, but | ||||
| # - aren't listed in "repo[node].files()" | # - aren't listed in "repo[node].files()" | ||||
| lfdirstate = openlfdirstate(repo.ui, repo) | lfdirstate = openlfdirstate(repo.ui, repo) | ||||
| for f in ctx.files(): | for f in ctx.files(): | ||||
| lfile = splitstandin(f) | lfile = splitstandin(f) | ||||
| if lfile is not None: | if lfile is not None: | ||||
| synclfdirstate(repo, lfdirstate, lfile, False) | synclfdirstate(repo, lfdirstate, lfile, False) | ||||
| lfdirstate.write() | lfdirstate.write() | ||||
| # As part of committing, copy all of the largefiles into the cache. | # As part of committing, copy all of the largefiles into the cache. | ||||
| # | # | ||||
| # Using "node" instead of "ctx" implies additional "repo[node]" | # Using "node" instead of "ctx" implies additional "repo[node]" | ||||
| # lookup while copyalltostore(), but can omit redundant check for | # lookup while copyalltostore(), but can omit redundant check for | ||||
| # files comming from the 2nd parent, which should exist in store | # files comming from the 2nd parent, which should exist in store | ||||
| # at merging. | # at merging. | ||||