| pulkit |
| hg-reviewers |
The callers mostly have context objects, so let's avoid looking up the
same context objects inside duplicatecopies().
I also renamed the function to graftcopies() since I think that
better matches its purpose. I did it in the same commit so it's easier
for extensions to switch between the functions.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/fix.py (7 lines) | |||
| M | hgext/rebase.py (9 lines) | |||
| M | mercurial/copies.py (18 lines) | |||
| M | mercurial/merge.py (2 lines) | |||
| M | relnotes/next (4 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| and p2ctx.node() not in replacements | and p2ctx.node() not in replacements | ||||
| ): | ): | ||||
| return | return | ||||
| extra = ctx.extra().copy() | extra = ctx.extra().copy() | ||||
| extra[b'fix_source'] = ctx.hex() | extra[b'fix_source'] = ctx.hex() | ||||
| wctx = context.overlayworkingctx(repo) | wctx = context.overlayworkingctx(repo) | ||||
| wctx.setbase(repo[newp1node]) | newp1ctx = repo[newp1node] | ||||
| wctx.setbase(newp1ctx) | |||||
| merge.update( | merge.update( | ||||
| repo, | repo, | ||||
| ctx.rev(), | ctx.rev(), | ||||
| branchmerge=False, | branchmerge=False, | ||||
| force=True, | force=True, | ||||
| ancestor=p1rev, | ancestor=p1rev, | ||||
| mergeancestor=False, | mergeancestor=False, | ||||
| wc=wctx, | wc=wctx, | ||||
| ) | ) | ||||
| copies.duplicatecopies( | copies.graftcopies(repo, wctx, ctx, ctx.p1(), skip=newp1ctx) | ||||
| repo, wctx, ctx.rev(), ctx.p1().rev(), skiprev=newp1node | |||||
| ) | |||||
| for path in filedata.keys(): | for path in filedata.keys(): | ||||
| fctx = ctx[path] | fctx = ctx[path] | ||||
| copysource = fctx.copysource() | copysource = fctx.copysource() | ||||
| wctx.write(path, filedata[path], flags=fctx.flags()) | wctx.write(path, filedata[path], flags=fctx.flags()) | ||||
| if copysource: | if copysource: | ||||
| wctx.markcopied(path, copysource) | wctx.markcopied(path, copysource) | ||||
| repo.ui.debug(b" update to %d:%s\n" % (p1, repo[p1])) | repo.ui.debug(b" update to %d:%s\n" % (p1, repo[p1])) | ||||
| mergemod.update(repo, p1, branchmerge=False, force=True) | mergemod.update(repo, p1, branchmerge=False, force=True) | ||||
| else: | else: | ||||
| repo.ui.debug(b" already in destination\n") | repo.ui.debug(b" already in destination\n") | ||||
| # This is, alas, necessary to invalidate workingctx's manifest cache, | # This is, alas, necessary to invalidate workingctx's manifest cache, | ||||
| # as well as other data we litter on it in other places. | # as well as other data we litter on it in other places. | ||||
| wctx = repo[None] | wctx = repo[None] | ||||
| repo.dirstate.write(repo.currenttransaction()) | repo.dirstate.write(repo.currenttransaction()) | ||||
| repo.ui.debug(b" merge against %d:%s\n" % (rev, repo[rev])) | ctx = repo[rev] | ||||
| repo.ui.debug(b" merge against %d:%s\n" % (rev, ctx)) | |||||
| if base is not None: | if base is not None: | ||||
| repo.ui.debug(b" detach base %d:%s\n" % (base, repo[base])) | repo.ui.debug(b" detach base %d:%s\n" % (base, repo[base])) | ||||
| # When collapsing in-place, the parent is the common ancestor, we | # When collapsing in-place, the parent is the common ancestor, we | ||||
| # have to allow merging with it. | # have to allow merging with it. | ||||
| stats = mergemod.update( | stats = mergemod.update( | ||||
| repo, | repo, | ||||
| rev, | rev, | ||||
| branchmerge=True, | branchmerge=True, | ||||
| force=True, | force=True, | ||||
| ancestor=base, | ancestor=base, | ||||
| mergeancestor=collapse, | mergeancestor=collapse, | ||||
| labels=[b'dest', b'source'], | labels=[b'dest', b'source'], | ||||
| wc=wctx, | wc=wctx, | ||||
| ) | ) | ||||
| destctx = repo[dest] | |||||
| if collapse: | if collapse: | ||||
| copies.duplicatecopies(repo, wctx, rev, dest) | copies.graftcopies(repo, wctx, ctx, destctx) | ||||
| else: | else: | ||||
| # If we're not using --collapse, we need to | # If we're not using --collapse, we need to | ||||
| # duplicate copies between the revision we're | # duplicate copies between the revision we're | ||||
| # rebasing and its first parent, but *not* | # rebasing and its first parent, but *not* | ||||
| # duplicate any copies that have already been | # duplicate any copies that have already been | ||||
| # performed in the destination. | # performed in the destination. | ||||
| p1rev = repo[rev].p1().rev() | copies.graftcopies(repo, wctx, ctx, ctx.p1(), skip=destctx) | ||||
| copies.duplicatecopies(repo, wctx, rev, p1rev, skiprev=dest) | |||||
| return stats | return stats | ||||
| def adjustdest(repo, rev, destmap, state, skipped): | def adjustdest(repo, rev, destmap, state, skipped): | ||||
| r"""adjust rebase destination given the current rebase state | r"""adjust rebase destination given the current rebase state | ||||
| rev is what is being rebased. Return a list of two revs, which are the | rev is what is being rebased. Return a list of two revs, which are the | ||||
| adjusted destinations for rev's p1 and p2, respectively. If a parent is | adjusted destinations for rev's p1 and p2, respectively. If a parent is | ||||
| elif f2r > f1r: | elif f2r > f1r: | ||||
| f2 = next(g2) | f2 = next(g2) | ||||
| else: # f1 and f2 point to files in the same linkrev | else: # f1 and f2 point to files in the same linkrev | ||||
| return f1 == f2 # true if they point to the same file | return f1 == f2 # true if they point to the same file | ||||
| except StopIteration: | except StopIteration: | ||||
| return False | return False | ||||
| def duplicatecopies(repo, wctx, rev, fromrev, skiprev=None): | def graftcopies(repo, wctx, ctx, base, skip=None): | ||||
| """reproduce copies from fromrev to rev in the dirstate | """reproduce copies between base and ctx in the wctx | ||||
| If skiprev is specified, it's a revision that should be used to | If skip is specified, it's a revision that should be used to | ||||
| filter copy records. Any copies that occur between fromrev and | filter copy records. Any copies that occur between base and | ||||
| skiprev will not be duplicated, even if they appear in the set of | skip will not be duplicated, even if they appear in the set of | ||||
| copies between fromrev and rev. | copies between base and ctx. | ||||
| """ | """ | ||||
| exclude = {} | exclude = {} | ||||
| ctraceconfig = repo.ui.config(b'experimental', b'copytrace') | ctraceconfig = repo.ui.config(b'experimental', b'copytrace') | ||||
| bctrace = stringutil.parsebool(ctraceconfig) | bctrace = stringutil.parsebool(ctraceconfig) | ||||
| if skiprev is not None and ( | if skip is not None and ( | ||||
| ctraceconfig == b'heuristics' or bctrace or bctrace is None | ctraceconfig == b'heuristics' or bctrace or bctrace is None | ||||
| ): | ): | ||||
| # copytrace='off' skips this line, but not the entire function because | # copytrace='off' skips this line, but not the entire function because | ||||
| # the line below is O(size of the repo) during a rebase, while the rest | # the line below is O(size of the repo) during a rebase, while the rest | ||||
| # of the function is much faster (and is required for carrying copy | # of the function is much faster (and is required for carrying copy | ||||
| # metadata across the rebase anyway). | # metadata across the rebase anyway). | ||||
| exclude = pathcopies(repo[fromrev], repo[skiprev]) | exclude = pathcopies(base, skip) | ||||
| for dst, src in pycompat.iteritems(pathcopies(repo[fromrev], repo[rev])): | for dst, src in pycompat.iteritems(pathcopies(base, ctx)): | ||||
| if dst in exclude: | if dst in exclude: | ||||
| continue | continue | ||||
| if dst in wctx: | if dst in wctx: | ||||
| wctx[dst].markcopied(src) | wctx[dst].markcopied(src) | ||||
| def computechangesetfilesadded(ctx): | def computechangesetfilesadded(ctx): | ||||
| """return the list of files added in a changeset | """return the list of files added in a changeset | ||||
| # Never set both parents equal to each other | # Never set both parents equal to each other | ||||
| if pother == pctx.node(): | if pother == pctx.node(): | ||||
| pother = nullid | pother = nullid | ||||
| with repo.dirstate.parentchange(): | with repo.dirstate.parentchange(): | ||||
| repo.setparents(pctx.node(), pother) | repo.setparents(pctx.node(), pother) | ||||
| repo.dirstate.write(repo.currenttransaction()) | repo.dirstate.write(repo.currenttransaction()) | ||||
| # fix up dirstate for copies and renames | # fix up dirstate for copies and renames | ||||
| copies.duplicatecopies(repo, wctx, ctx.rev(), base.rev()) | copies.graftcopies(repo, wctx, ctx, base) | ||||
| return stats | return stats | ||||
| def purge( | def purge( | ||||
| repo, | repo, | ||||
| matcher, | matcher, | ||||
| ignored=False, | ignored=False, | ||||
| removeemptydirs=True, | removeemptydirs=True, | ||||
| also called when only `explicitdir` used to be called. That may | also called when only `explicitdir` used to be called. That may | ||||
| mean that you can simply remove the use of `explicitdir` if you | mean that you can simply remove the use of `explicitdir` if you | ||||
| were already using `traversedir`. | were already using `traversedir`. | ||||
| * The `revlog.nodemap` object have been merged into the `revlog.index` object. | * The `revlog.nodemap` object have been merged into the `revlog.index` object. | ||||
| * `n in revlog.nodemap` becomes `revlog.index.has_node(n)`, | * `n in revlog.nodemap` becomes `revlog.index.has_node(n)`, | ||||
| * `revlog.nodemap[n]` becomes `revlog.index.rev(n)`, | * `revlog.nodemap[n]` becomes `revlog.index.rev(n)`, | ||||
| * `revlog.nodemap.get(n)` becomes `revlog.index.get_rev(n)`. | * `revlog.nodemap.get(n)` becomes `revlog.index.get_rev(n)`. | ||||
| * `copies.duplicatecopies()` was renamed to | |||||
| `copies.graftcopies()`. Its arguments changed from revision numbers | |||||
| to context objects. | |||||