Mercurial > hg
view tests/test-remotefilelog-keepset.t @ 48976:877d7e1a4223 stable
amend: fix amend with copies in extras
If copy information is stored only in the commit extras and not in
filelogs, then they get lost on amend if the file wasn't also modified
in the working copy. That's because we create `filectx` object from
the old commit in those cases, and the `.copysource()` of such objects
read only from the filelog. This patch fixes it by always creating a
new `memfilectx` in these cases, passing the calculated copy
information to it.
Differential Revision: https://phab.mercurial-scm.org/D12387
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 18 Mar 2022 21:15:54 -0700 |
parents | 0800d9e6e216 |
children |
line wrap: on
line source
#require no-windows $ . "$TESTDIR/remotefilelog-library.sh" $ hg init master $ cd master $ cat >> .hg/hgrc <<EOF > [remotefilelog] > server=True > serverexpiration=-1 > EOF $ echo x > x $ hg commit -qAm x $ echo y > y $ hg commit -qAm y $ echo z > z $ hg commit -qAm z $ cd .. $ hgcloneshallow ssh://user@dummy/master shallow -q 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob) # Compute keepset for 0th and 2nd commit, which implies that we do not process # the 1st commit, therefore we diff 2nd manifest with the 0th manifest and # populate the keepkeys from the diff $ cd shallow $ cat >> .hg/hgrc <<EOF > [remotefilelog] > pullprefetch=0+2 > EOF $ hg debugkeepset # Compute keepset for all commits, which implies that we only process deltas of # manifests of commits 1 and 2 and therefore populate the keepkeys from deltas $ cat >> .hg/hgrc <<EOF > [remotefilelog] > pullprefetch=all() > EOF $ hg debugkeepset