Mercurial > hg
annotate tests/test-bundle2-remote-changegroup.t @ 48697:fba2d7fab11e
phabricator-refresh: add a magic value to skip it in the CI
When maintaining (light) fork, it is useful to be able to disable this.
Differential Revision: https://phab.mercurial-scm.org/D12133
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 03 Feb 2022 06:49:48 +0100 |
parents | 04688c51f81f |
children |
rev | line source |
---|---|
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
1 Create an extension to test bundle2 remote-changegroup parts |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
2 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
3 $ cat > bundle2.py << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
4 > """A small extension to test bundle2 remote-changegroup parts. |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
5 > |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
6 > Current bundle2 implementation doesn't provide a way to generate those |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
7 > parts, so they must be created by extensions. |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
8 > """ |
38700
cfdf7bfb0ac0
py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38699
diff
changeset
|
9 > from mercurial import ( |
cfdf7bfb0ac0
py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38699
diff
changeset
|
10 > bundle2, |
cfdf7bfb0ac0
py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38699
diff
changeset
|
11 > changegroup, |
cfdf7bfb0ac0
py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38699
diff
changeset
|
12 > discovery, |
cfdf7bfb0ac0
py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38699
diff
changeset
|
13 > exchange, |
cfdf7bfb0ac0
py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38699
diff
changeset
|
14 > pycompat, |
cfdf7bfb0ac0
py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38699
diff
changeset
|
15 > util, |
cfdf7bfb0ac0
py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38699
diff
changeset
|
16 > ) |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
17 > |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
18 > def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None, |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
19 > b2caps=None, heads=None, common=None, |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
20 > **kwargs): |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
21 > """this function replaces the changegroup part handler for getbundle. |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
22 > It allows to create a set of arbitrary parts containing changegroups |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
23 > and remote-changegroups, as described in a bundle2maker file in the |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
24 > repository .hg/ directory. |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
25 > |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
26 > Each line of that bundle2maker file contain a description of the |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
27 > part to add: |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
28 > - changegroup common_revset heads_revset |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
29 > Creates a changegroup part based, using common_revset and |
29807
d4e026341e16
getchangegroup: take an 'outgoing' object as argument (API)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29672
diff
changeset
|
30 > heads_revset for outgoing |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
31 > - remote-changegroup url file |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
32 > Creates a remote-changegroup part for a bundle at the given |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
33 > url. Size and digest, as required by the client, are computed |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
34 > from the given file. |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
35 > - raw-remote-changegroup <python expression> |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
36 > Creates a remote-changegroup part with the data given in the |
33261
be49f3fdcd10
tests: capitalize Python when it's not used as a command name
Augie Fackler <augie@google.com>
parents:
32940
diff
changeset
|
37 > Python expression as parameters. The Python expression is |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
38 > evaluated with eval, and is expected to be a dict. |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
39 > """ |
38699
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
40 > def newpart(name, data=b''): |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
41 > """wrapper around bundler.newpart adding an extra part making the |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
42 > client output information about each processed part""" |
38699
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
43 > bundler.newpart(b'output', data=name) |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
44 > part = bundler.newpart(name, data=data) |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
45 > return part |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
46 > |
38699
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
47 > for line in open(repo.vfs.join(b'bundle2maker'), 'rb'): |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
48 > line = line.strip() |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
49 > try: |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
50 > verb, args = line.split(None, 1) |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
51 > except ValueError: |
38699
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
52 > verb, args = line, b'' |
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
53 > if verb == b'remote-changegroup': |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
54 > url, file = args.split() |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
55 > bundledata = open(file, 'rb').read() |
38699
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
56 > digest = util.digester.preferred(b2caps[b'digests']) |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
57 > d = util.digester([digest], bundledata) |
38699
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
58 > part = newpart(b'remote-changegroup') |
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
59 > part.addparam(b'url', url) |
38700
cfdf7bfb0ac0
py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38699
diff
changeset
|
60 > part.addparam(b'size', b'%d' % len(bundledata)) |
38699
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
61 > part.addparam(b'digests', digest) |
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
62 > part.addparam(b'digest:%s' % digest, d[digest]) |
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
63 > elif verb == b'raw-remote-changegroup': |
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
64 > part = newpart(b'remote-changegroup') |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
65 > for k, v in eval(args).items(): |
38700
cfdf7bfb0ac0
py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38699
diff
changeset
|
66 > part.addparam(pycompat.sysbytes(k), pycompat.bytestr(v)) |
38699
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
67 > elif verb == b'changegroup': |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
68 > _common, heads = args.split() |
37310
5da299dabdc1
tests: avoid repo.lookup() for converting revnum to nodeid
Martin von Zweigbergk <martinvonz@google.com>
parents:
36217
diff
changeset
|
69 > common.extend(repo[r].node() for r in repo.revs(_common)) |
5da299dabdc1
tests: avoid repo.lookup() for converting revnum to nodeid
Martin von Zweigbergk <martinvonz@google.com>
parents:
36217
diff
changeset
|
70 > heads = [repo[r].node() for r in repo.revs(heads)] |
29807
d4e026341e16
getchangegroup: take an 'outgoing' object as argument (API)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29672
diff
changeset
|
71 > outgoing = discovery.outgoing(repo, common, heads) |
38699
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
72 > cg = changegroup.makechangegroup(repo, outgoing, b'01', |
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
73 > b'changegroup') |
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
74 > newpart(b'changegroup', cg.getchunks()) |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
75 > else: |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
76 > raise Exception('unknown verb') |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
77 > |
38699
72c086b1af12
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org>
parents:
38698
diff
changeset
|
78 > exchange.getbundle2partsmapping[b'changegroup'] = _getbundlechangegrouppart |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
79 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
80 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
81 Start a simple HTTP server to serve bundles |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
82 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39480
diff
changeset
|
83 $ "$PYTHON" "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
84 $ cat dumb.pid >> $DAEMON_PIDS |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
85 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
86 $ 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
|
87 > [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
|
88 > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
89 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
90 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
91 $ hg init repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
92 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
93 $ hg -R repo unbundle $TESTDIR/bundles/rebase.hg |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
94 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
95 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
96 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
97 added 8 changesets with 7 changes to 7 files (+2 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38700
diff
changeset
|
98 new changesets cd010b8cd998:02de42196ebe (8 drafts) |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
99 (run 'hg heads' to see heads, 'hg merge' to merge) |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
100 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
101 $ hg -R repo log -G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
102 o 7:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
103 | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
104 | o 6:eea13746799a draft Nicolas Dumazet <nicdumz.commits@gmail.com> G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
105 |/| |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
106 o | 5:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
107 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
108 | o 4:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
109 |/ |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
110 | o 3:32af7686d403 draft Nicolas Dumazet <nicdumz.commits@gmail.com> D |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
111 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
112 | o 2:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> C |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
113 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
114 | o 1:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> B |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
115 |/ |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
116 o 0:cd010b8cd998 draft Nicolas Dumazet <nicdumz.commits@gmail.com> A |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
117 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
118 $ hg clone repo orig |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
119 updating to branch default |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
120 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
121 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
122 $ cat > repo/.hg/hgrc << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
123 > [extensions] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
124 > bundle2=$TESTTMP/bundle2.py |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
125 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
126 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
127 Test a pull with an remote-changegroup |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
128 |
26773
ec7e0dbe56d5
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
129 $ hg bundle -R repo --type v1 --base '0:4' -r '5:7' bundle.hg |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
130 3 changesets found |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
131 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
132 > remote-changegroup http://localhost:$HGPORT/bundle.hg bundle.hg |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
133 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
134 $ hg clone orig clone -r 3 -r 4 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
135 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
136 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
137 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
138 added 5 changesets with 5 changes to 5 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
|
139 new changesets cd010b8cd998:9520eea781bc |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
140 updating to branch default |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
141 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
142 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
143 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
144 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
145 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
146 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
147 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
148 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
149 added 3 changesets with 2 changes to 2 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
|
150 new changesets 24b6387c8c8c:02de42196ebe |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
151 (run 'hg heads .' to see heads, 'hg merge' to merge) |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
152 $ hg -R clone log -G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
153 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
154 | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
155 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
156 |/| |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
157 o | 5:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
158 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
159 | o 4:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
160 |/ |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
161 | @ 3:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> D |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
162 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
163 | o 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
164 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
165 | o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
166 |/ |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
167 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
168 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
169 $ rm -rf clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
170 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
171 Test a pull with an remote-changegroup and a following changegroup |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
172 |
26773
ec7e0dbe56d5
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
173 $ hg bundle -R repo --type v1 --base 2 -r '3:4' bundle2.hg |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
174 2 changesets found |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
175 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
176 > remote-changegroup http://localhost:$HGPORT/bundle2.hg bundle2.hg |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
177 > changegroup 0:4 5:7 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
178 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
179 $ hg clone orig clone -r 2 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
180 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
181 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
182 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
183 added 3 changesets with 3 changes to 3 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
|
184 new changesets cd010b8cd998:5fddd98957c8 |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
185 updating to branch default |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
186 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
187 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
188 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
189 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
190 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
191 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
192 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
193 adding file changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
194 remote: changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
195 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
196 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
197 adding file changes |
42897
d7304434390f
changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39707
diff
changeset
|
198 added 5 changesets with 4 changes to 4 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
|
199 new changesets 32af7686d403:02de42196ebe |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
200 (run 'hg heads' to see heads, 'hg merge' to merge) |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
201 $ hg -R clone log -G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
202 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
203 | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
204 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
205 |/| |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
206 o | 5:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
207 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
208 | o 4:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
209 |/ |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
210 | o 3:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> D |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
211 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
212 | @ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
213 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
214 | o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
215 |/ |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
216 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
217 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
218 $ rm -rf clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
219 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
220 Test a pull with a changegroup followed by an remote-changegroup |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
221 |
26773
ec7e0dbe56d5
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
222 $ hg bundle -R repo --type v1 --base '0:4' -r '5:7' bundle3.hg |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
223 3 changesets found |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
224 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
225 > changegroup 000000000000 :4 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
226 > remote-changegroup http://localhost:$HGPORT/bundle3.hg bundle3.hg |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
227 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
228 $ hg clone orig clone -r 2 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
229 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
230 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
231 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
232 added 3 changesets with 3 changes to 3 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
|
233 new changesets cd010b8cd998:5fddd98957c8 |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
234 updating to branch default |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
235 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
236 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
237 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
238 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
239 remote: changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
240 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
241 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
242 adding file changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
243 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
244 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
245 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
246 adding file changes |
42897
d7304434390f
changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39707
diff
changeset
|
247 added 5 changesets with 4 changes to 4 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
|
248 new changesets 32af7686d403:02de42196ebe |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
249 (run 'hg heads' to see heads, 'hg merge' to merge) |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
250 $ hg -R clone log -G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
251 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
252 | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
253 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
254 |/| |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
255 o | 5:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
256 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
257 | o 4:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
258 |/ |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
259 | o 3:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> D |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
260 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
261 | @ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
262 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
263 | o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
264 |/ |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
265 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
266 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
267 $ rm -rf clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
268 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
269 Test a pull with two remote-changegroups and a changegroup |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
270 |
26773
ec7e0dbe56d5
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
271 $ hg bundle -R repo --type v1 --base 2 -r '3:4' bundle4.hg |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
272 2 changesets found |
26773
ec7e0dbe56d5
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
273 $ hg bundle -R repo --type v1 --base '3:4' -r '5:6' bundle5.hg |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
274 2 changesets found |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
275 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
276 > remote-changegroup http://localhost:$HGPORT/bundle4.hg bundle4.hg |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
277 > remote-changegroup http://localhost:$HGPORT/bundle5.hg bundle5.hg |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
278 > changegroup 0:6 7 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
279 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
280 $ hg clone orig clone -r 2 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
281 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
282 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
283 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
284 added 3 changesets with 3 changes to 3 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
|
285 new changesets cd010b8cd998:5fddd98957c8 |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
286 updating to branch default |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
287 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
288 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
289 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
290 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
291 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
292 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
293 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
294 adding file changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
295 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
296 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
297 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
298 adding file changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
299 remote: changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
300 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
301 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
302 adding file changes |
42897
d7304434390f
changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39707
diff
changeset
|
303 added 5 changesets with 4 changes to 4 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
|
304 new changesets 32af7686d403:02de42196ebe |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
305 (run 'hg heads' to see heads, 'hg merge' to merge) |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
306 $ hg -R clone log -G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
307 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
308 | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
309 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
310 |/| |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
311 o | 5:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
312 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
313 | o 4:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
314 |/ |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
315 | o 3:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> D |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
316 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
317 | @ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
318 | | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
319 | o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
320 |/ |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
321 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
322 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
323 $ rm -rf clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
324 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
325 Hash digest tests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
326 |
26773
ec7e0dbe56d5
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
327 $ hg bundle -R repo --type v1 -a bundle6.hg |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
328 8 changesets found |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
329 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
330 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
331 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'sha1', 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
332 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
333 $ hg clone ssh://user@dummy/repo clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
334 requesting all changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
335 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
336 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
337 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
338 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
339 added 8 changesets with 7 changes to 7 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
|
340 new changesets cd010b8cd998:02de42196ebe |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
341 updating to branch default |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
342 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
343 $ rm -rf clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
344 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
345 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
346 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394'} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
347 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
348 $ hg clone ssh://user@dummy/repo clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
349 requesting all changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
350 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
351 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
352 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
353 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
354 added 8 changesets with 7 changes to 7 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
|
355 new changesets cd010b8cd998:02de42196ebe |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
356 updating to branch default |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
357 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
358 $ rm -rf clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
359 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
360 Hash digest mismatch throws an error |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
361 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
362 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
363 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'sha1', 'digest:sha1': '0' * 40} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
364 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
365 $ hg clone ssh://user@dummy/repo clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
366 requesting all changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
367 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
368 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
369 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
370 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
371 transaction abort! |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
372 rollback completed |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
373 abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
374 sha1 mismatch: expected 0000000000000000000000000000000000000000, got 2c880cfec23cff7d8f80c2f12958d1563cbdaba6 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
375 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
376 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
377 Multiple hash digests can be given |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
378 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
379 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
380 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394', 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
381 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
382 $ hg clone ssh://user@dummy/repo clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
383 requesting all changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
384 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
385 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
386 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
387 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
388 added 8 changesets with 7 changes to 7 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
|
389 new changesets cd010b8cd998:02de42196ebe |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
390 updating to branch default |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
391 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
392 $ rm -rf clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
393 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
394 If either of the multiple hash digests mismatches, an error is thrown |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
395 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
396 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
397 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': '0' * 32, 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
398 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
399 $ hg clone ssh://user@dummy/repo clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
400 requesting all changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
401 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
402 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
403 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
404 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
405 transaction abort! |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
406 rollback completed |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
407 abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
408 md5 mismatch: expected 00000000000000000000000000000000, got e22172c2907ef88794b7bea6642c2394 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
409 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
410 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
411 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
412 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394', 'digest:sha1': '0' * 40} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
413 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
414 $ hg clone ssh://user@dummy/repo clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
415 requesting all changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
416 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
417 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
418 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
419 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
420 transaction abort! |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
421 rollback completed |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
422 abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
423 sha1 mismatch: expected 0000000000000000000000000000000000000000, got 2c880cfec23cff7d8f80c2f12958d1563cbdaba6 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
424 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
425 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
426 Corruption tests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
427 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
428 $ hg clone orig clone -r 2 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
429 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
430 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
431 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
432 added 3 changesets with 3 changes to 3 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
|
433 new changesets cd010b8cd998:5fddd98957c8 |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
434 updating to branch default |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
435 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
436 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
437 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
438 > remote-changegroup http://localhost:$HGPORT/bundle4.hg bundle4.hg |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
439 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle5.hg', 'size': 578, 'digests': 'sha1', 'digest:sha1': '0' * 40} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
440 > changegroup 0:6 7 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
441 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
442 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
443 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
444 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
445 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
446 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
447 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
448 adding file changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
449 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
450 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
451 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
452 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
453 transaction abort! |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
454 rollback completed |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
455 abort: bundle at http://localhost:$HGPORT/bundle5.hg is corrupted: |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
456 sha1 mismatch: expected 0000000000000000000000000000000000000000, got f29485d6bfd37db99983cfc95ecb52f8ca396106 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
457 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
458 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
459 The entire transaction has been rolled back in the pull above |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
460 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
461 $ hg -R clone log -G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
462 @ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
463 | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
464 o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
465 | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
466 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
467 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
468 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
469 No params |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
470 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
471 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
472 > raw-remote-changegroup {} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
473 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
474 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
475 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
476 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
477 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
478 abort: remote-changegroup: missing "url" param |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
479 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
480 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
481 Missing size |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
482 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
483 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
484 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg'} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
485 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
486 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
487 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
488 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
489 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
490 abort: remote-changegroup: missing "size" param |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
491 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
492 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
493 Invalid size |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
494 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
495 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
496 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 'foo'} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
497 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
498 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
499 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
500 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
501 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
502 abort: remote-changegroup: invalid value for param "size" |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
503 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
504 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
505 Size mismatch |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
506 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
507 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
508 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 42} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
509 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
510 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
511 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
512 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
513 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
514 adding changesets |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
515 adding manifests |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
516 adding file changes |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
517 transaction abort! |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
518 rollback completed |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
519 abort: bundle at http://localhost:$HGPORT/bundle4.hg is corrupted: |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
520 size mismatch: expected 42, got 581 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
521 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
522 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
523 Unknown digest |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
524 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
525 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
526 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 581, 'digests': 'foo', 'digest:foo': 'bar'} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
527 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
528 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
529 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
530 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
531 remote: remote-changegroup |
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
532 abort: missing support for remote-changegroup - digest:foo |
46977
3f87d2af0bd6
errors: raise RemoteError in some places in exchange.py
Martin von Zweigbergk <martinvonz@google.com>
parents:
45765
diff
changeset
|
533 [100] |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
534 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
535 Missing digest |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
536 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
537 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
538 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 581, 'digests': 'sha1'} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
539 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
540 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
541 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
542 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
543 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
544 abort: remote-changegroup: missing "digest:sha1" param |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
545 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
546 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
547 Not an HTTP url |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
548 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
549 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
550 > raw-remote-changegroup {'url': 'ssh://localhost:$HGPORT/bundle4.hg', 'size': 581} |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
551 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
552 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
553 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
554 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
555 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
556 abort: remote-changegroup does not support ssh urls |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
557 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
558 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
559 Not a bundle |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
560 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
561 $ cat > notbundle.hg << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
562 > foo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
563 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
564 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
565 > remote-changegroup http://localhost:$HGPORT/notbundle.hg notbundle.hg |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
566 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
567 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
568 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
569 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
570 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
571 abort: http://localhost:$HGPORT/notbundle.hg: not a Mercurial bundle |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
572 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
573 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
574 Not a bundle 1.0 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
575 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
576 $ cat > notbundle10.hg << EOF |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
577 > HG20 |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
578 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
579 $ cat > repo/.hg/bundle2maker << EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
580 > remote-changegroup http://localhost:$HGPORT/notbundle10.hg notbundle10.hg |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
581 > EOF |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
582 $ hg pull -R clone ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
583 pulling from ssh://user@dummy/repo |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
584 searching for changes |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
585 remote: remote-changegroup |
23029
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
586 abort: http://localhost:$HGPORT/notbundle10.hg: not a bundle version 1.0 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
587 [255] |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
588 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
589 $ hg -R clone log -G |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
590 @ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
591 | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
592 o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
593 | |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
594 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
595 |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
596 $ rm -rf clone |
149fc8a44184
bundle2: client side support for a part to import external bundles
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
597 |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
598 $ killdaemons.py |