annotate tests/test-bundle2-multiple-changegroups.t @ 51681:522b4d729e89

mmap: populate the mapping by default Without pre-population, accessing all data through a mmap can result in many pagefault, reducing performance significantly. If the mmap is prepopulated, the performance can no longer get slower than a full read. (See benchmark number below) In some cases were very few data is read, prepopulating can be overkill and slower than populating on access (through page fault). So that behavior can be controlled when the caller can pre-determine the best behavior. (See benchmark number below) In addition, testing with populating in a secondary thread yield great result combining the best of each approach. This might be implemented in later changesets. In all cases, using mmap has a great effect on memory usage when many processes run in parallel on the same machine. ### Benchmarks # What did I run A couple of month back I ran a large benchmark campaign to assess the impact of various approach for using mmap with the revlog (and other files), it highlighted a few benchmarks that capture the impact of the changes well. So to validate this change I checked the following: - log command displaying various revisions (read the changelog index) - log command displaying the patch of listed revisions (read the changelog index, the manifest index and a few files indexes) - unbundling a few revisions (read and write changelog, manifest and few files indexes, and walk the graph to update some cache) - pushing a few revisions (read and write changelog, manifest and few files indexes, walk the graph to update some cache, performs various accesses locally and remotely during discovery) Benchmarks were run using the default module policy (c+py) and the rust one. No significant difference were found between the two implementation, so we will present result using the default policy (unless otherwise specified). I ran them on a few repositories : - mercurial: a "public changeset only" copy of mercurial from 2018-08-01 using zstd compression and sparse-revlog - pypy: a copy of pypy from 2018-08-01 using zstd compression and sparse-revlog - netbeans: a copy of netbeans from 2018-08-01 using zstd compression and sparse-revlog - mozilla-try: a copy of mozilla-try from 2019-02-18 using zstd compression and sparse-revlog - mozilla-try persistent-nodemap: Same as the above but with a persistent nodemap. Used for the log --patch benchmark only # Results For the smaller repositories (mercurial, pypy), the impact of mmap is almost imperceptible, other cost dominating the operation. The impact of prepopulating is undiscernible in the benchmark we ran. For larger repositories the benchmark support explanation given above: On netbeans, the log can be about 1% faster without repopulation (for a difference < 100ms) but unbundle becomes a bit slower, even when small. ### data-env-vars.name = netbeans-2018-08-01-zstd-sparse-revlog # benchmark.name = hg.command.unbundle # benchmark.variants.issue6528 = disabled # benchmark.variants.reuse-external-delta-parent = yes # benchmark.variants.revs = any-1-extra-rev # benchmark.variants.source = unbundle # benchmark.variants.verbosity = quiet with-populate: 0.240157 no-populate: 0.265087 (+10.38%, +0.02) # benchmark.variants.revs = any-100-extra-rev with-populate: 1.459518 no-populate: 1.481290 (+1.49%, +0.02) ## benchmark.name = hg.command.push # benchmark.variants.explicit-rev = none # benchmark.variants.issue6528 = disabled # benchmark.variants.protocol = ssh # benchmark.variants.reuse-external-delta-parent = yes # benchmark.variants.revs = any-1-extra-rev with-populate: 0.771919 no-populate: 0.792025 (+2.60%, +0.02) # benchmark.variants.revs = any-100-extra-rev with-populate: 1.459518 no-populate: 1.481290 (+1.49%, +0.02) For mozilla-try, the "slow down" from pre-populate for small `hg log` is more visible, but still small in absolute time. (using rust value for the persistent nodemap value to be relevant). ### data-env-vars.name = mozilla-try-2019-02-18-ds2-pnm # benchmark.name = hg.command.log # bin-env-vars.hg.flavor = rust # benchmark.variants.patch = yes # benchmark.variants.limit-rev = 1 with-populate: 0.237813 no-populate: 0.229452 (-3.52%, -0.01) # benchmark.variants.limit-rev = 10 # benchmark.variants.patch = yes with-populate: 1.213578 no-populate: 1.205189 ### data-env-vars.name = mozilla-try-2019-02-18-zstd-sparse-revlog # benchmark.variants.limit-rev = 1000 # benchmark.variants.patch = no # benchmark.variants.rev = tip with-populate: 0.198607 no-populate: 0.195038 (-1.80%, -0.00) However pre-populating provide a significant boost on more complex operations like unbundle or push: ### data-env-vars.name = mozilla-try-2019-02-18-zstd-sparse-revlog # benchmark.name = hg.command.push # benchmark.variants.explicit-rev = none # benchmark.variants.issue6528 = disabled # benchmark.variants.protocol = ssh # benchmark.variants.reuse-external-delta-parent = yes # benchmark.variants.revs = any-1-extra-rev with-populate: 4.798632 no-populate: 4.953295 (+3.22%, +0.15) # benchmark.variants.revs = any-100-extra-rev with-populate: 4.903618 no-populate: 5.014963 (+2.27%, +0.11) ## benchmark.name = hg.command.unbundle # benchmark.variants.revs = any-1-extra-rev with-populate: 1.423411 no-populate: 1.585365 (+11.38%, +0.16) # benchmark.variants.revs = any-100-extra-rev with-populate: 1.537909 no-populate: 1.688489 (+9.79%, +0.15)
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 11 Apr 2024 00:02:07 +0200
parents 2bb2a1ff4d8f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
1 Create an extension to test bundle2 with multiple changegroups
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
2
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
3 $ cat > bundle2.py <<EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
4 > """
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
5 > """
29807
d4e026341e16 getchangegroup: take an 'outgoing' object as argument (API)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29672
diff changeset
6 > from mercurial import changegroup, discovery, exchange
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
7 >
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
8 > def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None,
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
9 > b2caps=None, heads=None, common=None,
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
10 > **kwargs):
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
11 > # Create two changegroups given the common changesets and heads for the
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
12 > # changegroup part we are being requested. Use the parent of each head
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
13 > # in 'heads' as intermediate heads for the first changegroup.
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
14 > intermediates = [repo[r].p1().node() for r in heads]
29807
d4e026341e16 getchangegroup: take an 'outgoing' object as argument (API)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29672
diff changeset
15 > outgoing = discovery.outgoing(repo, common, intermediates)
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
16 > cg = changegroup.makechangegroup(repo, outgoing, b'01',
34101
5ede882c249c changegroup: replace getchangegroup with makechangegroup
Durham Goode <durham@fb.com>
parents: 32287
diff changeset
17 > source, bundlecaps=bundlecaps)
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
18 > bundler.newpart(b'output', data=b'changegroup1')
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
19 > bundler.newpart(b'changegroup', data=cg.getchunks())
29807
d4e026341e16 getchangegroup: take an 'outgoing' object as argument (API)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29672
diff changeset
20 > outgoing = discovery.outgoing(repo, common + intermediates, heads)
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
21 > cg = changegroup.makechangegroup(repo, outgoing, b'01',
34101
5ede882c249c changegroup: replace getchangegroup with makechangegroup
Durham Goode <durham@fb.com>
parents: 32287
diff changeset
22 > source, bundlecaps=bundlecaps)
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
23 > bundler.newpart(b'output', data=b'changegroup2')
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
24 > bundler.newpart(b'changegroup', data=cg.getchunks())
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
25 >
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
26 > def _pull(repo, *args, **kwargs):
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
27 > pullop = _orig_pull(repo, *args, **kwargs)
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
28 > repo.ui.write(b'pullop.cgresult is %d\n' % pullop.cgresult)
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
29 > return pullop
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
30 >
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
31 > _orig_pull = exchange.pull
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
32 > exchange.pull = _pull
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
33 > exchange.getbundle2partsmapping[b'changegroup'] = _getbundlechangegrouppart
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
34 > EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
35
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
36 $ cat >> $HGRCPATH << EOF
45765
ed84a4d48910 config: add a new [command-templates] section for templates defined by hg
Martin von Zweigbergk <martinvonz@google.com>
parents: 42897
diff changeset
37 > [command-templates]
ed84a4d48910 config: add a new [command-templates] section for templates defined by hg
Martin von Zweigbergk <martinvonz@google.com>
parents: 42897
diff changeset
38 > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
39 > EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
40
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
41 Start with a simple repository with a single commit
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
42
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
43 $ hg init repo
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
44 $ cd repo
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
45 $ cat > .hg/hgrc << EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
46 > [extensions]
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
47 > bundle2=$TESTTMP/bundle2.py
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
48 > EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
49
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
50 $ echo A > A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
51 $ hg commit -A -m A -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
52 $ cd ..
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
53
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
54 Clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
55
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
56 $ hg clone -q repo clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
57
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
58 Add two linear commits
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
59
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
60 $ cd repo
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
61 $ echo B > B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
62 $ hg commit -A -m B -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
63 $ echo C > C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
64 $ hg commit -A -m C -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
65
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
66 $ cd ../clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
67 $ cat >> .hg/hgrc <<EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
68 > [hooks]
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
69 > pretxnchangegroup = sh -c "printenv.py --line pretxnchangegroup"
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
70 > changegroup = sh -c "printenv.py --line changegroup"
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
71 > incoming = sh -c "printenv.py --line incoming"
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
72 > EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
73
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
74 Pull the new commits in the clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
75
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
76 $ hg pull
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
77 pulling from $TESTTMP/repo
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
78 searching for changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
79 remote: changegroup1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
80 adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
81 adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
82 adding file changes
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
83 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
84 HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
85 HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
86 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
87 HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
88 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
89 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
90 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
91 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
92 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
93
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
94 remote: changegroup2
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
95 adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
96 adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
97 adding file changes
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
98 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
99 HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
100 HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
101 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
102 HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
103 HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
104 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
105 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
106 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
107 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
108 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
109
42897
d7304434390f changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41896
diff changeset
110 added 2 changesets with 2 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34101
diff changeset
111 new changesets 27547f69f254:f838bfaca5c7
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
112 changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
113 HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
114 HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
115 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
116 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
117 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
118 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
119 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
120 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
121
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
122 incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
123 HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
124 HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
125 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
126 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
127 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
128 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
129 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
130
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
131 changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
132 HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
133 HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
134 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
135 HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
136 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
137 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
138 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
139 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
140 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
141
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
142 incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
143 HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
144 HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
145 HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
146 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
147 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
148 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
149 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
150 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
151
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
152 pullop.cgresult is 1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
153 (run 'hg update' to get a working copy)
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
154 $ hg update
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
155 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
156 $ hg log -G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
157 @ 2:f838bfaca5c7 public test C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
158 |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
159 o 1:27547f69f254 public test B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
160 |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
161 o 0:4a2df7238c3b public test A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
162
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
163 Add more changesets with multiple heads to the original repository
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
164
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
165 $ cd ../repo
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
166 $ echo D > D
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
167 $ hg commit -A -m D -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
168 $ hg up -r 1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
169 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
170 $ echo E > E
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
171 $ hg commit -A -m E -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
172 $ echo F > F
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
173 $ hg commit -A -m F -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
174 $ hg up -r 1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
175 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
176 $ echo G > G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
177 $ hg commit -A -m G -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
178 $ hg up -r 3
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
179 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
180 $ echo H > H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
181 $ hg commit -A -m H -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
182 $ hg log -G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
183 @ 7:5cd59d311f65 draft test H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
184 |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
185 | o 6:1d14c3ce6ac0 draft test G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
186 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
187 | | o 5:7f219660301f draft test F
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
188 | | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
189 | | o 4:8a5212ebc852 draft test E
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
190 | |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
191 o | 3:b3325c91a4d9 draft test D
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
192 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
193 o | 2:f838bfaca5c7 draft test C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
194 |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
195 o 1:27547f69f254 draft test B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
196 |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
197 o 0:4a2df7238c3b draft test A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
198
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
199 New heads are reported during transfer and properly accounted for in
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
200 pullop.cgresult
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
201
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
202 $ cd ../clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
203 $ hg pull
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
204 pulling from $TESTTMP/repo
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
205 searching for changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
206 remote: changegroup1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
207 adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
208 adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
209 adding file changes
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
210 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
211 HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
212 HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
213 HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
214 HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
215 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
216 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
217 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
218 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
219 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
220
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
221 remote: changegroup2
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
222 adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
223 adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
224 adding file changes
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
225 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
226 HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
227 HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
228 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
229 HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
230 HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
231 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
232 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
233 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
234 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
235 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
236
42897
d7304434390f changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41896
diff changeset
237 added 5 changesets with 5 changes to 5 files (+2 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34101
diff changeset
238 new changesets b3325c91a4d9:5cd59d311f65
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
239 changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
240 HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
241 HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
242 HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
243 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
244 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
245 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
246 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
247 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
248
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
249 incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
250 HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
251 HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
252 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
253 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
254 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
255 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
256 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
257
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
258 incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
259 HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
260 HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
261 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
262 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
263 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
264 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
265 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
266
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
267 changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
268 HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
269 HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
270 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
271 HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
272 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
273 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
274 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
275 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
276 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
277
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
278 incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
279 HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
280 HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
281 HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
282 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
283 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
284 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
285 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
286 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
287
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
288 incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
289 HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
290 HG_NODE=1d14c3ce6ac0582d2809220d33e8cd7a696e0156
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
291 HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
292 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
293 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
294 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
295 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
296 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
297
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
298 incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
299 HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
300 HG_NODE=5cd59d311f6508b8e0ed28a266756c859419c9f1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
301 HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
302 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
303 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
304 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
305 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
306 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
307
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
308 pullop.cgresult is 3
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
309 (run 'hg heads' to see heads, 'hg merge' to merge)
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
310 $ hg log -G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
311 o 7:5cd59d311f65 public test H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
312 |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
313 | o 6:1d14c3ce6ac0 public test G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
314 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
315 | | o 5:7f219660301f public test F
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
316 | | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
317 | | o 4:8a5212ebc852 public test E
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
318 | |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
319 o | 3:b3325c91a4d9 public test D
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
320 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
321 @ | 2:f838bfaca5c7 public test C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
322 |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
323 o 1:27547f69f254 public test B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
324 |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
325 o 0:4a2df7238c3b public test A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
326
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
327 Removing a head from the original repository by merging it
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
328
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
329 $ cd ../repo
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
330 $ hg merge -r 6 -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
331 $ hg commit -m Merge
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
332 $ echo I > I
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
333 $ hg commit -A -m H -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
334 $ hg log -G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
335 @ 9:9d18e5bd9ab0 draft test H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
336 |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
337 o 8:71bd7b46de72 draft test Merge
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
338 |\
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
339 | o 7:5cd59d311f65 draft test H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
340 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
341 o | 6:1d14c3ce6ac0 draft test G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
342 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
343 | | o 5:7f219660301f draft test F
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
344 | | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
345 +---o 4:8a5212ebc852 draft test E
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
346 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
347 | o 3:b3325c91a4d9 draft test D
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
348 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
349 | o 2:f838bfaca5c7 draft test C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
350 |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
351 o 1:27547f69f254 draft test B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
352 |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
353 o 0:4a2df7238c3b draft test A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
354
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
355 Removed heads are reported during transfer and properly accounted for in
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
356 pullop.cgresult
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
357
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
358 $ cd ../clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
359 $ hg pull
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
360 pulling from $TESTTMP/repo
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
361 searching for changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
362 remote: changegroup1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
363 adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
364 adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
365 adding file changes
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
366 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
367 HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
368 HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
369 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
370 HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
371 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
372 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
373 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
374 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
375 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
376
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
377 remote: changegroup2
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
378 adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
379 adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
380 adding file changes
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
381 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
382 HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
383 HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
384 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
385 HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
386 HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
387 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
388 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
389 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
390 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
391 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
392
42897
d7304434390f changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41896
diff changeset
393 added 2 changesets with 1 changes to 1 files (-1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34101
diff changeset
394 new changesets 71bd7b46de72:9d18e5bd9ab0
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
395 changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
396 HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
397 HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
398 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
399 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
400 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
401 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
402 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
403 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
404
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
405 incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
406 HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
407 HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
408 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
409 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
410 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
411 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
412 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
413
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
414 changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
415 HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
416 HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
417 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
418 HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
419 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
420 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
421 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
422 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
423 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
424
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
425 incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
426 HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
427 HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
428 HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
429 HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
430 HG_TXNID=TXN:$ID$
41896
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
431 HG_TXNNAME=pull
94faa2e84094 transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41638
diff changeset
432 file:/*/$TESTTMP/repo (glob)
41638
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
433 HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
434
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
435 pullop.cgresult is -2
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
436 (run 'hg update' to get a working copy)
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
437 $ hg log -G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
438 o 9:9d18e5bd9ab0 public test H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
439 |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
440 o 8:71bd7b46de72 public test Merge
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
441 |\
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
442 | o 7:5cd59d311f65 public test H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
443 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
444 o | 6:1d14c3ce6ac0 public test G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
445 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
446 | | o 5:7f219660301f public test F
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
447 | | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
448 +---o 4:8a5212ebc852 public test E
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
449 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
450 | o 3:b3325c91a4d9 public test D
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
451 | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
452 | @ 2:f838bfaca5c7 public test C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
453 |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
454 o 1:27547f69f254 public test B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
455 |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
456 o 0:4a2df7238c3b public test A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
457
50347
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
458
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
459 Test that "split" from inline content works fine (cf issue6811)
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
460 ===============================================================
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
461
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
462 setup
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
463 -----
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
464
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
465 (create a compression free version where the split is easier to trigger)
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
466
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
467 $ cat >> $HGRCPATH << EOF
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
468 > [format]
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
469 > revlog-compression=none
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
470 > use-persistent-nodemap=no
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
471 > EOF
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
472
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
473 $ cd ..
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
474 $ hg clone --pull repo repo-test-split --quiet
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
475 pullop.cgresult is 2
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
476 $ cat > repo-test-split/.hg/hgrc << EOF
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
477 > [extensions]
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
478 > bundle2=$TESTTMP/bundle2.py
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
479 > EOF
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
480 $ hg clone --pull repo-test-split clone-test-split --quiet
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
481 pullop.cgresult is 2
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
482 $ cd repo-test-split
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
483 $ cat > .hg/hgrc << EOF
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
484 > [extensions]
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
485 > bundle2=$TESTTMP/bundle2.py
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
486 > EOF
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
487
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
488
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
489 IMPORTANT: must be a non-split revlog with only a .i
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
490 $ ls -1 .hg/store/00manifest.*
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
491 .hg/store/00manifest.i
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
492 $ ls -1 .hg/store/data/_a.*
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
493 .hg/store/data/_a.i
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
494
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
495 $ $TESTDIR/seq.py 100000 > A
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
496 $ mkdir foo
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
497 $ cd foo
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
498 $ touch `$TESTDIR/seq.py 10000`
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
499 $ cd ..
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
500 $ hg add -q foo
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
501 $ hg commit -m 'split the manifest and one filelog'
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
502
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
503
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
504 IMPORTANT: now the revlogs must be split
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
505 $ ls -1 .hg/store/00manifest.*
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
506 .hg/store/00manifest.d
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
507 .hg/store/00manifest.i
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
508 $ ls -1 .hg/store/data/_a.*
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
509 .hg/store/data/_a.d
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
510 .hg/store/data/_a.i
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
511
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
512 Add an extra commit on top of that
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
513
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
514 $ echo foo >> A
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
515 $ hg commit -m 'one extra commit'
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
516
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
517
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
518 Actual testing
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
519 --------------
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
520
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
521 $ cd ../clone-test-split
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
522
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
523 We now pull this in the clone the split should be in one changegroup, the update in another one
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
524
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
525 $ hg pull
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
526 pulling from $TESTTMP/repo-test-split
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
527 searching for changes
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
528 remote: changegroup1
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
529 adding changesets
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
530 adding manifests
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
531 adding file changes
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
532 remote: changegroup2
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
533 adding changesets
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
534 adding manifests
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
535 adding file changes
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
536 added 2 changesets with 10002 changes to 10002 files
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
537 new changesets 5e5bf9c91085:900b170f70d0
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
538 pullop.cgresult is 1
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
539 (run 'hg update' to get a working copy)
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
540
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
541 IMPORTANT: now the revlogs must be split
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
542 $ ls -1 .hg/store/00manifest.*
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
543 .hg/store/00manifest.d
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
544 .hg/store/00manifest.i
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
545 $ ls -1 .hg/store/data/_a.*
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
546 .hg/store/data/_a.d
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
547 .hg/store/data/_a.i
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
548
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
549 manifest should work
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
550
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
551 $ hg files -r tip | wc -l
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
552 \s*10007 (re)
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
553
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
554 file content should work
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
555
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
556 $ hg cat -r tip A | wc -l
2bb2a1ff4d8f revlog-split: also check a case where bundle contains multiple changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 45765
diff changeset
557 \s*100001 (re)