Mercurial > hg
comparison tests/test-copies-in-changeset.t @ 42291:a13b30555ffb
context: reuse changectx._copies() in all but workingctx
This moves the dirstate-specific _copies() implementation from
committablectx into workingctx where it should be (I think all
dirstate-specific stuff should be moved into workingctx). The part of
changectx._copies() that is for producing changeset-wide copy dicts
from the filectxs is moved into basectx so it's reused by the other
subclasses. The part of changectx._copies() that's about reading copy
information from the changeset remains there. This fixes in-memory
rebase (and makes `hg convert` able to write copies to changesets).
Differential Revision: https://phab.mercurial-scm.org/D6219
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 10 May 2019 13:41:42 -0700 |
parents | 83b225fbd788 |
children | 278dcb24e535 |
comparison
equal
deleted
inserted
replaced
42290:e79aeb518aa1 | 42291:a13b30555ffb |
---|---|
149 $ hg ci -qm 'rename a to b' | 149 $ hg ci -qm 'rename a to b' |
150 $ hg rebase -d 1 --config rebase.experimental.inmemory=yes | 150 $ hg rebase -d 1 --config rebase.experimental.inmemory=yes |
151 rebasing 2:55d0b405c1b2 "rename a to b" (tip) | 151 rebasing 2:55d0b405c1b2 "rename a to b" (tip) |
152 merging a and b to b | 152 merging a and b to b |
153 saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/55d0b405c1b2-78df867e-rebase.hg | 153 saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/55d0b405c1b2-78df867e-rebase.hg |
154 BROKEN: should show the rename | |
155 $ hg st --change . --copies | 154 $ hg st --change . --copies |
156 A b | 155 A b |
156 a | |
157 R a | 157 R a |
158 $ cd .. | 158 $ cd .. |