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
$ . "$TESTDIR/narrow-library.sh"
create full repo
$ hg init master
$ cd master
$ mkdir inside
$ echo inside > inside/f1
$ mkdir outside
$ echo outside > outside/f2
$ hg ci -Aqm 'initial'
$ hg mv outside/f2 inside/f2
$ hg ci -qm 'move f2 from outside'
$ echo modified > inside/f2
$ hg ci -qm 'modify inside/f2'
$ mkdir outside
$ echo new > outside/f3
$ hg ci -Aqm 'add outside/f3'
$ cd ..
$ hg clone --narrow ssh://user@dummy/master narrow --include inside -r 2
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files
new changesets *:* (glob)
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow
$ hg co 'desc("move f2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg status
$ hg diff
$ hg diff --change . --git
diff --git a/inside/f2 b/inside/f2
new file mode 100644
--- /dev/null
+++ b/inside/f2
@@ -0,0 +1,1 @@
+outside
$ hg log --follow inside/f2 -r tip
changeset: 2:bcfb756e0ca9
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify inside/f2
changeset: 1:5a016133b2bb
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: move f2 from outside
$ echo new > inside/f4
$ hg ci -Aqm 'add inside/f4'
$ hg pull -q
$ hg --config extensions.rebase= rebase -d tip
rebasing 3:4f84b666728c "add inside/f4"
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/4f84b666728c-4269b76e-rebase.hg
$ hg co -q 0
$ echo modified > inside/f1
$ hg ci -qm 'modify inside/f1'
$ echo new > inside/f5
$ hg ci -Aqm 'add inside/f5'
$ hg --config extensions.rebase= rebase -d 'public()' -r .
rebasing 6:610b60178c28 "add inside/f5" (tip)
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/610b60178c28-65716a78-rebase.hg