equal
deleted
inserted
replaced
229 ) |
229 ) |
230 |
230 |
231 if len(standins) > 0: |
231 if len(standins) > 0: |
232 vfs.makedirs(lfstoredir) |
232 vfs.makedirs(lfstoredir) |
233 |
233 |
234 with lfdirstate.parentchange(): |
234 with lfdirstate.parentchange(repo): |
235 for standin in standins: |
235 for standin in standins: |
236 lfile = splitstandin(standin) |
236 lfile = splitstandin(standin) |
237 lfdirstate.update_file( |
237 lfdirstate.update_file( |
238 lfile, p1_tracked=True, wc_tracked=True, possibly_dirty=True |
238 lfile, p1_tracked=True, wc_tracked=True, possibly_dirty=True |
239 ) |
239 ) |
579 |
579 |
580 def markcommitted(orig, ctx, node): |
580 def markcommitted(orig, ctx, node): |
581 repo = ctx.repo() |
581 repo = ctx.repo() |
582 |
582 |
583 lfdirstate = openlfdirstate(repo.ui, repo) |
583 lfdirstate = openlfdirstate(repo.ui, repo) |
584 with lfdirstate.parentchange(): |
584 with lfdirstate.parentchange(repo): |
585 orig(node) |
585 orig(node) |
586 |
586 |
587 # ATTENTION: "ctx.files()" may differ from "repo[node].files()" |
587 # ATTENTION: "ctx.files()" may differ from "repo[node].files()" |
588 # because files coming from the 2nd parent are omitted in the latter. |
588 # because files coming from the 2nd parent are omitted in the latter. |
589 # |
589 # |