| durin42 |
| hg-reviewers |
With in-memory merge, copy information needs to be stored in-memory, not in the
dirstate.
To make this transition easy, move the existing dirstate-based approach to
workingfilectx; that way, other implementations can choose to store it
somewhere else.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| mercurial/context.py | ||
|---|---|---|
| 1938 | I would probably have put this on workingctx instead (not per file). It feels like it better matches how copies are recorded in the dirstate (which is not per file). It looks like this would be a little simpler that way. Will future patches be simpler by doing it on the workingfilectx instead? | |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (5 lines) | |||
| M | mercurial/context.py (5 lines) | |||
| M | mercurial/copies.py (5 lines) | |||
| M | mercurial/merge.py (2 lines) |
| else: | else: | ||||
| repo.ui.debug(" already in destination\n") | repo.ui.debug(" already in destination\n") | ||||
| repo.dirstate.write(repo.currenttransaction()) | repo.dirstate.write(repo.currenttransaction()) | ||||
| repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev])) | repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev])) | ||||
| if base is not None: | if base is not None: | ||||
| repo.ui.debug(" detach base %d:%s\n" % (base, repo[base])) | repo.ui.debug(" 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. | ||||
| wctx = repo[None] | |||||
| stats = mergemod.update(repo, rev, True, True, base, collapse, | stats = mergemod.update(repo, rev, True, True, base, collapse, | ||||
| labels=['dest', 'source']) | labels=['dest', 'source']) | ||||
| if collapse: | if collapse: | ||||
| copies.duplicatecopies(repo, rev, dest) | copies.duplicatecopies(repo, wctx, rev, dest) | ||||
| 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() | p1rev = repo[rev].p1().rev() | ||||
| copies.duplicatecopies(repo, rev, p1rev, skiprev=dest) | 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): | ||||
| """adjust rebase destination given the current rebase state | """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 | ||||
| nullrev, return dest without adjustment for it. | nullrev, return dest without adjustment for it. | ||||
| for sf in seen: | for sf in seen: | ||||
| if sf in mb: | if sf in mb: | ||||
| if tca == base: | if tca == base: | ||||
| data['diverge'].setdefault(sf, []).append(f) | data['diverge'].setdefault(sf, []).append(f) | ||||
| else: | else: | ||||
| data['incompletediverge'][sf] = [of, f] | data['incompletediverge'][sf] = [of, f] | ||||
| return | return | ||||
| def duplicatecopies(repo, rev, fromrev, skiprev=None): | def duplicatecopies(repo, wctx, rev, fromrev, skiprev=None): | ||||
| '''reproduce copies from fromrev to rev in the dirstate | '''reproduce copies from fromrev to rev in the dirstate | ||||
| If skiprev is specified, it's a revision that should be used to | If skiprev 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 fromrev and | ||||
| skiprev will not be duplicated, even if they appear in the set of | skiprev will not be duplicated, even if they appear in the set of | ||||
| copies between fromrev and rev. | copies between fromrev and rev. | ||||
| ''' | ''' | ||||
| exclude = {} | exclude = {} | ||||
| if (skiprev is not None and | if (skiprev is not None and | ||||
| repo.ui.config('experimental', 'copytrace') != 'off'): | repo.ui.config('experimental', 'copytrace') != 'off'): | ||||
| # 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(repo[fromrev], repo[skiprev]) | ||||
| for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems(): | for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems(): | ||||
| # copies.pathcopies returns backward renames, so dst might not | # copies.pathcopies returns backward renames, so dst might not | ||||
| # actually be in the dirstate | # actually be in the dirstate | ||||
| if dst in exclude: | if dst in exclude: | ||||
| continue | continue | ||||
| if repo.dirstate[dst] in "nma": | wctx[dst].markcopied(src) | ||||
| repo.dirstate.copy(src, dst) | |||||
| if keepparent and len(parents) == 2 and pctx in parents: | if keepparent and len(parents) == 2 and pctx in parents: | ||||
| parents.remove(pctx) | parents.remove(pctx) | ||||
| pother = parents[0].node() | pother = parents[0].node() | ||||
| with repo.dirstate.parentchange(): | with repo.dirstate.parentchange(): | ||||
| repo.setparents(repo['.'].node(), pother) | repo.setparents(repo['.'].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, ctx.rev(), pctx.rev()) | copies.duplicatecopies(repo, repo[None], ctx.rev(), pctx.rev()) | ||||
| return stats | return stats | ||||
I would probably have put this on workingctx instead (not per file). It feels like it better matches how copies are recorded in the dirstate (which is not per file). It looks like this would be a little simpler that way. Will future patches be simpler by doing it on the workingfilectx instead?