|
|
|
|
|
$ cat << EOF >> $HGRCPATH
|
|
|
> [format]
|
|
|
> usegeneraldelta=yes
|
|
|
> EOF
|
|
|
|
|
|
Setting up test
|
|
|
|
|
|
$ hg init test
|
|
|
$ cd test
|
|
|
$ echo 0 > afile
|
|
|
$ hg add afile
|
|
|
$ hg commit -m "0.0"
|
|
|
$ echo 1 >> afile
|
|
|
$ hg commit -m "0.1"
|
|
|
$ echo 2 >> afile
|
|
|
$ hg commit -m "0.2"
|
|
|
$ echo 3 >> afile
|
|
|
$ hg commit -m "0.3"
|
|
|
$ hg update -C 0
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
$ echo 1 >> afile
|
|
|
$ hg commit -m "1.1"
|
|
|
created new head
|
|
|
$ echo 2 >> afile
|
|
|
$ hg commit -m "1.2"
|
|
|
$ echo "a line" > fred
|
|
|
$ echo 3 >> afile
|
|
|
$ hg add fred
|
|
|
$ hg commit -m "1.3"
|
|
|
$ hg mv afile adifferentfile
|
|
|
$ hg commit -m "1.3m"
|
|
|
$ hg update -C 3
|
|
|
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
|
$ hg mv afile anotherfile
|
|
|
$ hg commit -m "0.3m"
|
|
|
$ hg verify
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
4 files, 9 changesets, 7 total revisions
|
|
|
$ cd ..
|
|
|
$ hg init empty
|
|
|
|
|
|
Bundle and phase
|
|
|
|
|
|
$ hg -R test phase --force --secret 0
|
|
|
$ hg -R test bundle phase.hg empty
|
|
|
searching for changes
|
|
|
no changes found (ignored 9 secret changesets)
|
|
|
[1]
|
|
|
$ hg -R test phase --draft -r 'head()'
|
|
|
|
|
|
Bundle --all
|
|
|
|
|
|
$ hg -R test bundle --all all.hg
|
|
|
9 changesets found
|
|
|
|
|
|
Bundle test to full.hg
|
|
|
|
|
|
$ hg -R test bundle full.hg empty
|
|
|
searching for changes
|
|
|
9 changesets found
|
|
|
|
|
|
Unbundle full.hg in test
|
|
|
|
|
|
$ hg -R test unbundle full.hg
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 0 changesets with 0 changes to 4 files
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
|
|
Verify empty
|
|
|
|
|
|
$ hg -R empty heads
|
|
|
[1]
|
|
|
$ hg -R empty verify
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
0 files, 0 changesets, 0 total revisions
|
|
|
|
|
|
Pull full.hg into test (using --cwd)
|
|
|
|
|
|
$ hg --cwd test pull ../full.hg
|
|
|
pulling from ../full.hg
|
|
|
searching for changes
|
|
|
no changes found
|
|
|
|
|
|
Verify that there are no leaked temporary files after pull (issue2797)
|
|
|
|
|
|
$ ls test/.hg | grep .hg10un
|
|
|
[1]
|
|
|
|
|
|
Pull full.hg into empty (using --cwd)
|
|
|
|
|
|
$ hg --cwd empty pull ../full.hg
|
|
|
pulling from ../full.hg
|
|
|
requesting all changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 9 changesets with 7 changes to 4 files (+1 heads)
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
|
|
Rollback empty
|
|
|
|
|
|
$ hg -R empty rollback
|
|
|
repository tip rolled back to revision -1 (undo pull)
|
|
|
|
|
|
Pull full.hg into empty again (using --cwd)
|
|
|
|
|
|
$ hg --cwd empty pull ../full.hg
|
|
|
pulling from ../full.hg
|
|
|
requesting all changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 9 changesets with 7 changes to 4 files (+1 heads)
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
|
|
Pull full.hg into test (using -R)
|
|
|
|
|
|
$ hg -R test pull full.hg
|
|
|
pulling from full.hg
|
|
|
searching for changes
|
|
|
no changes found
|
|
|
|
|
|
Pull full.hg into empty (using -R)
|
|
|
|
|
|
$ hg -R empty pull full.hg
|
|
|
pulling from full.hg
|
|
|
searching for changes
|
|
|
no changes found
|
|
|
|
|
|
Rollback empty
|
|
|
|
|
|
$ hg -R empty rollback
|
|
|
repository tip rolled back to revision -1 (undo pull)
|
|
|
|
|
|
Pull full.hg into empty again (using -R)
|
|
|
|
|
|
$ hg -R empty pull full.hg
|
|
|
pulling from full.hg
|
|
|
requesting all changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 9 changesets with 7 changes to 4 files (+1 heads)
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
|
|
Log -R full.hg in fresh empty
|
|
|
|
|
|
$ rm -r empty
|
|
|
$ hg init empty
|
|
|
$ cd empty
|
|
|
$ hg -R bundle://../full.hg log
|
|
|
changeset: 8:aa35859c02ea
|
|
|
tag: tip
|
|
|
parent: 3:eebf5a27f8ca
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.3m
|
|
|
|
|
|
changeset: 7:a6a34bfa0076
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.3m
|
|
|
|
|
|
changeset: 6:7373c1169842
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.3
|
|
|
|
|
|
changeset: 5:1bb50a9436a7
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.2
|
|
|
|
|
|
changeset: 4:095197eb4973
|
|
|
parent: 0:f9ee2f85a263
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.1
|
|
|
|
|
|
changeset: 3:eebf5a27f8ca
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.3
|
|
|
|
|
|
changeset: 2:e38ba6f5b7e0
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.2
|
|
|
|
|
|
changeset: 1:34c2bf6b0626
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.1
|
|
|
|
|
|
changeset: 0:f9ee2f85a263
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.0
|
|
|
|
|
|
Make sure bundlerepo doesn't leak tempfiles (issue2491)
|
|
|
|
|
|
$ ls .hg
|
|
|
00changelog.i
|
|
|
cache
|
|
|
requires
|
|
|
store
|
|
|
|
|
|
Pull ../full.hg into empty (with hook)
|
|
|
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
|
> [hooks]
|
|
|
> changegroup = sh -c "printenv.py changegroup"
|
|
|
> EOF
|
|
|
|
|
|
doesn't work (yet ?)
|
|
|
|
|
|
hg -R bundle://../full.hg verify
|
|
|
|
|
|
$ hg pull bundle://../full.hg
|
|
|
pulling from bundle:../full.hg
|
|
|
requesting all changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 9 changesets with 7 changes to 4 files (+1 heads)
|
|
|
changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=bundle?../full.hg (glob)
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
|
|
Rollback empty
|
|
|
|
|
|
$ hg rollback
|
|
|
repository tip rolled back to revision -1 (undo pull)
|
|
|
$ cd ..
|
|
|
|
|
|
Log -R bundle:empty+full.hg
|
|
|
|
|
|
$ hg -R bundle:empty+full.hg log --template="{rev} "; echo ""
|
|
|
8 7 6 5 4 3 2 1 0
|
|
|
|
|
|
Pull full.hg into empty again (using -R; with hook)
|
|
|
|
|
|
$ hg -R empty pull full.hg
|
|
|
pulling from full.hg
|
|
|
requesting all changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 9 changesets with 7 changes to 4 files (+1 heads)
|
|
|
changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=bundle:empty+full.hg (glob)
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
|
|
Cannot produce streaming clone bundles with "hg bundle"
|
|
|
|
|
|
$ hg -R test bundle -t packed1 packed.hg
|
|
|
abort: packed bundles cannot be produced by "hg bundle"
|
|
|
(use 'hg debugcreatestreamclonebundle')
|
|
|
[255]
|
|
|
|
|
|
packed1 is produced properly
|
|
|
|
|
|
$ hg -R test debugcreatestreamclonebundle packed.hg
|
|
|
writing 2663 bytes for 6 files
|
|
|
bundle requirements: generaldelta, revlogv1
|
|
|
|
|
|
$ f -B 64 --size --sha1 --hexdump packed.hg
|
|
|
packed.hg: size=2826, sha1=e139f97692a142b19cdcff64a69697d5307ce6d4
|
|
|
0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
|
|
|
0010: 00 00 00 00 0a 67 00 16 67 65 6e 65 72 61 6c 64 |.....g..generald|
|
|
|
0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 00 64 61 |elta,revlogv1.da|
|
|
|
0030: 74 61 2f 61 64 69 66 66 65 72 65 6e 74 66 69 6c |ta/adifferentfil|
|
|
|
|
|
|
$ hg debugbundle --spec packed.hg
|
|
|
none-packed1;requirements%3Dgeneraldelta%2Crevlogv1
|
|
|
|
|
|
generaldelta requirement is not listed in stream clone bundles unless used
|
|
|
|
|
|
$ hg --config format.usegeneraldelta=false init testnongd
|
|
|
$ cd testnongd
|
|
|
$ touch foo
|
|
|
$ hg -q commit -A -m initial
|
|
|
$ cd ..
|
|
|
$ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
|
|
|
writing 301 bytes for 3 files
|
|
|
bundle requirements: revlogv1
|
|
|
|
|
|
$ f -B 64 --size --sha1 --hexdump packednongd.hg
|
|
|
packednongd.hg: size=383, sha1=1d9c230238edd5d38907100b729ba72b1831fe6f
|
|
|
0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
|
|
|
0010: 00 00 00 00 01 2d 00 09 72 65 76 6c 6f 67 76 31 |.....-..revlogv1|
|
|
|
0020: 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 34 0a 00 |.data/foo.i.64..|
|
|
|
0030: 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|
|
|
|
|
|
|
$ hg debugbundle --spec packednongd.hg
|
|
|
none-packed1;requirements%3Drevlogv1
|
|
|
|
|
|
Unpacking packed1 bundles with "hg unbundle" isn't allowed
|
|
|
|
|
|
$ hg init packed
|
|
|
$ hg -R packed unbundle packed.hg
|
|
|
abort: packed bundles cannot be applied with "hg unbundle"
|
|
|
(use "hg debugapplystreamclonebundle")
|
|
|
[255]
|
|
|
|
|
|
packed1 can be consumed from debug command
|
|
|
|
|
|
(this also confirms that streamclone-ed changes are visible via
|
|
|
@filecache properties to in-process procedures before closing
|
|
|
transaction)
|
|
|
|
|
|
$ cat > $TESTTMP/showtip.py <<EOF
|
|
|
> from __future__ import absolute_import
|
|
|
>
|
|
|
> def showtip(ui, repo, hooktype, **kwargs):
|
|
|
> ui.warn('%s: %s\n' % (hooktype, repo['tip'].hex()[:12]))
|
|
|
>
|
|
|
> def reposetup(ui, repo):
|
|
|
> # this confirms (and ensures) that (empty) 00changelog.i
|
|
|
> # before streamclone is already cached as repo.changelog
|
|
|
> ui.setconfig('hooks', 'pretxnopen.showtip', showtip)
|
|
|
>
|
|
|
> # this confirms that streamclone-ed changes are visible to
|
|
|
> # in-process procedures before closing transaction
|
|
|
> ui.setconfig('hooks', 'pretxnclose.showtip', showtip)
|
|
|
>
|
|
|
> # this confirms that streamclone-ed changes are still visible
|
|
|
> # after closing transaction
|
|
|
> ui.setconfig('hooks', 'txnclose.showtip', showtip)
|
|
|
> EOF
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
> [extensions]
|
|
|
> showtip = $TESTTMP/showtip.py
|
|
|
> EOF
|
|
|
|
|
|
$ hg -R packed debugapplystreamclonebundle packed.hg
|
|
|
6 files to transfer, 2.60 KB of data
|
|
|
pretxnopen: 000000000000
|
|
|
pretxnclose: aa35859c02ea
|
|
|
transferred 2.60 KB in *.* seconds (* */sec) (glob)
|
|
|
txnclose: aa35859c02ea
|
|
|
|
|
|
(for safety, confirm visibility of streamclone-ed changes by another
|
|
|
process, too)
|
|
|
|
|
|
$ hg -R packed tip -T "{node|short}\n"
|
|
|
aa35859c02ea
|
|
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
> [extensions]
|
|
|
> showtip = !
|
|
|
> EOF
|
|
|
|
|
|
Does not work on non-empty repo
|
|
|
|
|
|
$ hg -R packed debugapplystreamclonebundle packed.hg
|
|
|
abort: cannot apply stream clone bundle on non-empty repo
|
|
|
[255]
|
|
|
|
|
|
Create partial clones
|
|
|
|
|
|
$ rm -r empty
|
|
|
$ hg init empty
|
|
|
$ hg clone -r 3 test partial
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 4 changesets with 4 changes to 1 files
|
|
|
updating to branch default
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
$ hg clone partial partial2
|
|
|
updating to branch default
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
$ cd partial
|
|
|
|
|
|
Log -R full.hg in partial
|
|
|
|
|
|
$ hg -R bundle://../full.hg log -T phases
|
|
|
changeset: 8:aa35859c02ea
|
|
|
tag: tip
|
|
|
phase: draft
|
|
|
parent: 3:eebf5a27f8ca
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.3m
|
|
|
|
|
|
changeset: 7:a6a34bfa0076
|
|
|
phase: draft
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.3m
|
|
|
|
|
|
changeset: 6:7373c1169842
|
|
|
phase: draft
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.3
|
|
|
|
|
|
changeset: 5:1bb50a9436a7
|
|
|
phase: draft
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.2
|
|
|
|
|
|
changeset: 4:095197eb4973
|
|
|
phase: draft
|
|
|
parent: 0:f9ee2f85a263
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.1
|
|
|
|
|
|
changeset: 3:eebf5a27f8ca
|
|
|
phase: public
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.3
|
|
|
|
|
|
changeset: 2:e38ba6f5b7e0
|
|
|
phase: public
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.2
|
|
|
|
|
|
changeset: 1:34c2bf6b0626
|
|
|
phase: public
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.1
|
|
|
|
|
|
changeset: 0:f9ee2f85a263
|
|
|
phase: public
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.0
|
|
|
|
|
|
|
|
|
Incoming full.hg in partial
|
|
|
|
|
|
$ hg incoming bundle://../full.hg
|
|
|
comparing with bundle:../full.hg
|
|
|
searching for changes
|
|
|
changeset: 4:095197eb4973
|
|
|
parent: 0:f9ee2f85a263
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.1
|
|
|
|
|
|
changeset: 5:1bb50a9436a7
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.2
|
|
|
|
|
|
changeset: 6:7373c1169842
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.3
|
|
|
|
|
|
changeset: 7:a6a34bfa0076
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.3m
|
|
|
|
|
|
changeset: 8:aa35859c02ea
|
|
|
tag: tip
|
|
|
parent: 3:eebf5a27f8ca
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.3m
|
|
|
|
|
|
|
|
|
Outgoing -R full.hg vs partial2 in partial
|
|
|
|
|
|
$ hg -R bundle://../full.hg outgoing ../partial2
|
|
|
comparing with ../partial2
|
|
|
searching for changes
|
|
|
changeset: 4:095197eb4973
|
|
|
parent: 0:f9ee2f85a263
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.1
|
|
|
|
|
|
changeset: 5:1bb50a9436a7
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.2
|
|
|
|
|
|
changeset: 6:7373c1169842
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.3
|
|
|
|
|
|
changeset: 7:a6a34bfa0076
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.3m
|
|
|
|
|
|
changeset: 8:aa35859c02ea
|
|
|
tag: tip
|
|
|
parent: 3:eebf5a27f8ca
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.3m
|
|
|
|
|
|
|
|
|
Outgoing -R does-not-exist.hg vs partial2 in partial
|
|
|
|
|
|
$ hg -R bundle://../does-not-exist.hg outgoing ../partial2
|
|
|
abort: *../does-not-exist.hg* (glob)
|
|
|
[255]
|
|
|
$ cd ..
|
|
|
|
|
|
hide outer repo
|
|
|
$ hg init
|
|
|
|
|
|
Direct clone from bundle (all-history)
|
|
|
|
|
|
$ hg clone full.hg full-clone
|
|
|
requesting all changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 9 changesets with 7 changes to 4 files (+1 heads)
|
|
|
updating to branch default
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
$ hg -R full-clone heads
|
|
|
changeset: 8:aa35859c02ea
|
|
|
tag: tip
|
|
|
parent: 3:eebf5a27f8ca
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.3m
|
|
|
|
|
|
changeset: 7:a6a34bfa0076
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 1.3m
|
|
|
|
|
|
$ rm -r full-clone
|
|
|
|
|
|
When cloning from a non-copiable repository into '', do not
|
|
|
recurse infinitely (issue2528)
|
|
|
|
|
|
$ hg clone full.hg ''
|
|
|
abort: empty destination path is not valid
|
|
|
[255]
|
|
|
|
|
|
test for https://bz.mercurial-scm.org/216
|
|
|
|
|
|
Unbundle incremental bundles into fresh empty in one go
|
|
|
|
|
|
$ rm -r empty
|
|
|
$ hg init empty
|
|
|
$ hg -R test bundle --base null -r 0 ../0.hg
|
|
|
1 changesets found
|
|
|
$ hg -R test bundle --base 0 -r 1 ../1.hg
|
|
|
1 changesets found
|
|
|
$ hg -R empty unbundle -u ../0.hg ../1.hg
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
|
View full contents of the bundle
|
|
|
$ hg -R test bundle --base null -r 3 ../partial.hg
|
|
|
4 changesets found
|
|
|
$ cd test
|
|
|
$ hg -R ../../partial.hg log -r "bundle()"
|
|
|
changeset: 0:f9ee2f85a263
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.0
|
|
|
|
|
|
changeset: 1:34c2bf6b0626
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.1
|
|
|
|
|
|
changeset: 2:e38ba6f5b7e0
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.2
|
|
|
|
|
|
changeset: 3:eebf5a27f8ca
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0.3
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
test for 540d1059c802
|
|
|
|
|
|
test for 540d1059c802
|
|
|
|
|
|
$ hg init orig
|
|
|
$ cd orig
|
|
|
$ echo foo > foo
|
|
|
$ hg add foo
|
|
|
$ hg ci -m 'add foo'
|
|
|
|
|
|
$ hg clone . ../copy
|
|
|
updating to branch default
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
$ hg tag foo
|
|
|
|
|
|
$ cd ../copy
|
|
|
$ echo >> foo
|
|
|
$ hg ci -m 'change foo'
|
|
|
$ hg bundle ../bundle.hg ../orig
|
|
|
searching for changes
|
|
|
1 changesets found
|
|
|
|
|
|
$ cd ../orig
|
|
|
$ hg incoming ../bundle.hg
|
|
|
comparing with ../bundle.hg
|
|
|
searching for changes
|
|
|
changeset: 2:ed1b79f46b9a
|
|
|
tag: tip
|
|
|
parent: 0:bbd179dfa0a7
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: change foo
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
test bundle with # in the filename (issue2154):
|
|
|
|
|
|
$ cp bundle.hg 'test#bundle.hg'
|
|
|
$ cd orig
|
|
|
$ hg incoming '../test#bundle.hg'
|
|
|
comparing with ../test
|
|
|
abort: unknown revision 'bundle.hg'!
|
|
|
[255]
|
|
|
|
|
|
note that percent encoding is not handled:
|
|
|
|
|
|
$ hg incoming ../test%23bundle.hg
|
|
|
abort: repository ../test%23bundle.hg not found!
|
|
|
[255]
|
|
|
$ cd ..
|
|
|
|
|
|
test to bundle revisions on the newly created branch (issue3828):
|
|
|
|
|
|
$ hg -q clone -U test test-clone
|
|
|
$ cd test
|
|
|
|
|
|
$ hg -q branch foo
|
|
|
$ hg commit -m "create foo branch"
|
|
|
$ hg -q outgoing ../test-clone
|
|
|
9:b4f5acb1ee27
|
|
|
$ hg -q bundle --branch foo foo.hg ../test-clone
|
|
|
$ hg -R foo.hg -q log -r "bundle()"
|
|
|
9:b4f5acb1ee27
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
test for https://bz.mercurial-scm.org/1144
|
|
|
|
|
|
test that verify bundle does not traceback
|
|
|
|
|
|
partial history bundle, fails w/ unknown parent
|
|
|
|
|
|
$ hg -R bundle.hg verify
|
|
|
abort: 00changelog.i@bbd179dfa0a7: unknown parent!
|
|
|
[255]
|
|
|
|
|
|
full history bundle, refuses to verify non-local repo
|
|
|
|
|
|
$ hg -R all.hg verify
|
|
|
abort: cannot verify bundle or remote repos
|
|
|
[255]
|
|
|
|
|
|
but, regular verify must continue to work
|
|
|
|
|
|
$ hg -R orig verify
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
2 files, 2 changesets, 2 total revisions
|
|
|
|
|
|
diff against bundle
|
|
|
|
|
|
$ hg init b
|
|
|
$ cd b
|
|
|
$ hg -R ../all.hg diff -r tip
|
|
|
diff -r aa35859c02ea anotherfile
|
|
|
--- a/anotherfile Thu Jan 01 00:00:00 1970 +0000
|
|
|
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
@@ -1,4 +0,0 @@
|
|
|
-0
|
|
|
-1
|
|
|
-2
|
|
|
-3
|
|
|
$ cd ..
|
|
|
|
|
|
bundle single branch
|
|
|
|
|
|
$ hg init branchy
|
|
|
$ cd branchy
|
|
|
$ echo a >a
|
|
|
$ echo x >x
|
|
|
$ hg ci -Ama
|
|
|
adding a
|
|
|
adding x
|
|
|
$ echo c >c
|
|
|
$ echo xx >x
|
|
|
$ hg ci -Amc
|
|
|
adding c
|
|
|
$ echo c1 >c1
|
|
|
$ hg ci -Amc1
|
|
|
adding c1
|
|
|
$ hg up 0
|
|
|
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
|
$ echo b >b
|
|
|
$ hg ci -Amb
|
|
|
adding b
|
|
|
created new head
|
|
|
$ echo b1 >b1
|
|
|
$ echo xx >x
|
|
|
$ hg ci -Amb1
|
|
|
adding b1
|
|
|
$ hg clone -q -r2 . part
|
|
|
|
|
|
== bundling via incoming
|
|
|
|
|
|
$ hg in -R part --bundle incoming.hg --template "{node}\n" .
|
|
|
comparing with .
|
|
|
searching for changes
|
|
|
1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a
|
|
|
057f4db07f61970e1c11e83be79e9d08adc4dc31
|
|
|
|
|
|
== bundling
|
|
|
|
|
|
$ hg bundle bundle.hg part --debug --config progress.debug=true
|
|
|
query 1; heads
|
|
|
searching for changes
|
|
|
all remote heads known locally
|
|
|
2 changesets found
|
|
|
list of changesets:
|
|
|
1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a
|
|
|
057f4db07f61970e1c11e83be79e9d08adc4dc31
|
|
|
bundle2-output-bundle: "HG20", (1 params) 1 parts total
|
|
|
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
|
|
|
bundling: 1/2 changesets (50.00%)
|
|
|
bundling: 2/2 changesets (100.00%)
|
|
|
bundling: 1/2 manifests (50.00%)
|
|
|
bundling: 2/2 manifests (100.00%)
|
|
|
bundling: b 1/3 files (33.33%)
|
|
|
bundling: b1 2/3 files (66.67%)
|
|
|
bundling: x 3/3 files (100.00%)
|
|
|
|
|
|
== Test for issue3441
|
|
|
|
|
|
$ hg clone -q -r0 . part2
|
|
|
$ hg -q -R part2 pull bundle.hg
|
|
|
$ hg -R part2 verify
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
4 files, 3 changesets, 5 total revisions
|
|
|
|
|
|
== Test bundling no commits
|
|
|
|
|
|
$ hg bundle -r 'public()' no-output.hg
|
|
|
abort: no commits to bundle
|
|
|
[255]
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
When user merges to the revision existing only in the bundle,
|
|
|
it should show warning that second parent of the working
|
|
|
directory does not exist
|
|
|
|
|
|
$ hg init update2bundled
|
|
|
$ cd update2bundled
|
|
|
$ cat <<EOF >> .hg/hgrc
|
|
|
> [extensions]
|
|
|
> strip =
|
|
|
> EOF
|
|
|
$ echo "aaa" >> a
|
|
|
$ hg commit -A -m 0
|
|
|
adding a
|
|
|
$ echo "bbb" >> b
|
|
|
$ hg commit -A -m 1
|
|
|
adding b
|
|
|
$ echo "ccc" >> c
|
|
|
$ hg commit -A -m 2
|
|
|
adding c
|
|
|
$ hg update -r 1
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
$ echo "ddd" >> d
|
|
|
$ hg commit -A -m 3
|
|
|
adding d
|
|
|
created new head
|
|
|
$ hg update -r 2
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
$ hg log -G
|
|
|
o changeset: 3:8bd3e1f196af
|
|
|
| tag: tip
|
|
|
| parent: 1:a01eca7af26d
|
|
|
| user: test
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
| summary: 3
|
|
|
|
|
|
|
| @ changeset: 2:4652c276ac4f
|
|
|
|/ user: test
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
| summary: 2
|
|
|
|
|
|
|
o changeset: 1:a01eca7af26d
|
|
|
| user: test
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
| summary: 1
|
|
|
|
|
|
|
o changeset: 0:4fe08cd4693e
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: 0
|
|
|
|
|
|
$ hg bundle --base 1 -r 3 ../update2bundled.hg
|
|
|
1 changesets found
|
|
|
$ hg strip -r 3
|
|
|
saved backup bundle to $TESTTMP/update2bundled/.hg/strip-backup/8bd3e1f196af-017e56d8-backup.hg (glob)
|
|
|
$ hg merge -R ../update2bundled.hg -r 3
|
|
|
setting parent to node 8bd3e1f196af289b2b121be08031e76d7ae92098 that only exists in the bundle
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
|
When user updates to the revision existing only in the bundle,
|
|
|
it should show warning
|
|
|
|
|
|
$ hg update -R ../update2bundled.hg --clean -r 3
|
|
|
setting parent to node 8bd3e1f196af289b2b121be08031e76d7ae92098 that only exists in the bundle
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
|
|
When user updates to the revision existing in the local repository
|
|
|
the warning shouldn't be emitted
|
|
|
|
|
|
$ hg update -R ../update2bundled.hg -r 0
|
|
|
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
|
|
