Mercurial > hg
annotate tests/test-bundle2-multiple-changegroups.t @ 37048:fc5e261915b9
wireproto: require POST for all HTTPv2 requests
Wire protocol version 1 transfers argument data via request
headers by default. This has historically caused problems because
servers institute limits on the length of individual HTTP headers
as well as the total size of all request headers. Mercurial servers
can advertise the maximum length of an individual header. But
there's no guarantee any intermediate HTTP agents will accept
headers up to that length.
In the existing wire protocol, server operators typically also
key off the HTTP request method to implement authentication.
For example, GET requests translate to read-only requests and
can be allowed. But read-write commands must use POST and require
authentication. This has typically worked because the only wire
protocol commands that use POST modify the repo (e.g. the
"unbundle" command).
There is an experimental feature to enable clients to transmit
argument data via POST request bodies. This is technically a
better and more robust solution. But we can't enable it by default
because of servers assuming POST means write access.
In version 2 of the wire protocol, the permissions of a request
are encoded in the URL. And with it being a new protocol in a new
URL space, we're not constrained by backwards compatibility
requirements.
This commit adopts the technically superior mechanism of using
HTTP request bodies to send argument data by requiring POST for
all commands. Strictly speaking, it may be possible to send
request bodies on GET requests. But my experience is that not all
HTTP stacks support this. POST pretty much always works. Using POST
for read-only operations does sacrifice some RESTful design
purity. But this API cares about practicality, not about being
in Roy T. Fielding's REST ivory tower.
There's a chance we may relax this restriction in the future. But
for now, I want to see how far we can get with a POST only API.
Differential Revision: https://phab.mercurial-scm.org/D2837
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Tue, 13 Mar 2018 11:57:43 -0700 |
parents | 3e3f4c03876b |
children | e8a71ed9c373 |
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 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
37 > [ui] |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
38 > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
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] |
25478
d19787db6fe0
tests: simplify printenv calls
Matt Mackall <mpm@selenic.com>
parents:
24740
diff
changeset
|
69 > pretxnchangegroup = sh -c "printenv.py pretxnchangegroup" |
d19787db6fe0
tests: simplify printenv calls
Matt Mackall <mpm@selenic.com>
parents:
24740
diff
changeset
|
70 > changegroup = sh -c "printenv.py changegroup" |
d19787db6fe0
tests: simplify printenv calls
Matt Mackall <mpm@selenic.com>
parents:
24740
diff
changeset
|
71 > incoming = sh -c "printenv.py 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 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
83 added 1 changesets with 1 changes to 1 files |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
84 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
85 remote: changegroup2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
86 adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
87 adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
88 adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
89 added 1 changesets with 1 changes to 1 files |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
90 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34101
diff
changeset
|
91 new changesets 27547f69f254:f838bfaca5c7 |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
92 changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
93 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
94 changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
95 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
96 pullop.cgresult is 1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
97 (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
|
98 $ hg update |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
99 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
|
100 $ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
101 @ 2:f838bfaca5c7 public test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
102 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
103 o 1:27547f69f254 public test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
104 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
105 o 0:4a2df7238c3b public test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
106 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
107 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
|
108 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
109 $ cd ../repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
110 $ echo D > D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
111 $ hg commit -A -m D -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
112 $ hg up -r 1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
113 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
|
114 $ echo E > E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
115 $ hg commit -A -m E -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
116 $ echo F > F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
117 $ hg commit -A -m F -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
118 $ hg up -r 1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
119 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
|
120 $ echo G > G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
121 $ hg commit -A -m G -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
122 $ hg up -r 3 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
123 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
|
124 $ echo H > H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
125 $ hg commit -A -m H -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
126 $ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
127 @ 7:5cd59d311f65 draft test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
128 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
129 | o 6:1d14c3ce6ac0 draft test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
130 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
131 | | o 5:7f219660301f draft test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
132 | | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
133 | | o 4:8a5212ebc852 draft test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
134 | |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
135 o | 3:b3325c91a4d9 draft test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
136 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
137 o | 2:f838bfaca5c7 draft test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
138 |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
139 o 1:27547f69f254 draft test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
140 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
141 o 0:4a2df7238c3b draft test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
142 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
143 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
|
144 pullop.cgresult |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
145 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
146 $ cd ../clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
147 $ hg pull |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
148 pulling from $TESTTMP/repo |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
149 searching for changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
150 remote: changegroup1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
151 adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
152 adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
153 adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
154 added 2 changesets with 2 changes to 2 files (+1 heads) |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
155 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
156 remote: changegroup2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
157 adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
158 adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
159 adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
160 added 3 changesets with 3 changes to 3 files (+1 heads) |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
161 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34101
diff
changeset
|
162 new changesets b3325c91a4d9:5cd59d311f65 |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
163 changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
164 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
165 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
166 changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
167 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
168 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=1d14c3ce6ac0582d2809220d33e8cd7a696e0156 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
169 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
170 pullop.cgresult is 3 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
171 (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
|
172 $ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
173 o 7:5cd59d311f65 public test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
174 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
175 | o 6:1d14c3ce6ac0 public test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
176 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
177 | | o 5:7f219660301f public test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
178 | | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
179 | | o 4:8a5212ebc852 public test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
180 | |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
181 o | 3:b3325c91a4d9 public test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
182 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
183 @ | 2:f838bfaca5c7 public test C |
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 1:27547f69f254 public test B |
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 0:4a2df7238c3b public test A |
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 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
|
190 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
191 $ cd ../repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
192 $ hg merge -r 6 -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
193 $ hg commit -m Merge |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
194 $ echo I > I |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
195 $ hg commit -A -m H -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
196 $ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
197 @ 9:9d18e5bd9ab0 draft test H |
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 o 8:71bd7b46de72 draft test Merge |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
200 |\ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
201 | o 7:5cd59d311f65 draft test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
202 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
203 o | 6:1d14c3ce6ac0 draft test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
204 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
205 | | o 5:7f219660301f draft test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
206 | | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
207 +---o 4:8a5212ebc852 draft test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
208 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
209 | o 3:b3325c91a4d9 draft test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
210 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
211 | o 2:f838bfaca5c7 draft test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
212 |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
213 o 1:27547f69f254 draft test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
214 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
215 o 0:4a2df7238c3b draft test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
216 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
217 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
|
218 pullop.cgresult |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
219 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
220 $ cd ../clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
221 $ hg pull |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
222 pulling from $TESTTMP/repo |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
223 searching for changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
224 remote: changegroup1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
225 adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
226 adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
227 adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
228 added 1 changesets with 0 changes to 0 files (-1 heads) |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
229 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
230 remote: changegroup2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
231 adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
232 adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
233 adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
234 added 1 changesets with 1 changes to 1 files |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
235 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34101
diff
changeset
|
236 new changesets 71bd7b46de72:9d18e5bd9ab0 |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
237 changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
238 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
239 changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
240 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
241 pullop.cgresult is -2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
242 (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
|
243 $ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
244 o 9:9d18e5bd9ab0 public test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
245 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
246 o 8:71bd7b46de72 public test Merge |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
247 |\ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
248 | o 7:5cd59d311f65 public test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
249 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
250 o | 6:1d14c3ce6ac0 public test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
251 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
252 | | o 5:7f219660301f public test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
253 | | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
254 +---o 4:8a5212ebc852 public test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
255 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
256 | o 3:b3325c91a4d9 public test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
257 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
258 | @ 2:f838bfaca5c7 public test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
259 |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
260 o 1:27547f69f254 public test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
261 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
262 o 0:4a2df7238c3b public test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
263 |