author | Pulkit Goyal <7895pulkit@gmail.com> |
Tue, 12 Jun 2018 03:29:13 +0530 | |
changeset 3841 | 82b79a8dafd9 |
parent 3566 | e6bea259c227 |
child 3591 | 98941c28f3e2 |
child 4093 | ef22eef37ecc |
permissions | -rw-r--r-- |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
1 |
============================================ |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
2 |
Testing obsolescence markers push: Cases C.2 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
3 |
============================================ |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
5 |
Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
6 |
all changesets that requested to be "in sync" after the push (even if they are |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
7 |
already on both side). |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
8 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
9 |
This test belongs to a series of tests checking such set is properly computed |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
10 |
and applied. This does not tests "obsmarkers" discovery capabilities. |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
11 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
12 |
Category C: advanced case |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
13 |
TestCase 2: Pruned changeset on precursors |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
14 |
Variants: |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
15 |
# a: explicite push |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
16 |
# b: bare push |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
17 |
|
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
18 |
C.2 Pruned changeset on precursors |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
19 |
================================== |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
20 |
|
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
21 |
.. {{{ |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
22 |
.. B ⊗ |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
23 |
.. | |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
24 |
.. A ø⇠◔ A' |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
25 |
.. |/ |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 |
.. ● O |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 |
.. }}} |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
28 |
.. |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
29 |
.. Marker exist from: |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
30 |
.. |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
31 |
.. * A' succeed to A |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
32 |
.. * B (prune) |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
33 |
.. |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 |
.. Command run: |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 |
.. |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 |
.. * hg push -r A' |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 |
.. * hg push |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 |
.. |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
39 |
.. Expected exchange: |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 |
.. |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 |
.. * `A ø⇠o A'` |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 |
.. * B (prune) |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
43 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
44 |
Setup |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
45 |
----- |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
46 |
|
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
47 |
$ . $TESTDIR/testlib/exchange-obsmarker-util.sh |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
48 |
|
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
49 |
Itinial |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
50 |
|
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
51 |
$ setuprepos C.2 |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 |
creating test repo for test case C.2 |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
53 |
- pulldest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
54 |
- main |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
55 |
- pushdest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
56 |
cd into `main` and proceed with env setup |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
57 |
$ cd main |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
58 |
$ mkcommit A0 |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
59 |
$ mkcommit B |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
60 |
$ hg prune -qd '0 0' . |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
61 |
$ hg update -q 0 |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
62 |
$ mkcommit A1 |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
63 |
created new head |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
64 |
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
2754
21f06d932231
test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2580
diff
changeset
|
65 |
obsoleted 1 changesets |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
66 |
$ hg log -G --hidden |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
67 |
@ e5ea8f9c7314 (draft): A1 |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
68 |
| |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
69 |
| x 06055a7959d4 (draft): B |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
70 |
| | |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
71 |
| x 28b51eb45704 (draft): A0 |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
72 |
|/ |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
73 |
o a9bdc8b26820 (public): O |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
74 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
75 |
$ inspect_obsmarkers |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
76 |
obsstore content |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
77 |
================ |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
78 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
79 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
80 |
obshashtree |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
81 |
=========== |
2083
778afb036245
discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1093
diff
changeset
|
82 |
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
83 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f cfacc7f87b22bba57fd24c3472f08d00c33ada5d |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
84 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a b5ae2ee85cbc1b157410b51cd9fe78fb5bb753cf |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
85 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 945a85093e28fbda8065db6933af09acd8d22524 |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
86 |
obshashrange |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
87 |
============ |
2228
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
88 |
rev node index size depth obshash |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
89 |
3 e5ea8f9c7314 0 2 2 945a85093e28 |
2228
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
90 |
0 a9bdc8b26820 0 1 1 000000000000 |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
91 |
3 e5ea8f9c7314 1 1 2 945a85093e28 |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
92 |
$ cd .. |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
93 |
$ cd .. |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
94 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
95 |
$ cp -R C.2 C.2.a |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
96 |
$ cp -R C.2 C.2.b |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
97 |
|
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
98 |
Actual Test (explicit push) |
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
99 |
--------------------------- |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
100 |
|
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
101 |
$ dotest C.2.a A1 |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
102 |
## Running testcase C.2.a |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
103 |
# testing echange of "A1" (e5ea8f9c7314) |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
104 |
## initial state |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
105 |
# obstore: main |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
106 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
107 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
108 |
# obstore: pushdest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
109 |
# obstore: pulldest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
110 |
## pushing "A1" from main to pushdest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
111 |
pushing to pushdest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
112 |
searching for changes |
1089
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
113 |
remote: adding changesets |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
114 |
remote: adding manifests |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
115 |
remote: adding file changes |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
116 |
remote: added 1 changesets with 1 changes to 1 files |
1093
a49f2e7a2755
obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1089
diff
changeset
|
117 |
remote: 2 new obsolescence markers |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
118 |
## post push state |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
119 |
# obstore: main |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
120 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
121 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
122 |
# obstore: pushdest |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
123 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
124 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
125 |
# obstore: pulldest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
126 |
## pulling "e5ea8f9c7314" from main into pulldest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
127 |
pulling from main |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
128 |
searching for changes |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
129 |
adding changesets |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
130 |
adding manifests |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
131 |
adding file changes |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
132 |
added 1 changesets with 1 changes to 1 files |
1093
a49f2e7a2755
obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1089
diff
changeset
|
133 |
2 new obsolescence markers |
3075
8feb2cae7eae
test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2754
diff
changeset
|
134 |
new changesets e5ea8f9c7314 |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
135 |
(run 'hg update' to get a working copy) |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
136 |
## post pull state |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
137 |
# obstore: main |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
138 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
139 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
140 |
# obstore: pushdest |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
141 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
142 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
143 |
# obstore: pulldest |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
144 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
145 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
146 |
|
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
147 |
Actual Test (bare push) |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
148 |
------------------------------------- |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
149 |
|
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
150 |
$ dotest C.2.b |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
151 |
## Running testcase C.2.b |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
152 |
## initial state |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
153 |
# obstore: main |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
154 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
155 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
156 |
# obstore: pushdest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
157 |
# obstore: pulldest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
158 |
## pushing from main to pushdest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
159 |
pushing to pushdest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
160 |
searching for changes |
1089
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
161 |
remote: adding changesets |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
162 |
remote: adding manifests |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
163 |
remote: adding file changes |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
164 |
remote: added 1 changesets with 1 changes to 1 files |
1093
a49f2e7a2755
obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1089
diff
changeset
|
165 |
remote: 2 new obsolescence markers |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
166 |
## post push state |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
167 |
# obstore: main |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
168 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
169 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
170 |
# obstore: pushdest |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
171 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
172 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
173 |
# obstore: pulldest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
174 |
## pulling from main into pulldest |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
175 |
pulling from main |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
176 |
searching for changes |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
177 |
adding changesets |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
178 |
adding manifests |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
179 |
adding file changes |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
180 |
added 1 changesets with 1 changes to 1 files |
1093
a49f2e7a2755
obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1089
diff
changeset
|
181 |
2 new obsolescence markers |
3075
8feb2cae7eae
test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2754
diff
changeset
|
182 |
new changesets e5ea8f9c7314 |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
183 |
(run 'hg update' to get a working copy) |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
184 |
## post pull state |
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
185 |
# obstore: main |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
186 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
187 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
188 |
# obstore: pushdest |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
189 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
190 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
845
7957eecd5592
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
191 |
# obstore: pulldest |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
192 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3075
diff
changeset
|
193 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |