Mercurial > hg
view tests/test-remotefilelog-wireproto.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 | dcaa2df1f688 |
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 $ hg commit -qAm x $ echo y >> x $ hg commit -qAm y $ echo z >> x $ hg commit -qAm z $ hg update 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo w >> x $ hg commit -qAm w $ cd .. Shallow clone and activate getflogheads testing extension $ hgcloneshallow ssh://user@dummy/master shallow --noupdate streaming all changes 2 files to transfer, 908 bytes of data transferred 908 bytes in * seconds (*/sec) (glob) searching for changes no changes found $ cd shallow $ cat >> .hg/hgrc <<EOF > [extensions] > getflogheads=$TESTDIR/remotefilelog-getflogheads.py > EOF Get heads of a remotefilelog $ hg getflogheads x 2797809ca5e9c2f307d82b1345e832f655fb99a2 ca758b402ddc91e37e3113e1a97791b537e1b7bb Get heads of a non-existing remotefilelog $ hg getflogheads y EMPTY