##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

exchange: move disabling of rev-branch-cache bundle part out of narrow...
exchange: move disabling of rev-branch-cache bundle part out of narrow I'm attempting to refactor changegroup code in order to better support alternate storage backends. The narrow extension is performing a lot of monkeypatching to this code and it is making it difficult to reason about how everything works. I'm reasonably certain I would be unable to abstract storage without requiring extensive rework of narrow. I believe it is less effort to move narrow code into core so it can be accounted for when changegroup code is refactored. So I'll be doing that. The first part of this is integrating the disabling of the cache:rev-branch-cache bundle2 part into core. This doesn't seem like it is related to changegroup, but narrow's modifications to changegroup are invasive and also require taking its code for bundle generation and exchange into core in order for the changegroup code to work. Differential Revision: https://phab.mercurial-scm.org/D4007
Gregory Szorc - - Load All Authors

File last commit:

r37364:45a47991 default
r38813:ab765bc4 default
Show More
test-mq-pull-from-bundle.t
139 lines | 2.8 KiB | text/troff | Tads3Lexer
/ tests / test-mq-pull-from-bundle.t
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
tests: disallow using simple store repo with bundlerepo...
 r37364 #require repobundlerepo
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 $ cat <<EOF >> $HGRCPATH
> [extensions]
> mq=
> [alias]
Phil Cohen
tests: add commit hashes to log commands in rebase tests...
 r35386 > tlog = log --template "{rev}: {node|short} {desc}\\n"
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 > 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
Klaus Koch
bundlerepository: get rid of temporary bundle files (issue2478)...
 r12962 $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
$ 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
Klaus Koch
bundlerepository: get rid of temporary bundle files (issue2478)...
 r12962 $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
$ 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
Klaus Koch
bundlerepository: get rid of temporary bundle files (issue2478)...
 r12962 $ test -f .hg/hg-bundle* && echo 'temp. bundle file remained' || true
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
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
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
 r34662 new changesets d7553909353d
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
Klaus Koch
bundlerepository: get rid of temporary bundle files (issue2478)...
 r12962 $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
$ hg -R .hg/patches theads
0: queue: two.patch added
$ hg -R .hg/patches tlog
Phil Cohen
tests: add commit hashes to log commands in rebase tests...
 r35386 0: d7553909353d queue: two.patch added
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
$ 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
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
 r34662 new changesets d7553909353d
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 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
Phil Cohen
tests: add commit hashes to log commands in rebase tests...
 r35386 0: d7553909353d queue: two.patch added
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
$ hg qseries
two.patch
$ cd ..