Mercurial > hg
view tests/test-mq-pull-from-bundle.t @ 40923:3ed77780f4a6
wireprotov2: send linknodes to emitfilerevisions()
Previously, linknodes were calculated within emitfilerevisions() by
using filectx.introrev(), which would always use the linkrev/linknode
as recorded by storage. This is wrong for cases where the receiver
doesn't have the changeset the linknode refers to.
This commit changes the logic for linknode emission so the mapping
of filenode to linknode is computed by the caller and passed into
emitfilerevisions().
As part of the change, linknodes for "filesdata" in the
haveparents=False case are now correct: the existing code performed a
manifest walk and it was trivial to plug in the correct linknode.
However, behavior for the haveparents=True case is still wrong
because it relies on filtering linkrevs against the outgoing set in
order to determine what to send. This will be fixed in a subsequent
commit.
The change test test-wireproto-exchangev2-shallow.t is a bit wonky.
The test repo has 6 revisions. The changed test is performing a shallow
clone with depth=1. So, only file data for revision 5 is present
locally. So, the new behavior of associating the linknode with
revision 5 for every file revision seems correct. Of course, when
backfilling old revisions, we'll want to update the linknode. But
this problem requires wire protocol support and we'll cross that
bridge later.
Differential Revision: https://phab.mercurial-scm.org/D5405
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 10 Dec 2018 18:04:12 +0000 |
parents | 89630d0b3e23 |
children |
line wrap: on
line source
#require repobundlerepo $ cat <<EOF >> $HGRCPATH > [extensions] > mq= > [alias] > tlog = log --template "{rev}: {node|short} {desc}\\n" > theads = heads --template "{rev}: {desc}\\n" > tincoming = incoming --template "{rev}: {desc}\\n" > EOF Setup main: $ hg init base $ cd base $ echo "One" > one $ hg add adding one $ hg ci -m "main: one added" $ echo "++" >> one $ hg ci -m "main: one updated" Bundle main: $ hg bundle --base=null ../main.hg 2 changesets found $ cd .. Incoming to fresh repo: $ hg init fresh $ hg -R fresh tincoming main.hg comparing with main.hg 0: main: one added 1: main: one updated $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true $ hg -R fresh tincoming bundle:fresh+main.hg comparing with bundle:fresh+main.hg 0: main: one added 1: main: one updated Setup queue: $ cd base $ hg qinit -c $ hg qnew -m "patch: two added" two.patch $ echo two > two $ hg add adding two $ hg qrefresh $ hg qcommit -m "queue: two.patch added" $ hg qpop -a popping two.patch patch queue now empty Bundle queue: $ hg -R .hg/patches bundle --base=null ../queue.hgq 1 changesets found $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true $ cd .. Clone base: $ hg clone base copy updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd copy $ hg qinit -c Incoming queue bundle: $ hg -R .hg/patches tincoming ../queue.hgq comparing with ../queue.hgq 0: queue: two.patch added $ test -f .hg/hg-bundle* && echo 'temp. bundle file remained' || true Pull queue bundle: $ hg -R .hg/patches pull --update ../queue.hgq pulling from ../queue.hgq requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files new changesets d7553909353d (1 drafts) merging series 2 files updated, 1 files merged, 0 files removed, 0 files unresolved $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true $ hg -R .hg/patches theads 0: queue: two.patch added $ hg -R .hg/patches tlog 0: d7553909353d queue: two.patch added $ hg qseries two.patch $ cd .. Clone base again: $ hg clone base copy2 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd copy2 $ hg qinit -c Unbundle queue bundle: $ hg -R .hg/patches unbundle --update ../queue.hgq adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files new changesets d7553909353d (1 drafts) merging series 2 files updated, 1 files merged, 0 files removed, 0 files unresolved $ hg -R .hg/patches theads 0: queue: two.patch added $ hg -R .hg/patches tlog 0: d7553909353d queue: two.patch added $ hg qseries two.patch $ cd ..