Mercurial > hg
annotate tests/test-obsolete-changeset-exchange.t @ 50995:80c243eab724
openvms: duck-punch a bugfix into `environb` object
The official Python3 build for OpenVMS has some crippling bug that we need to
patch dynamically
OpenVMS patches
author | Jean-Francois Pieronne <jf.pieronne@laposte.net> |
---|---|
date | Thu, 03 Aug 2023 02:28:52 +0200 |
parents | 2cf264e9aa75 |
children |
rev | line source |
---|---|
17248
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
1 Test changesets filtering during exchanges (some tests are still in |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
2 test-obsolete.t) |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
3 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
18499
diff
changeset
|
4 $ cat >> $HGRCPATH << EOF |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
18499
diff
changeset
|
5 > [experimental] |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
6 > evolution.createmarkers=True |
17296
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17248
diff
changeset
|
7 > EOF |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17248
diff
changeset
|
8 |
17327
7f5094bb3f42
test: fix typo in test comment
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17296
diff
changeset
|
9 Push does not corrupt remote |
7f5094bb3f42
test: fix typo in test comment
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17296
diff
changeset
|
10 ---------------------------- |
17248
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
11 |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
12 Create a DAG where a changeset reuses a revision from a file first used in an |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
13 extinct changeset. |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
14 |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
15 $ hg init local |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
16 $ cd local |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
17 $ echo 'base' > base |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
18 $ hg commit -Am base |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
19 adding base |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
20 $ echo 'A' > A |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
21 $ hg commit -Am A |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
22 adding A |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
23 $ hg up 0 |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
24 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
25 $ hg revert -ar 1 |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
26 adding A |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
27 $ hg commit -Am "A'" |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
28 created new head |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
29 $ hg log -G --template='{desc} {node}' |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
30 @ A' f89bcc95eba5174b1ccc3e33a82e84c96e8338ee |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
31 | |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
32 | o A 9d73aac1b2ed7d53835eaeec212ed41ea47da53a |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
33 |/ |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
34 o base d20a80d4def38df63a4b330b7fb688f3d4cae1e3 |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
35 |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
36 $ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
37 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
32712
diff
changeset
|
38 obsoleted 1 changesets |
17248
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
39 |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
40 Push it. The bundle should not refer to the extinct changeset. |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
41 |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
42 $ hg init ../other |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
43 $ hg push ../other |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
44 pushing to ../other |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
45 searching for changes |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
46 adding changesets |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
47 adding manifests |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
48 adding file changes |
6ffb35b2284c
discovery: add extinct changesets to outgoing.excluded
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
49 added 2 changesets with 2 changes to 2 files |
49825
2f2682f40ea0
tests: use the `--quiet` flag for verify when applicable
Raphaël Gomès <rgomes@octobus.net>
parents:
46633
diff
changeset
|
50 $ hg -R ../other verify -q |
18498
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
51 |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
52 Adding a changeset going extinct locally |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
53 ------------------------------------------ |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
54 |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
55 Pull a changeset that will immediatly goes extinct (because you already have a |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
56 marker to obsolete him) |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
57 (test resolution of issue3788) |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
58 |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
59 $ hg phase --draft --force f89bcc95eba5 |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
60 $ hg phase -R ../other --draft --force f89bcc95eba5 |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
61 $ hg commit --amend -m "A''" |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
62 $ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5 |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
63 $ hg pull ../other |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
64 pulling from ../other |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
65 searching for changes |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
66 adding changesets |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
67 adding manifests |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
68 adding file changes |
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
69 added 1 changesets with 0 changes to 1 files (+1 heads) |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
70 1 new phase-divergent changesets |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34322
diff
changeset
|
71 new changesets f89bcc95eba5 |
18498
4d9f7dd2ac82
pull: fix crash when pulling changeset that get hidden locally (issue3788)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17327
diff
changeset
|
72 (run 'hg heads' to see heads, 'hg merge' to merge) |
18499
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
73 |
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
74 check that bundle is not affected |
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
75 |
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
76 $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5.hg |
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
77 1 changesets found |
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
78 $ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5 |
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
79 $ hg unbundle ../f89bcc95eba5.hg |
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
80 adding changesets |
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
81 adding manifests |
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
82 adding file changes |
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
83 added 1 changesets with 0 changes to 1 files (+1 heads) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
84 (1 other changesets obsolete on arrival) |
18499
d07834e52b4e
test-obsolete: validate that bundle is not affected by issue3788
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18498
diff
changeset
|
85 (run 'hg heads' to see heads) |
32516
37d70ba1d9d1
bundle: add an experimental knob to include obsmarkers in bundle
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32267
diff
changeset
|
86 |
37d70ba1d9d1
bundle: add an experimental knob to include obsmarkers in bundle
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32267
diff
changeset
|
87 check-that bundle can contain markers: |
37d70ba1d9d1
bundle: add an experimental knob to include obsmarkers in bundle
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32267
diff
changeset
|
88 |
34869
196548113ddd
config: rename stabilization.bundle-obsmarker
Boris Feld <boris.feld@octobus.net>
parents:
34866
diff
changeset
|
89 $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5-obs.hg --config experimental.evolution.bundle-obsmarker=1 |
32516
37d70ba1d9d1
bundle: add an experimental knob to include obsmarkers in bundle
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32267
diff
changeset
|
90 1 changesets found |
37d70ba1d9d1
bundle: add an experimental knob to include obsmarkers in bundle
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32267
diff
changeset
|
91 $ hg debugbundle ../f89bcc95eba5.hg |
34025
626a28f30dbd
debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents:
33773
diff
changeset
|
92 Stream params: {Compression: BZ} |
37841
d618558e4e8b
debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents:
36968
diff
changeset
|
93 changegroup -- {nbchanges: 1, version: 02} (mandatory: True) |
32516
37d70ba1d9d1
bundle: add an experimental knob to include obsmarkers in bundle
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32267
diff
changeset
|
94 f89bcc95eba5174b1ccc3e33a82e84c96e8338ee |
37842
326b174c6a47
bundle2: mark the bundle2 part as advisory (issue5872)
Boris Feld <boris.feld@octobus.net>
parents:
37841
diff
changeset
|
95 cache:rev-branch-cache -- {} (mandatory: False) |
32516
37d70ba1d9d1
bundle: add an experimental knob to include obsmarkers in bundle
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32267
diff
changeset
|
96 $ hg debugbundle ../f89bcc95eba5-obs.hg |
34025
626a28f30dbd
debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents:
33773
diff
changeset
|
97 Stream params: {Compression: BZ} |
37841
d618558e4e8b
debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents:
36968
diff
changeset
|
98 changegroup -- {nbchanges: 1, version: 02} (mandatory: True) |
32516
37d70ba1d9d1
bundle: add an experimental knob to include obsmarkers in bundle
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32267
diff
changeset
|
99 f89bcc95eba5174b1ccc3e33a82e84c96e8338ee |
37842
326b174c6a47
bundle2: mark the bundle2 part as advisory (issue5872)
Boris Feld <boris.feld@octobus.net>
parents:
37841
diff
changeset
|
100 cache:rev-branch-cache -- {} (mandatory: False) |
37841
d618558e4e8b
debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents:
36968
diff
changeset
|
101 obsmarkers -- {} (mandatory: True) |
32517
b62b2b373bce
debugbundle: display the content of obsmarkers parts
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32516
diff
changeset
|
102 version: 1 (70 bytes) |
b62b2b373bce
debugbundle: display the content of obsmarkers parts
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32516
diff
changeset
|
103 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32516
37d70ba1d9d1
bundle: add an experimental knob to include obsmarkers in bundle
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32267
diff
changeset
|
104 |
27227
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
105 $ cd .. |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
106 |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
107 pull does not fetch excessive changesets when common node is hidden (issue4982) |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
108 ------------------------------------------------------------------------------- |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
109 |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
110 initial repo with server and client matching |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
111 |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
112 $ hg init pull-hidden-common |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
113 $ cd pull-hidden-common |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
114 $ touch foo |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
115 $ hg -q commit -A -m initial |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
116 $ echo 1 > foo |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
117 $ hg commit -m 1 |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
118 $ echo 2a > foo |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
119 $ hg commit -m 2a |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
120 $ cd .. |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
121 $ hg clone --pull pull-hidden-common pull-hidden-common-client |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
122 requesting all changes |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
123 adding changesets |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
124 adding manifests |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
125 adding file changes |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
126 added 3 changesets with 3 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34322
diff
changeset
|
127 new changesets 96ee1d7354c4:6a29ed9c68de |
27227
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
128 updating to branch default |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
129 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
130 |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
131 server obsoletes the old head |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
132 |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
133 $ cd pull-hidden-common |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
134 $ hg -q up -r 1 |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
135 $ echo 2b > foo |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
136 $ hg -q commit -m 2b |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
137 $ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129 |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
138 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
32712
diff
changeset
|
139 obsoleted 1 changesets |
27227
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
140 $ cd .. |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
141 |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
142 client only pulls down 1 changeset |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
143 |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
144 $ cd pull-hidden-common-client |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
145 $ hg pull --debug |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
146 pulling from $TESTTMP/pull-hidden-common |
27227
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
147 query 1; heads |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
148 searching for changes |
27319
b64b6fdc5c9b
discovery: properly filter changeset in 'peer.known' (issue4982)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27227
diff
changeset
|
149 taking quick initial sample |
b64b6fdc5c9b
discovery: properly filter changeset in 'peer.known' (issue4982)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27227
diff
changeset
|
150 query 2; still undecided: 2, sample size is: 2 |
32712
43bda143e3b2
discovery: include timing in the debug output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32517
diff
changeset
|
151 2 total queries in *.????s (glob) |
27319
b64b6fdc5c9b
discovery: properly filter changeset in 'peer.known' (issue4982)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27227
diff
changeset
|
152 1 changesets found |
27227
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
153 list of changesets: |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
154 bec0734cd68e84477ba7fc1d13e6cff53ab70129 |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
155 listing keys for "bookmarks" |
46633
7015b0232c5e
exchange: stop advertising rev-branch-cache bundle capability
Joerg Sonnenberger <joerg@bec.de>
parents:
42931
diff
changeset
|
156 bundle2-output-bundle: "HG20", 3 parts total |
27227
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
157 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
158 bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload |
34322
10e162bb9bf5
pull: use 'phase-heads' to retrieve phase information
Boris Feld <boris.feld@octobus.net>
parents:
34025
diff
changeset
|
159 bundle2-output-part: "phase-heads" 24 bytes payload |
27227
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
160 bundle2-input-bundle: with-transaction |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
161 bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
162 adding changesets |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
163 add changeset bec0734cd68e |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
164 adding manifests |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
165 adding file changes |
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
166 adding foo revisions |
50381
2cf264e9aa75
configitems: enable changegroup3 by default (unless using infinitepush)
Matt Harbison <matt_harbison@yahoo.com>
parents:
49825
diff
changeset
|
167 bundle2-input-part: total payload size 486 |
27227
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
168 bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
34322
10e162bb9bf5
pull: use 'phase-heads' to retrieve phase information
Boris Feld <boris.feld@octobus.net>
parents:
34025
diff
changeset
|
169 bundle2-input-part: "phase-heads" supported |
10e162bb9bf5
pull: use 'phase-heads' to retrieve phase information
Boris Feld <boris.feld@octobus.net>
parents:
34025
diff
changeset
|
170 bundle2-input-part: total payload size 24 |
46633
7015b0232c5e
exchange: stop advertising rev-branch-cache bundle capability
Joerg Sonnenberger <joerg@bec.de>
parents:
42931
diff
changeset
|
171 bundle2-input-bundle: 3 parts total |
27227
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
172 checking for updated bookmarks |
35749
3a3b59bbe7ce
localrepo: run cache-warming transaction callback before report callback
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
173 updating the branch cache |
42897
d7304434390f
changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42893
diff
changeset
|
174 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34322
diff
changeset
|
175 new changesets bec0734cd68e |
27227
f20533623833
tests: test changegroup generation for filtered changesets (issue4982)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
176 (run 'hg heads' to see heads, 'hg merge' to merge) |