Mercurial > hg
view tests/test-diff-reverse.t @ 29715:55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
This is a little messier than I'd like, and I'll probably come back
and do some more refactoring later, but as it is this unblocks
narrowhg. An alternative approach (which I may do as part of the
mentioned refactoring) would be to construct *all* dirlog instances up
front, so that we don't have to keep track of the linkmapper
method. This would avoid a reference cycle between the bundlemanifest
and the bundlerepository, but I was hesitant to do all the work up
front like that.
With this change, it's possible to do 'hg incoming' and 'hg pull' from
bundles in .hg/strip-backup in a treemanifest repository. Sadly, this
doesn't make it possible to 'hg clone' one of those (if you do 'hg
strip 0'), because the cg3 in the bundle gets written without a
treemanifest flag. Since that's going to be an involved refactor in a
different part of the code (which I *suspect* won't touch any of the
code I've just written here), let's leave it as an idea for Later.
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 05 Aug 2016 13:08:11 -0400 |
parents | c586cb50872b |
children | 55c6ebd11cb9 |
line wrap: on
line source
$ hg init $ cat > a <<EOF > a > b > c > EOF $ hg ci -Am adda adding a $ cat > a <<EOF > d > e > f > EOF $ hg ci -m moda $ hg diff --reverse -r0 -r1 diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +1,3 @@ -d -e -f +a +b +c $ cat >> a <<EOF > g > h > EOF $ hg diff --reverse --nodates diff -r 2855cdcfcbb7 a --- a/a +++ b/a @@ -1,5 +1,3 @@ d e f -g -h should show removed file 'a' as being added $ hg revert a $ hg rm a $ hg diff --reverse --nodates a diff -r 2855cdcfcbb7 a --- /dev/null +++ b/a @@ -0,0 +1,3 @@ +d +e +f should show added file 'b' as being removed $ echo b >> b $ hg add b $ hg diff --reverse --nodates b diff -r 2855cdcfcbb7 b --- a/b +++ /dev/null @@ -1,1 +0,0 @@ -b