Mercurial > hg
view tests/remotefilelog-library.sh @ 44805:02bf61bb4a70
copy: to find copy source, walk parent of revision we're marking copies in
As shown in the previous patch, `hg cp --after --at-rev . src dst`
fails if `src` is not in `.`. It seems obvious that you should always
walk the *parent* of the revision you're marking copies in, but that's
not how it was done for the working copy, and I didn't think to change
it when marking copies in a non-working-copy commit.
This patch fixes that by walking the parent commit instead, but only
if we're marking copies for a non-working-copy commit. We need to
leave the working-copy code unchanged because it depends on the weird
behavior of `workingctx.walk()`. With these changes, there's very
little overlap between the working-copy version and the
non-working-copy version of `walkpats()`, but I've refrained from
cleaning that up on the stable branch.
Differential Revision: https://phab.mercurial-scm.org/D8494
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 06 May 2020 10:33:56 -0700 |
parents | 17f21047a232 |
children | 0826d684a1b5 |
line wrap: on
line source
CACHEDIR=$PWD/hgcache cat >> $HGRCPATH <<EOF [remotefilelog] cachepath=$CACHEDIR debug=True [extensions] remotefilelog= rebase= strip= [ui] ssh=python "$TESTDIR/dummyssh" [server] preferuncompressed=True [experimental] changegroup3=True [rebase] singletransaction=True EOF hgcloneshallow() { local name local dest orig=$1 shift dest=$1 shift hg clone --shallow --config remotefilelog.reponame=master $orig $dest $@ cat >> $dest/.hg/hgrc <<EOF [remotefilelog] reponame=master [phases] publish=False EOF } hgcloneshallowlfs() { local name local dest local lfsdir orig=$1 shift dest=$1 shift lfsdir=$1 shift hg clone --shallow --config "extensions.lfs=" --config "lfs.url=$lfsdir" --config remotefilelog.reponame=master $orig $dest $@ cat >> $dest/.hg/hgrc <<EOF [extensions] lfs= [lfs] url=$lfsdir [remotefilelog] reponame=master [phases] publish=False EOF } clearcache() { rm -rf $CACHEDIR/* } mkcommit() { echo "$1" > "$1" hg add "$1" hg ci -m "$1" } ls_l() { $PYTHON $TESTDIR/ls-l.py "$@" } identifyrflcaps() { xargs -n 1 echo | egrep '(remotefilelog|getflogheads|getfile)' | sort }