Mercurial > hg
view tests/test-remotefilelog-bad-configs.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 > EOF $ echo x > x $ echo y > y $ echo z > z $ hg commit -qAm xy $ cd .. $ hgcloneshallow ssh://user@dummy/master shallow -q 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob) $ cd shallow Verify error message when noc achepath specified $ hg up -q null $ cp $HGRCPATH $HGRCPATH.bak $ grep -v cachepath < $HGRCPATH.bak > tmp $ mv tmp $HGRCPATH $ hg up tip abort: could not find config option remotefilelog.cachepath [255] $ mv $HGRCPATH.bak $HGRCPATH Verify error message when no fallback specified $ hg up -q null $ rm .hg/hgrc $ clearcache $ hg up tip 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob) abort: no remotefilelog server configured - is your .hg/hgrc trusted? [255]