Mercurial > hg
annotate tests/test-patchbomb-bookmark.t @ 40393:229d23cdb203
exchangev2: support fetching shallow files history
This commit teaches the exchangev2 client code to handle fetching shallow
files data.
Only shallow fetching of files data is supported: shallow fetching of
changeset and manifest data is explicitly not yet supported.
Previously, we would fetch file revisions for changesets that were received
by the current pull operation. In the new model, we calculate the set of
"relevant" changesets given the pull depth and only fetch files data for
those changesets.
We also teach the "filesdata" command invocation to vary parameters as needed.
The implementation here is far from complete or optimal. Subsequent pulls will
end up re-fetching a lot of files data. But the application of this data should
mostly be a no-op on the client, so it isn't a big deal.
Depending on the order file revisions are fetched in, revisions could get
inserted with the wrong revision number relationships. I think the best way
to deal with this is to remove revision numbers from storage and to either
dynamically derive them (by reconstructing a DAG from nodes/parents) or remove
revision numbers from the file storage interface completely.
A missing API that we'll likely want to write pretty soon is "ensure files
for revision(s) are present." We can kind of cajole exchangev2.pull() to do
this. But it isn't very efficient. For example, in simple cases like
widening the store to obtain data for a single revision, it is probably
more efficient to walk the manifest and find exactly which file revisions
are missing and to make explicit requests for just their data. In more
advanced cases, asking the server for all files data may be more efficient,
even though it requires sending data the client already has. There is tons
of room for future experimentation here. And TBH I'm not sure what the
final state will be.
Anyway, this commit gets us pretty close to being able to have shallow
and narrow checkouts with exchangev2/sqlite storage. Close enough that a
minimal extension should be able to provide fill in the gaps until the code
in core stabilizes and there is a user-facing way to trigger the
narrow/shallow bits from `hg clone` without also implying using of the
narrow extension...
Differential Revision: https://phab.mercurial-scm.org/D5169
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 19 Oct 2018 12:30:49 +0200 |
parents | d7007b807fa2 |
children |
rev | line source |
---|---|
32639
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
1 Create @ bookmark as main reference |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
2 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
3 $ hg init repo |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
4 $ cd repo |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
5 $ echo "[extensions]" >> $HGRCPATH |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
6 $ echo "patchbomb=" >> $HGRCPATH |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
7 $ hg book @ |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
8 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
9 Create a dummy revision that must never be exported |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
10 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
11 $ echo no > no |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
12 $ hg ci -Amno -d '6 0' |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
13 adding no |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
14 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
15 Create a feature and use -B |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
16 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
17 $ hg book booktest |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
18 $ echo first > a |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
19 $ hg ci -Amfirst -d '7 0' |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
20 adding a |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
21 $ echo second > b |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
22 $ hg ci -Amsecond -d '8 0' |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
23 adding b |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
24 $ hg email --date '1981-1-1 0:1' -n -t foo -s bookmark -B booktest |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
25 From [test]: test |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
26 this patch series consists of 2 patches. |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
27 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
28 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
29 Write the introductory message for the patch series. |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
30 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
31 Cc: |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
32 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
33 displaying [PATCH 0 of 2] bookmark ... |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
32639
diff
changeset
|
34 MIME-Version: 1.0 |
32639
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
35 Content-Type: text/plain; charset="us-ascii" |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
36 Content-Transfer-Encoding: 7bit |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
37 Subject: [PATCH 0 of 2] bookmark |
39120
d7007b807fa2
tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents:
34310
diff
changeset
|
38 Message-Id: <patchbomb.347155260@test-hostname> |
32639
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
39 User-Agent: Mercurial-patchbomb/* (glob) |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
40 Date: Thu, 01 Jan 1981 00:01:00 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
41 From: test |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
42 To: foo |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
43 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
44 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
45 displaying [PATCH 1 of 2] first ... |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
32639
diff
changeset
|
46 MIME-Version: 1.0 |
32639
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
47 Content-Type: text/plain; charset="us-ascii" |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
48 Content-Transfer-Encoding: 7bit |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
49 Subject: [PATCH 1 of 2] first |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
50 X-Mercurial-Node: accde9b8b6dce861c185d0825c1affc09a79cb26 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
51 X-Mercurial-Series-Index: 1 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
52 X-Mercurial-Series-Total: 2 |
39120
d7007b807fa2
tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents:
34310
diff
changeset
|
53 Message-Id: <accde9b8b6dce861c185.347155261@test-hostname> |
d7007b807fa2
tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents:
34310
diff
changeset
|
54 X-Mercurial-Series-Id: <accde9b8b6dce861c185.347155261@test-hostname> |
d7007b807fa2
tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents:
34310
diff
changeset
|
55 In-Reply-To: <patchbomb.347155260@test-hostname> |
d7007b807fa2
tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents:
34310
diff
changeset
|
56 References: <patchbomb.347155260@test-hostname> |
32639
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
57 User-Agent: Mercurial-patchbomb/* (glob) |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
58 Date: Thu, 01 Jan 1981 00:01:01 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
59 From: test |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
60 To: foo |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
61 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
62 # HG changeset patch |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
63 # User test |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
64 # Date 7 0 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
65 # Thu Jan 01 00:00:07 1970 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
66 # Node ID accde9b8b6dce861c185d0825c1affc09a79cb26 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
67 # Parent 043bd3889e5aaf7d88fe3713cf425f782ad2fb71 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
68 first |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
69 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
70 diff -r 043bd3889e5a -r accde9b8b6dc a |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
71 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
72 +++ b/a Thu Jan 01 00:00:07 1970 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
73 @@ -0,0 +1,1 @@ |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
74 +first |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
75 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
76 displaying [PATCH 2 of 2] second ... |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
32639
diff
changeset
|
77 MIME-Version: 1.0 |
32639
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
78 Content-Type: text/plain; charset="us-ascii" |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
79 Content-Transfer-Encoding: 7bit |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
80 Subject: [PATCH 2 of 2] second |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
81 X-Mercurial-Node: 417defd1559c396ba06a44dce8dc1c2d2d653f3f |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
82 X-Mercurial-Series-Index: 2 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
83 X-Mercurial-Series-Total: 2 |
39120
d7007b807fa2
tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents:
34310
diff
changeset
|
84 Message-Id: <417defd1559c396ba06a.347155262@test-hostname> |
d7007b807fa2
tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents:
34310
diff
changeset
|
85 X-Mercurial-Series-Id: <accde9b8b6dce861c185.347155261@test-hostname> |
d7007b807fa2
tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents:
34310
diff
changeset
|
86 In-Reply-To: <patchbomb.347155260@test-hostname> |
d7007b807fa2
tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents:
34310
diff
changeset
|
87 References: <patchbomb.347155260@test-hostname> |
32639
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
88 User-Agent: Mercurial-patchbomb/* (glob) |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
89 Date: Thu, 01 Jan 1981 00:01:02 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
90 From: test |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
91 To: foo |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
92 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
93 # HG changeset patch |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
94 # User test |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
95 # Date 8 0 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
96 # Thu Jan 01 00:00:08 1970 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
97 # Node ID 417defd1559c396ba06a44dce8dc1c2d2d653f3f |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
98 # Parent accde9b8b6dce861c185d0825c1affc09a79cb26 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
99 second |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
100 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
101 diff -r accde9b8b6dc -r 417defd1559c b |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
102 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
103 +++ b/b Thu Jan 01 00:00:08 1970 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
104 @@ -0,0 +1,1 @@ |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
105 +second |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
106 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
107 Do the same and combine with -o only one must be exported |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
108 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
109 $ cd .. |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
110 $ hg clone repo repo2 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
111 updating to bookmark @ |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
112 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
113 $ cd repo |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
114 $ hg up @ |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
115 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
116 (activating bookmark @) |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
117 $ hg book outgoing |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
118 $ echo 1 > x |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
119 $ hg ci -Am1 -d '8 0' |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
120 adding x |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
121 created new head |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
122 $ hg push ../repo2 -B outgoing |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
123 pushing to ../repo2 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
124 searching for changes |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
125 adding changesets |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
126 adding manifests |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
127 adding file changes |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
128 added 1 changesets with 1 changes to 1 files (+1 heads) |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
129 exporting bookmark outgoing |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
130 $ echo 2 > y |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
131 $ hg ci -Am2 -d '9 0' |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
132 adding y |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
133 $ hg email --date '1982-1-1 0:1' -n -t foo -s bookmark -B outgoing -o ../repo2 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
134 comparing with ../repo2 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
135 From [test]: test |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
136 this patch series consists of 1 patches. |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
137 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
138 Cc: |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
139 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
140 displaying [PATCH] bookmark ... |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
32639
diff
changeset
|
141 MIME-Version: 1.0 |
32639
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
142 Content-Type: text/plain; charset="us-ascii" |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
143 Content-Transfer-Encoding: 7bit |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
144 Subject: [PATCH] bookmark |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
145 X-Mercurial-Node: 8dab2639fd35f1e337ad866c372a5c44f1064e3c |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
146 X-Mercurial-Series-Index: 1 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
147 X-Mercurial-Series-Total: 1 |
39120
d7007b807fa2
tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents:
34310
diff
changeset
|
148 Message-Id: <8dab2639fd35f1e337ad.378691260@test-hostname> |
d7007b807fa2
tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents:
34310
diff
changeset
|
149 X-Mercurial-Series-Id: <8dab2639fd35f1e337ad.378691260@test-hostname> |
32639
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
150 User-Agent: Mercurial-patchbomb/* (glob) |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
151 Date: Fri, 01 Jan 1982 00:01:00 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
152 From: test |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
153 To: foo |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
154 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
155 # HG changeset patch |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
156 # User test |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
157 # Date 9 0 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
158 # Thu Jan 01 00:00:09 1970 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
159 # Node ID 8dab2639fd35f1e337ad866c372a5c44f1064e3c |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
160 # Parent 0b24b8316483bf30bfc3e4d4168e922b169dbe66 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
161 2 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
162 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
163 diff -r 0b24b8316483 -r 8dab2639fd35 y |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
164 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
165 +++ b/y Thu Jan 01 00:00:09 1970 +0000 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
166 @@ -0,0 +1,1 @@ |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
167 +2 |
c2fe2b00db53
patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
168 |