Mercurial > hg-stable
annotate tests/test-clone.t @ 47908:b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
We used to raise an abort in this case, but recent changes to local clone
command (377d8fc20e34) resulted in destrepo both caring about
experimental.evolution config options and not initializing extensions.
So imagine if you had evolve and allowdivergence enabled in your ~/.hgrc. Local
clone stopped working after 377d8fc20e34 because evolve sets
experimental.evolution=all, but only on srcrepo, for destrepo the extension is
not initialized. It's possible to make local cloning work by initializing
extensions for destrepo in some cases, but in other cases (e.g. allowdivergence
in ~/.hgrc, evolve extension in original-repo/.hg/hgrc) it would still fail.
In a discussion with Pierre-Yves David it was decided to simply force other
evolution options to be false if createmarkers is not enabled.
Differential Revision: https://phab.mercurial-scm.org/D11223
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 28 Jul 2021 13:45:07 +0300 |
parents | 377d8fc20e34 |
children | 9c4204b7f3e4 |
rev | line source |
---|---|
36255
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36049
diff
changeset
|
1 #testcases sshv1 sshv2 |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36049
diff
changeset
|
2 |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36049
diff
changeset
|
3 #if sshv2 |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36049
diff
changeset
|
4 $ cat >> $HGRCPATH << EOF |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36049
diff
changeset
|
5 > [experimental] |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36049
diff
changeset
|
6 > sshpeer.advertise-v2 = true |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36049
diff
changeset
|
7 > sshserver.support-v2 = true |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36049
diff
changeset
|
8 > EOF |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36049
diff
changeset
|
9 #endif |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36049
diff
changeset
|
10 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
11 Prepare repo a: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
12 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
13058
diff
changeset
|
13 $ hg init a |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
14 $ cd a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
15 $ echo a > a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
16 $ hg add a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
17 $ hg commit -m test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
18 $ echo first line > b |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
19 $ hg add b |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
20 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
21 Create a non-inlined filelog: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
22 |
39723
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39506
diff
changeset
|
23 $ "$PYTHON" -c 'open("data1", "wb").write(b"".join(b"%d\n" % x for x in range(10000)))' |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
24 $ for j in 0 1 2 3 4 5 6 7 8 9; do |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
25 > cat data1 >> b |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
26 > hg commit -m test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
27 > done |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
28 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
29 List files in store/data (should show a 'b.d'): |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
30 |
37338
cbc4425e81b5
tests: conditionalize tests based on presence of revlogs for files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36255
diff
changeset
|
31 #if reporevlogstore |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
32 $ for i in .hg/store/data/*; do |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
33 > echo $i |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
34 > done |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
35 .hg/store/data/a.i |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
36 .hg/store/data/b.d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
37 .hg/store/data/b.i |
37338
cbc4425e81b5
tests: conditionalize tests based on presence of revlogs for files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36255
diff
changeset
|
38 #endif |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
39 |
22264
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
40 Trigger branchcache creation: |
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
41 |
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
42 $ hg branches |
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
43 default 10:a7949464abda |
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
44 $ ls .hg/cache |
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
45 branch2-served |
23786
7d63398fbfd1
branchmap: use revbranchcache when updating branch map
Mads Kiilerich <madski@unity3d.com>
parents:
23096
diff
changeset
|
46 rbc-names-v1 |
7d63398fbfd1
branchmap: use revbranchcache when updating branch map
Mads Kiilerich <madski@unity3d.com>
parents:
23096
diff
changeset
|
47 rbc-revs-v1 |
22264
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
48 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
49 Default operation: |
550 | 50 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
51 $ hg clone . ../b |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
52 updating to branch default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
53 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
54 $ cd ../b |
22264
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
55 |
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
56 Ensure branchcache got copied over: |
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
57 |
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
58 $ ls .hg/cache |
46314
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
59 branch2-base |
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
60 branch2-immutable |
22264
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
61 branch2-served |
46314
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
62 branch2-served.hidden |
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
63 branch2-visible |
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
64 branch2-visible-hidden |
32527
53a67ba9fb44
local-clone: also copy revs-branch-cache files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
31830
diff
changeset
|
65 rbc-names-v1 |
53a67ba9fb44
local-clone: also copy revs-branch-cache files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
31830
diff
changeset
|
66 rbc-revs-v1 |
46314
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
67 tags2 |
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
68 tags2-served |
22264
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
69 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
70 $ cat a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
71 a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
72 $ hg verify |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
73 checking changesets |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
74 checking manifests |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
75 crosschecking files in changesets and manifests |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
76 checking files |
39506
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39350
diff
changeset
|
77 checked 11 changesets with 11 changes to 2 files |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
78 |
13058
5986f44ea63c
test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents:
12847
diff
changeset
|
79 Invalid dest '' must abort: |
5986f44ea63c
test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents:
12847
diff
changeset
|
80 |
5986f44ea63c
test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents:
12847
diff
changeset
|
81 $ hg clone . '' |
17159
36a3016811d1
localrepo: use the path relative to "self.vfs" instead of "path" argument
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17135
diff
changeset
|
82 abort: empty destination path is not valid |
45866
d68618954ade
errors: use InputError for some errors on `hg clone`
Martin von Zweigbergk <martinvonz@google.com>
parents:
45858
diff
changeset
|
83 [10] |
13058
5986f44ea63c
test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents:
12847
diff
changeset
|
84 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
85 No update, with debug option: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
86 |
16971
8aeb2f1ae94c
tests: introduce hghave hardlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
87 #if hardlink |
25125
bd625cd4e5e7
progress: get the extremely verbose output out of default debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24611
diff
changeset
|
88 $ hg --debug clone -U . ../c --config progress.debug=true |
47453
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
89 linking: 1/15 files (6.67%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
90 linking: 2/15 files (13.33%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
91 linking: 3/15 files (20.00%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
92 linking: 4/15 files (26.67%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
93 linking: 5/15 files (33.33%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
94 linking: 6/15 files (40.00%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
95 linking: 7/15 files (46.67%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
96 linking: 8/15 files (53.33%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
97 linking: 9/15 files (60.00%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
98 linking: 10/15 files (66.67%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
99 linking: 11/15 files (73.33%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
100 linking: 12/15 files (80.00%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
101 linking: 13/15 files (86.67%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
102 linking: 14/15 files (93.33%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
103 linking: 15/15 files (100.00%) |
377d8fc20e34
clone: reuse the stream clone logic for local clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47043
diff
changeset
|
104 linked 15 files |
46314
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
105 updating the branch cache |
16971
8aeb2f1ae94c
tests: introduce hghave hardlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
106 #else |
25241
aa36204766e4
tests: fix test-clone on vfat
Matt Mackall <mpm@selenic.com>
parents:
25125
diff
changeset
|
107 $ hg --debug clone -U . ../c --config progress.debug=true |
40438
e5f54c4ec075
copystore: provide unit to ui.makeprogress()
Anton Shestakov <av6@dwimlabs.net>
parents:
40369
diff
changeset
|
108 linking: 1 files |
e5f54c4ec075
copystore: provide unit to ui.makeprogress()
Anton Shestakov <av6@dwimlabs.net>
parents:
40369
diff
changeset
|
109 copying: 2 files |
e5f54c4ec075
copystore: provide unit to ui.makeprogress()
Anton Shestakov <av6@dwimlabs.net>
parents:
40369
diff
changeset
|
110 copying: 3 files |
e5f54c4ec075
copystore: provide unit to ui.makeprogress()
Anton Shestakov <av6@dwimlabs.net>
parents:
40369
diff
changeset
|
111 copying: 4 files |
e5f54c4ec075
copystore: provide unit to ui.makeprogress()
Anton Shestakov <av6@dwimlabs.net>
parents:
40369
diff
changeset
|
112 copying: 5 files |
e5f54c4ec075
copystore: provide unit to ui.makeprogress()
Anton Shestakov <av6@dwimlabs.net>
parents:
40369
diff
changeset
|
113 copying: 6 files |
e5f54c4ec075
copystore: provide unit to ui.makeprogress()
Anton Shestakov <av6@dwimlabs.net>
parents:
40369
diff
changeset
|
114 copying: 7 files |
e5f54c4ec075
copystore: provide unit to ui.makeprogress()
Anton Shestakov <av6@dwimlabs.net>
parents:
40369
diff
changeset
|
115 copying: 8 files |
16971
8aeb2f1ae94c
tests: introduce hghave hardlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
116 #endif |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
117 $ cd ../c |
22264
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
118 |
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
119 Ensure branchcache got copied over: |
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
120 |
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
121 $ ls .hg/cache |
46314
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
122 branch2-base |
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
123 branch2-immutable |
22264
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
124 branch2-served |
46314
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
125 branch2-served.hidden |
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
126 branch2-visible |
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
127 branch2-visible-hidden |
32527
53a67ba9fb44
local-clone: also copy revs-branch-cache files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
31830
diff
changeset
|
128 rbc-names-v1 |
53a67ba9fb44
local-clone: also copy revs-branch-cache files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
31830
diff
changeset
|
129 rbc-revs-v1 |
46314
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
130 tags2 |
95a615dd77bf
clone: make sure we warm the cache after a clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46075
diff
changeset
|
131 tags2-served |
22264
4bc1fd86e915
clone: for local clones, copy over filtered branchcaches as well (issue4286)
Siddharth Agarwal <sid0@fb.com>
parents:
20825
diff
changeset
|
132 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
133 $ cat a 2>/dev/null || echo "a not present" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
134 a not present |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
135 $ hg verify |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
136 checking changesets |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
137 checking manifests |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
138 crosschecking files in changesets and manifests |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
139 checking files |
39506
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39350
diff
changeset
|
140 checked 11 changesets with 11 changes to 2 files |
550 | 141 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
142 Default destination: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
143 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
144 $ mkdir ../d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
145 $ cd ../d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
146 $ hg clone ../a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
147 destination directory: a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
148 updating to branch default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
149 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
150 $ cd a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
151 $ hg cat a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
152 a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
153 $ cd ../.. |
550 | 154 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
155 Check that we drop the 'file:' from the path before writing the .hgrc: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
156 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
157 $ hg clone file:a e |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
158 updating to branch default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
159 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
160 $ grep 'file:' e/.hg/hgrc |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11839
diff
changeset
|
161 [1] |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
162 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
163 Check that path aliases are expanded: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
164 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
165 $ hg clone -q -U --config 'paths.foobar=a#0' foobar f |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
166 $ hg -R f showconfig paths.default |
35400
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34885
diff
changeset
|
167 $TESTTMP/a#0 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
168 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
169 Use --pull: |
550 | 170 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
171 $ hg clone --pull a g |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
172 requesting all changes |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
173 adding changesets |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
174 adding manifests |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
175 adding file changes |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
176 added 11 changesets with 11 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33794
diff
changeset
|
177 new changesets acb14030fe0a:a7949464abda |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
178 updating to branch default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
179 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
180 $ hg -R g verify |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
181 checking changesets |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
182 checking manifests |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
183 crosschecking files in changesets and manifests |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
184 checking files |
39506
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39350
diff
changeset
|
185 checked 11 changesets with 11 changes to 2 files |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
186 |
13058
5986f44ea63c
test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents:
12847
diff
changeset
|
187 Invalid dest '' with --pull must abort (issue2528): |
5986f44ea63c
test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents:
12847
diff
changeset
|
188 |
5986f44ea63c
test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents:
12847
diff
changeset
|
189 $ hg clone --pull a '' |
17159
36a3016811d1
localrepo: use the path relative to "self.vfs" instead of "path" argument
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17135
diff
changeset
|
190 abort: empty destination path is not valid |
45866
d68618954ade
errors: use InputError for some errors on `hg clone`
Martin von Zweigbergk <martinvonz@google.com>
parents:
45858
diff
changeset
|
191 [10] |
13058
5986f44ea63c
test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents:
12847
diff
changeset
|
192 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
193 Clone to '.': |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
194 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
195 $ mkdir h |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
196 $ cd h |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
197 $ hg clone ../a . |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
198 updating to branch default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
199 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
200 $ cd .. |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
201 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
202 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
203 *** Tests for option -u *** |
5225
76c4cadb49fc
clone: remove "file://" before making the path absolute
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1926
diff
changeset
|
204 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
205 Adding some more history to repo a: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
206 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
207 $ cd a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
208 $ hg tag ref1 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
209 $ echo the quick brown fox >a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
210 $ hg ci -m "hacked default" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
211 $ hg up ref1 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
212 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
213 $ hg branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
214 marked working directory as branch stable |
15615 | 215 (branches are permanent and global, did you want a bookmark?) |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
216 $ echo some text >a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
217 $ hg ci -m "starting branch stable" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
218 $ hg tag ref2 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
219 $ echo some more text >a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
220 $ hg ci -m "another change for branch stable" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
221 $ hg up ref2 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
222 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
223 $ hg parents |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
224 changeset: 13:e8ece76546a6 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
225 branch: stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
226 tag: ref2 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
227 parent: 10:a7949464abda |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
228 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
229 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
230 summary: starting branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
231 |
5225
76c4cadb49fc
clone: remove "file://" before making the path absolute
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1926
diff
changeset
|
232 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
233 Repo a has two heads: |
6088
3b96cefc1b2b
clone: expand the path before saving it in .hg/hgrc
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5225
diff
changeset
|
234 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
235 $ hg heads |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
236 changeset: 15:0aae7cf88f0d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
237 branch: stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
238 tag: tip |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
239 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
240 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
241 summary: another change for branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
242 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
243 changeset: 12:f21241060d6a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
244 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
245 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
246 summary: hacked default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
247 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
248 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
249 $ cd .. |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
250 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
251 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
252 Testing --noupdate with --updaterev (must abort): |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
253 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
254 $ hg clone --noupdate --updaterev 1 a ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
255 abort: cannot specify both --noupdate and --updaterev |
45846
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
45473
diff
changeset
|
256 [10] |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
257 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
258 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
259 Testing clone -u: |
6947
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6088
diff
changeset
|
260 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
261 $ hg clone -u . a ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
262 updating to branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
263 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
264 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
265 Repo ua has both heads: |
7927
a218ba5f60df
allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents:
6947
diff
changeset
|
266 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
267 $ hg -R ua heads |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
268 changeset: 15:0aae7cf88f0d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
269 branch: stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
270 tag: tip |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
271 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
272 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
273 summary: another change for branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
274 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
275 changeset: 12:f21241060d6a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
276 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
277 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
278 summary: hacked default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
279 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
280 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
281 Same revision checked out in repo a and ua: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
282 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
283 $ hg -R a parents --template "{node|short}\n" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
284 e8ece76546a6 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
285 $ hg -R ua parents --template "{node|short}\n" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
286 e8ece76546a6 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
287 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
288 $ rm -r ua |
9714
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
289 |
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
290 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
291 Testing clone --pull -u: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
292 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
293 $ hg clone --pull -u . a ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
294 requesting all changes |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
295 adding changesets |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
296 adding manifests |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
297 adding file changes |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
298 added 16 changesets with 16 changes to 3 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33794
diff
changeset
|
299 new changesets acb14030fe0a:0aae7cf88f0d |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
300 updating to branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
301 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
302 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
303 Repo ua has both heads: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
304 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
305 $ hg -R ua heads |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
306 changeset: 15:0aae7cf88f0d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
307 branch: stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
308 tag: tip |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
309 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
310 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
311 summary: another change for branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
312 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
313 changeset: 12:f21241060d6a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
314 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
315 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
316 summary: hacked default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
317 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
318 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
319 Same revision checked out in repo a and ua: |
9714
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
320 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
321 $ hg -R a parents --template "{node|short}\n" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
322 e8ece76546a6 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
323 $ hg -R ua parents --template "{node|short}\n" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
324 e8ece76546a6 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
325 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
326 $ rm -r ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
327 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
328 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
329 Testing clone -u <branch>: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
330 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
331 $ hg clone -u stable a ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
332 updating to branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
333 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
334 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
335 Repo ua has both heads: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
336 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
337 $ hg -R ua heads |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
338 changeset: 15:0aae7cf88f0d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
339 branch: stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
340 tag: tip |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
341 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
342 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
343 summary: another change for branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
344 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
345 changeset: 12:f21241060d6a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
346 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
347 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
348 summary: hacked default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
349 |
9714
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
350 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
351 Branch 'stable' is checked out: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
352 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
353 $ hg -R ua parents |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
354 changeset: 15:0aae7cf88f0d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
355 branch: stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
356 tag: tip |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
357 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
358 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
359 summary: another change for branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
360 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
361 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
362 $ rm -r ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
363 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
364 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
365 Testing default checkout: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
366 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
367 $ hg clone a ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
368 updating to branch default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
369 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
370 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
371 Repo ua has both heads: |
9714
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
372 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
373 $ hg -R ua heads |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
374 changeset: 15:0aae7cf88f0d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
375 branch: stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
376 tag: tip |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
377 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
378 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
379 summary: another change for branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
380 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
381 changeset: 12:f21241060d6a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
382 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
383 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
384 summary: hacked default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
385 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
386 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
387 Branch 'default' is checked out: |
9714
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
388 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
389 $ hg -R ua parents |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
390 changeset: 12:f21241060d6a |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
391 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
392 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
393 summary: hacked default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
394 |
17869
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
395 Test clone with a branch named "@" (issue3677) |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
396 |
17869
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
397 $ hg -R ua branch @ |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
398 marked working directory as branch @ |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
399 $ hg -R ua commit -m 'created branch @' |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
400 $ hg clone ua atbranch |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
401 updating to branch default |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
402 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
403 $ hg -R atbranch heads |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
404 changeset: 16:798b6d97153e |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
405 branch: @ |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
406 tag: tip |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
407 parent: 12:f21241060d6a |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
408 user: test |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
409 date: Thu Jan 01 00:00:00 1970 +0000 |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
410 summary: created branch @ |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
411 |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
412 changeset: 15:0aae7cf88f0d |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
413 branch: stable |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
414 user: test |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
415 date: Thu Jan 01 00:00:00 1970 +0000 |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
416 summary: another change for branch stable |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
417 |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
418 changeset: 12:f21241060d6a |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
419 user: test |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
420 date: Thu Jan 01 00:00:00 1970 +0000 |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
421 summary: hacked default |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
422 |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
423 $ hg -R atbranch parents |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
424 changeset: 12:f21241060d6a |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
425 user: test |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
426 date: Thu Jan 01 00:00:00 1970 +0000 |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
427 summary: hacked default |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
428 |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
429 |
c79b404b99ae
test-clone.t: check that branch "@" is not automatically checked out
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17756
diff
changeset
|
430 $ rm -r ua atbranch |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
431 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
432 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
433 Testing #<branch>: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
434 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
435 $ hg clone -u . a#stable ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
436 adding changesets |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
437 adding manifests |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
438 adding file changes |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
439 added 14 changesets with 14 changes to 3 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33794
diff
changeset
|
440 new changesets acb14030fe0a:0aae7cf88f0d |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
441 updating to branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
442 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9714
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
443 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
444 Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
445 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
446 $ hg -R ua heads |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
447 changeset: 13:0aae7cf88f0d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
448 branch: stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
449 tag: tip |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
450 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
451 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
452 summary: another change for branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
453 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
454 changeset: 10:a7949464abda |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
455 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
456 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
457 summary: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
458 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
459 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
460 Same revision checked out in repo a and ua: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
461 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
462 $ hg -R a parents --template "{node|short}\n" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
463 e8ece76546a6 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
464 $ hg -R ua parents --template "{node|short}\n" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
465 e8ece76546a6 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
466 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
467 $ rm -r ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
468 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
469 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
470 Testing -u -r <branch>: |
9714
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
471 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
472 $ hg clone -u . -r stable a ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
473 adding changesets |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
474 adding manifests |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
475 adding file changes |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
476 added 14 changesets with 14 changes to 3 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33794
diff
changeset
|
477 new changesets acb14030fe0a:0aae7cf88f0d |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
478 updating to branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
479 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
480 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
481 Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): |
9714
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
482 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
483 $ hg -R ua heads |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
484 changeset: 13:0aae7cf88f0d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
485 branch: stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
486 tag: tip |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
487 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
488 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
489 summary: another change for branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
490 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
491 changeset: 10:a7949464abda |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
492 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
493 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
494 summary: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
495 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
496 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
497 Same revision checked out in repo a and ua: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
498 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
499 $ hg -R a parents --template "{node|short}\n" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
500 e8ece76546a6 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
501 $ hg -R ua parents --template "{node|short}\n" |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
502 e8ece76546a6 |
9714
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
503 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
504 $ rm -r ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
505 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
506 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
507 Testing -r <branch>: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
508 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
509 $ hg clone -r stable a ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
510 adding changesets |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
511 adding manifests |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
512 adding file changes |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
513 added 14 changesets with 14 changes to 3 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33794
diff
changeset
|
514 new changesets acb14030fe0a:0aae7cf88f0d |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
515 updating to branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
516 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
517 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
518 Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
519 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
520 $ hg -R ua heads |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
521 changeset: 13:0aae7cf88f0d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
522 branch: stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
523 tag: tip |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
524 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
525 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
526 summary: another change for branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
527 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
528 changeset: 10:a7949464abda |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
529 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
530 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
531 summary: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
532 |
9714
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
533 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
534 Branch 'stable' is checked out: |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
535 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
536 $ hg -R ua parents |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
537 changeset: 13:0aae7cf88f0d |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
538 branch: stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
539 tag: tip |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
540 user: test |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
541 date: Thu Jan 01 00:00:00 1970 +0000 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
542 summary: another change for branch stable |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
543 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
544 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
545 $ rm -r ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
546 |
9714
2f1ab7f77ddc
clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
547 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
548 Issue2267: Error in 1.6 hg.py: TypeError: 'NoneType' object is not |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
549 iterable in addbranchrevs() |
11544
be5e86c80628
hg.clone: fix branch value when passing a repo object (issue2267)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11295
diff
changeset
|
550 |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
551 $ cat <<EOF > simpleclone.py |
40369
ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40219
diff
changeset
|
552 > from mercurial import hg, ui as uimod |
ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40219
diff
changeset
|
553 > myui = uimod.ui.load() |
37668
2a42ca2679e2
py3: add b'' prefixes to make values bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37424
diff
changeset
|
554 > repo = hg.repository(myui, b'a') |
2a42ca2679e2
py3: add b'' prefixes to make values bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37424
diff
changeset
|
555 > hg.clone(myui, {}, repo, dest=b"ua") |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
556 > EOF |
11544
be5e86c80628
hg.clone: fix branch value when passing a repo object (issue2267)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11295
diff
changeset
|
557 |
39723
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39506
diff
changeset
|
558 $ "$PYTHON" simpleclone.py |
11806
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
559 updating to branch default |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
560 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
561 |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
562 $ rm -r ua |
fd66a181f575
tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
11544
diff
changeset
|
563 |
11839
8c034517b406
test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents:
11823
diff
changeset
|
564 $ cat <<EOF > branchclone.py |
40369
ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40219
diff
changeset
|
565 > from mercurial import extensions, hg, ui as uimod |
ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40219
diff
changeset
|
566 > myui = uimod.ui.load() |
17135
06733dfe1a43
test-clone: load extensions before doing anything
Bryan O'Sullivan <bryano@fb.com>
parents:
16971
diff
changeset
|
567 > extensions.loadall(myui) |
40763
c93d046d4300
extensions: add "uipopulate" hook, called per instance, not per process
Yuya Nishihara <yuya@tcha.org>
parents:
40438
diff
changeset
|
568 > extensions.populateui(myui) |
37668
2a42ca2679e2
py3: add b'' prefixes to make values bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37424
diff
changeset
|
569 > repo = hg.repository(myui, b'a') |
41743
6462bbb91b53
tests: bulk change to avoid "unneeded trailing ',' ..." error of check-code.py
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
41302
diff
changeset
|
570 > hg.clone(myui, {}, repo, dest=b"ua", branch=[b"stable"]) |
11839
8c034517b406
test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents:
11823
diff
changeset
|
571 > EOF |
11818
b1ae33b813cb
hg.clone: do not ignore branch argument when source is a repo object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11544
diff
changeset
|
572 |
39723
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39506
diff
changeset
|
573 $ "$PYTHON" branchclone.py |
11839
8c034517b406
test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents:
11823
diff
changeset
|
574 adding changesets |
8c034517b406
test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents:
11823
diff
changeset
|
575 adding manifests |
8c034517b406
test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents:
11823
diff
changeset
|
576 adding file changes |
8c034517b406
test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents:
11823
diff
changeset
|
577 added 14 changesets with 14 changes to 3 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33794
diff
changeset
|
578 new changesets acb14030fe0a:0aae7cf88f0d |
11839
8c034517b406
test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents:
11823
diff
changeset
|
579 updating to branch stable |
8c034517b406
test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents:
11823
diff
changeset
|
580 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8c034517b406
test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents:
11823
diff
changeset
|
581 $ rm -r ua |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
582 |
47908
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
583 Local clones don't get confused by unusual experimental.evolution options |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
584 |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
585 $ hg clone \ |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
586 > --config experimental.evolution=allowunstable,allowdivergence,exchange \ |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
587 > a ua |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
588 updating to branch default |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
589 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
590 $ rm -r ua |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
591 |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
592 $ hg clone \ |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
593 > --config experimental.evolution.createmarkers=no \ |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
594 > --config experimental.evolution.allowunstable=yes \ |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
595 > --config experimental.evolution.allowdivergence=yes \ |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
596 > --config experimental.evolution.exchange=yes \ |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
597 > a ua |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
598 updating to branch default |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
599 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b1e1559f5a45
obsolete: disable other evolution config options if createmarkers is off
Anton Shestakov <av6@dwimlabs.net>
parents:
47453
diff
changeset
|
600 $ rm -r ua |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
601 |
17756
92980a8dfdfe
clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents:
17424
diff
changeset
|
602 Test clone with special '@' bookmark: |
92980a8dfdfe
clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents:
17424
diff
changeset
|
603 $ cd a |
92980a8dfdfe
clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents:
17424
diff
changeset
|
604 $ hg bookmark -r a7949464abda @ # branch point of stable from default |
92980a8dfdfe
clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents:
17424
diff
changeset
|
605 $ hg clone . ../i |
17882
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17881
diff
changeset
|
606 updating to bookmark @ |
17756
92980a8dfdfe
clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents:
17424
diff
changeset
|
607 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
92980a8dfdfe
clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents:
17424
diff
changeset
|
608 $ hg id -i ../i |
92980a8dfdfe
clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents:
17424
diff
changeset
|
609 a7949464abda |
17882
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17881
diff
changeset
|
610 $ rm -r ../i |
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17881
diff
changeset
|
611 |
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17881
diff
changeset
|
612 $ hg bookmark -f -r stable @ |
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17881
diff
changeset
|
613 $ hg bookmarks |
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17881
diff
changeset
|
614 @ 15:0aae7cf88f0d |
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17881
diff
changeset
|
615 $ hg clone . ../i |
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17881
diff
changeset
|
616 updating to bookmark @ on branch stable |
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17881
diff
changeset
|
617 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17881
diff
changeset
|
618 $ hg id -i ../i |
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17881
diff
changeset
|
619 0aae7cf88f0d |
17881
603d4fbad36d
test-clone: fix directory level
Adrian Buehlmann <adrian@cadifra.com>
parents:
17872
diff
changeset
|
620 $ cd "$TESTTMP" |
17756
92980a8dfdfe
clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents:
17424
diff
changeset
|
621 |
92980a8dfdfe
clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents:
17424
diff
changeset
|
622 |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
623 Testing failures: |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
624 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
625 $ mkdir fail |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
626 $ cd fail |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
627 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
628 No local source |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
629 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
630 $ hg clone a b |
45921
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45866
diff
changeset
|
631 abort: repository a not found |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
632 [255] |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
633 |
43468
b4c82b704180
py3: force bytestr conversion of "reason" in scmutil.callcatch()
Denis Laxalde <denis@laxalde.org>
parents:
42903
diff
changeset
|
634 Invalid URL |
b4c82b704180
py3: force bytestr conversion of "reason" in scmutil.callcatch()
Denis Laxalde <denis@laxalde.org>
parents:
42903
diff
changeset
|
635 |
b4c82b704180
py3: force bytestr conversion of "reason" in scmutil.callcatch()
Denis Laxalde <denis@laxalde.org>
parents:
42903
diff
changeset
|
636 $ hg clone http://invalid:url/a b |
b4c82b704180
py3: force bytestr conversion of "reason" in scmutil.callcatch()
Denis Laxalde <denis@laxalde.org>
parents:
42903
diff
changeset
|
637 abort: error: nonnumeric port: 'url' |
45858
ebee234d952a
errors: set detailed exit code to 100 for some remote errors
Martin von Zweigbergk <martinvonz@google.com>
parents:
45846
diff
changeset
|
638 [100] |
43468
b4c82b704180
py3: force bytestr conversion of "reason" in scmutil.callcatch()
Denis Laxalde <denis@laxalde.org>
parents:
42903
diff
changeset
|
639 |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
640 No remote source |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
641 |
23059
6ecd1ff8c42c
tests: add "(glob)" for l10n messages in test-clone.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22947
diff
changeset
|
642 #if windows |
31028 | 643 $ hg clone http://$LOCALIP:3121/a b |
23059
6ecd1ff8c42c
tests: add "(glob)" for l10n messages in test-clone.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22947
diff
changeset
|
644 abort: error: * (glob) |
46075
f4f07cc92a47
tests: update the exit status codes for Windows specific tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
46074
diff
changeset
|
645 [100] |
23059
6ecd1ff8c42c
tests: add "(glob)" for l10n messages in test-clone.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22947
diff
changeset
|
646 #else |
31028 | 647 $ hg clone http://$LOCALIP:3121/a b |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
648 abort: error: *refused* (glob) |
45858
ebee234d952a
errors: set detailed exit code to 100 for some remote errors
Martin von Zweigbergk <martinvonz@google.com>
parents:
45846
diff
changeset
|
649 [100] |
23059
6ecd1ff8c42c
tests: add "(glob)" for l10n messages in test-clone.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22947
diff
changeset
|
650 #endif |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
651 $ rm -rf b # work around bug with http clone |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
652 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
653 |
20008
e54a078153f7
tests: skip tests that require not having root (issue4089)
Matt Mackall <mpm@selenic.com>
parents:
18227
diff
changeset
|
654 #if unix-permissions no-root |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
655 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
656 Inaccessible source |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
657 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
658 $ mkdir a |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
659 $ chmod 000 a |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
660 $ hg clone a b |
40219
7ba6b880b09a
py3: glob some difference between py2 and py3 output
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
40176
diff
changeset
|
661 abort: Permission denied: *$TESTTMP/fail/a/.hg* (glob) |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
662 [255] |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
663 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
664 Inaccessible destination |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
665 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
666 $ hg init b |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
667 $ cd b |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
668 $ hg clone . ../a |
40219
7ba6b880b09a
py3: glob some difference between py2 and py3 output
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
40176
diff
changeset
|
669 abort: Permission denied: *../a* (glob) |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
670 [255] |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
671 $ cd .. |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
672 $ chmod 700 a |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
673 $ rm -r a b |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
674 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
675 #endif |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
676 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
677 |
16898
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16847
diff
changeset
|
678 #if fifo |
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16847
diff
changeset
|
679 |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
680 Source of wrong type |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
681 |
16898
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16847
diff
changeset
|
682 $ mkfifo a |
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16847
diff
changeset
|
683 $ hg clone a b |
40219
7ba6b880b09a
py3: glob some difference between py2 and py3 output
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
40176
diff
changeset
|
684 abort: $ENOTDIR$: *$TESTTMP/fail/a/.hg* (glob) |
16898
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16847
diff
changeset
|
685 [255] |
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16847
diff
changeset
|
686 $ rm a |
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16847
diff
changeset
|
687 |
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16847
diff
changeset
|
688 #endif |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
689 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
690 Default destination, same directory |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
691 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
692 $ hg init q |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
693 $ hg clone q |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
694 destination directory: q |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
695 abort: destination 'q' is not empty |
45866
d68618954ade
errors: use InputError for some errors on `hg clone`
Martin von Zweigbergk <martinvonz@google.com>
parents:
45858
diff
changeset
|
696 [10] |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
697 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
698 destination directory not empty |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
699 |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17307
diff
changeset
|
700 $ mkdir a |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
701 $ echo stuff > a/a |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
702 $ hg clone q a |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
703 abort: destination 'a' is not empty |
45866
d68618954ade
errors: use InputError for some errors on `hg clone`
Martin von Zweigbergk <martinvonz@google.com>
parents:
45858
diff
changeset
|
704 [10] |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
705 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
706 |
20008
e54a078153f7
tests: skip tests that require not having root (issue4089)
Matt Mackall <mpm@selenic.com>
parents:
18227
diff
changeset
|
707 #if unix-permissions no-root |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
708 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
709 leave existing directory in place after clone failure |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
710 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
711 $ hg init c |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
712 $ cd c |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
713 $ echo c > c |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
714 $ hg commit -A -m test |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
715 adding c |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
716 $ chmod -rx .hg/store/data |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
717 $ cd .. |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
718 $ mkdir d |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
719 $ hg clone c d 2> err |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
720 [255] |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
721 $ test -d d |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
722 $ test -d d/.hg |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
723 [1] |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
724 |
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
725 re-enable perm to allow deletion |
16847
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
726 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
727 $ chmod +rx c/.hg/store/data |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
728 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
729 #endif |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
730 |
cda5402b1739
tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15623
diff
changeset
|
731 $ cd .. |
20825
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
732 |
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
733 Test clone from the repository in (emulated) revlog format 0 (issue4203): |
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
734 |
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
735 $ mkdir issue4203 |
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
736 $ mkdir -p src/.hg |
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
737 $ echo foo > src/foo |
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
738 $ hg -R src add src/foo |
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
739 $ hg -R src commit -m '#0' |
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
740 $ hg -R src log -q |
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
741 0:e1bab28bca43 |
41302
c953c2a94d68
revlog: fix resolution of revlog version 0
Yuya Nishihara <yuya@tcha.org>
parents:
40821
diff
changeset
|
742 $ hg -R src debugrevlog -c | egrep 'format|flags' |
c953c2a94d68
revlog: fix resolution of revlog version 0
Yuya Nishihara <yuya@tcha.org>
parents:
40821
diff
changeset
|
743 format : 0 |
c953c2a94d68
revlog: fix resolution of revlog version 0
Yuya Nishihara <yuya@tcha.org>
parents:
40821
diff
changeset
|
744 flags : (none) |
42436
69883775b27d
root: add template variables pointing to repository directories
Yuya Nishihara <yuya@tcha.org>
parents:
41970
diff
changeset
|
745 $ hg root -R src -T json | sed 's|\\\\|\\|g' |
69883775b27d
root: add template variables pointing to repository directories
Yuya Nishihara <yuya@tcha.org>
parents:
41970
diff
changeset
|
746 [ |
69883775b27d
root: add template variables pointing to repository directories
Yuya Nishihara <yuya@tcha.org>
parents:
41970
diff
changeset
|
747 { |
69883775b27d
root: add template variables pointing to repository directories
Yuya Nishihara <yuya@tcha.org>
parents:
41970
diff
changeset
|
748 "hgpath": "$TESTTMP/src/.hg", |
69883775b27d
root: add template variables pointing to repository directories
Yuya Nishihara <yuya@tcha.org>
parents:
41970
diff
changeset
|
749 "reporoot": "$TESTTMP/src", |
69883775b27d
root: add template variables pointing to repository directories
Yuya Nishihara <yuya@tcha.org>
parents:
41970
diff
changeset
|
750 "storepath": "$TESTTMP/src/.hg" |
69883775b27d
root: add template variables pointing to repository directories
Yuya Nishihara <yuya@tcha.org>
parents:
41970
diff
changeset
|
751 } |
69883775b27d
root: add template variables pointing to repository directories
Yuya Nishihara <yuya@tcha.org>
parents:
41970
diff
changeset
|
752 ] |
20825
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
753 $ hg clone -U -q src dst |
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
754 $ hg -R dst log -q |
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
755 0:e1bab28bca43 |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
756 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
757 Create repositories to test auto sharing functionality |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
758 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
759 $ cat >> $HGRCPATH << EOF |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
760 > [extensions] |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
761 > share= |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
762 > EOF |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
763 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
764 $ hg init empty |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
765 $ hg init source1a |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
766 $ cd source1a |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
767 $ echo initial1 > foo |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
768 $ hg -q commit -A -m initial |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
769 $ echo second > foo |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
770 $ hg commit -m second |
20825
dda11e799529
hg: use "os.path.join()" to join path components which may be empty (issue4203)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20008
diff
changeset
|
771 $ cd .. |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
772 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
773 $ hg init filteredrev0 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
774 $ cd filteredrev0 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
775 $ cat >> .hg/hgrc << EOF |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
776 > [experimental] |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
777 > evolution.createmarkers=True |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
778 > EOF |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
779 $ echo initial1 > foo |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
780 $ hg -q commit -A -m initial0 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
781 $ hg -q up -r null |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
782 $ echo initial2 > foo |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
783 $ hg -q commit -A -m initial1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
784 $ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8 |
42899
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42436
diff
changeset
|
785 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33335
diff
changeset
|
786 obsoleted 1 changesets |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
787 $ cd .. |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
788 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
789 $ hg -q clone --pull source1a source1b |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
790 $ cd source1a |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
791 $ hg bookmark bookA |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
792 $ echo 1a > foo |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
793 $ hg commit -m 1a |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
794 $ cd ../source1b |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
795 $ hg -q up -r 0 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
796 $ echo head1 > foo |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
797 $ hg commit -m head1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
798 created new head |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
799 $ hg bookmark head1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
800 $ hg -q up -r 0 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
801 $ echo head2 > foo |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
802 $ hg commit -m head2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
803 created new head |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
804 $ hg bookmark head2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
805 $ hg -q up -r 0 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
806 $ hg branch branch1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
807 marked working directory as branch branch1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
808 (branches are permanent and global, did you want a bookmark?) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
809 $ echo branch1 > foo |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
810 $ hg commit -m branch1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
811 $ hg -q up -r 0 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
812 $ hg branch branch2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
813 marked working directory as branch branch2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
814 $ echo branch2 > foo |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
815 $ hg commit -m branch2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
816 $ cd .. |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
817 $ hg init source2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
818 $ cd source2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
819 $ echo initial2 > foo |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
820 $ hg -q commit -A -m initial2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
821 $ echo second > foo |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
822 $ hg commit -m second |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
823 $ cd .. |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
824 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
825 Clone with auto share from an empty repo should not result in share |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
826 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
827 $ mkdir share |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
828 $ hg --config share.pool=share clone empty share-empty |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
829 (not using pooled storage: remote appears to be empty) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
830 updating to branch default |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
831 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
832 $ ls share |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
833 $ test -d share-empty/.hg/store |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
834 $ test -f share-empty/.hg/sharedpath |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
835 [1] |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
836 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
837 Clone with auto share from a repo with filtered revision 0 should not result in share |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
838 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
839 $ hg --config share.pool=share clone filteredrev0 share-filtered |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
840 (not using pooled storage: unable to resolve identity of remote) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
841 requesting all changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
842 adding changesets |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
843 adding manifests |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
844 adding file changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
845 added 1 changesets with 1 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:
33794
diff
changeset
|
846 new changesets e082c1832e09 |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
847 updating to branch default |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
848 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
849 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
850 Clone from repo with content should result in shared store being created |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
851 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
852 $ hg --config share.pool=share clone source1a share-dest1a |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
853 (sharing from new pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
854 requesting all changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
855 adding changesets |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
856 adding manifests |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
857 adding file changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
858 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:
33794
diff
changeset
|
859 new changesets b5f04eac9d8f:e5bfe23c0b47 |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
860 searching for changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
861 no changes found |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
862 adding remote bookmark bookA |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
863 updating working directory |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
864 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
865 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
866 The shared repo should have been created |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
867 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
868 $ ls share |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
869 b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
870 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
871 The destination should point to it |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
872 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
873 $ cat share-dest1a/.hg/sharedpath; echo |
35400
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34885
diff
changeset
|
874 $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
875 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
876 The destination should have bookmarks |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
877 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
878 $ hg -R share-dest1a bookmarks |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
879 bookA 2:e5bfe23c0b47 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
880 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
881 The default path should be the remote, not the share |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
882 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
883 $ hg -R share-dest1a config paths.default |
35400
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34885
diff
changeset
|
884 $TESTTMP/source1a |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
885 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
886 Clone with existing share dir should result in pull + share |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
887 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
888 $ hg --config share.pool=share clone source1b share-dest1b |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
889 (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
890 searching for changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
891 adding changesets |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
892 adding manifests |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
893 adding file changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
894 adding remote bookmark head1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
895 adding remote bookmark head2 |
42903
d7304434390f
changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42899
diff
changeset
|
896 added 4 changesets with 4 changes to 1 files (+4 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33794
diff
changeset
|
897 new changesets 4a8dc1ab4c13:6bacf4683960 |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
898 updating working directory |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
899 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
900 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
901 $ ls share |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
902 b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
903 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
904 $ cat share-dest1b/.hg/sharedpath; echo |
35400
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34885
diff
changeset
|
905 $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
906 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
907 We only get bookmarks from the remote, not everything in the share |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
908 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
909 $ hg -R share-dest1b bookmarks |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
910 head1 3:4a8dc1ab4c13 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
911 head2 4:99f71071f117 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
912 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
913 Default path should be source, not share. |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
914 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
915 $ hg -R share-dest1b config paths.default |
35400
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34885
diff
changeset
|
916 $TESTTMP/source1b |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
917 |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
918 Checked out revision should be head of default branch |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
919 |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
920 $ hg -R share-dest1b log -r . |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
921 changeset: 4:99f71071f117 |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
922 bookmark: head2 |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
923 parent: 0:b5f04eac9d8f |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
924 user: test |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
925 date: Thu Jan 01 00:00:00 1970 +0000 |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
926 summary: head2 |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
927 |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
928 |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
929 Clone from unrelated repo should result in new share |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
930 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
931 $ hg --config share.pool=share clone source2 share-dest2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
932 (sharing from new pooled repository 22aeff664783fd44c6d9b435618173c118c3448e) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
933 requesting all changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
934 adding changesets |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
935 adding manifests |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
936 adding file changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
937 added 2 changesets with 2 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:
33794
diff
changeset
|
938 new changesets 22aeff664783:63cf6c3dba4a |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
939 searching for changes |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
940 no changes found |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
941 updating working directory |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
942 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
943 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
944 $ ls share |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
945 22aeff664783fd44c6d9b435618173c118c3448e |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
946 b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
947 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
948 remote naming mode works as advertised |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
949 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
950 $ hg --config share.pool=shareremote --config share.poolnaming=remote clone source1a share-remote1a |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
951 (sharing from new pooled repository 195bb1fcdb595c14a6c13e0269129ed78f6debde) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
952 requesting all changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
953 adding changesets |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
954 adding manifests |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
955 adding file changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
956 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:
33794
diff
changeset
|
957 new changesets b5f04eac9d8f:e5bfe23c0b47 |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
958 searching for changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
959 no changes found |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
960 adding remote bookmark bookA |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
961 updating working directory |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
962 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
963 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
964 $ ls shareremote |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
965 195bb1fcdb595c14a6c13e0269129ed78f6debde |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
966 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
967 $ hg --config share.pool=shareremote --config share.poolnaming=remote clone source1b share-remote1b |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
968 (sharing from new pooled repository c0d4f83847ca2a873741feb7048a45085fd47c46) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
969 requesting all changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
970 adding changesets |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
971 adding manifests |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
972 adding file changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
973 added 6 changesets with 6 changes to 1 files (+4 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33794
diff
changeset
|
974 new changesets b5f04eac9d8f:6bacf4683960 |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
975 searching for changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
976 no changes found |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
977 adding remote bookmark head1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
978 adding remote bookmark head2 |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
979 updating working directory |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
980 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
981 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
982 $ ls shareremote |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
983 195bb1fcdb595c14a6c13e0269129ed78f6debde |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
984 c0d4f83847ca2a873741feb7048a45085fd47c46 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
985 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
986 request to clone a single revision is respected in sharing mode |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
987 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
988 $ hg --config share.pool=sharerevs clone -r 4a8dc1ab4c13 source1b share-1arev |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
989 (sharing from new pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
990 adding changesets |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
991 adding manifests |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
992 adding file changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
993 added 2 changesets with 2 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:
33794
diff
changeset
|
994 new changesets b5f04eac9d8f:4a8dc1ab4c13 |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
995 no changes found |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
996 adding remote bookmark head1 |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
997 updating working directory |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
998 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
999 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1000 $ hg -R share-1arev log -G |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1001 @ changeset: 1:4a8dc1ab4c13 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1002 | bookmark: head1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1003 | tag: tip |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1004 | user: test |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1005 | date: Thu Jan 01 00:00:00 1970 +0000 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1006 | summary: head1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1007 | |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1008 o changeset: 0:b5f04eac9d8f |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1009 user: test |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1010 date: Thu Jan 01 00:00:00 1970 +0000 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1011 summary: initial |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1012 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1013 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1014 making another clone should only pull down requested rev |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1015 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1016 $ hg --config share.pool=sharerevs clone -r 99f71071f117 source1b share-1brev |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1017 (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1018 searching for changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1019 adding changesets |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1020 adding manifests |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1021 adding file changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1022 adding remote bookmark head1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1023 adding remote bookmark head2 |
42903
d7304434390f
changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42899
diff
changeset
|
1024 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:
33794
diff
changeset
|
1025 new changesets 99f71071f117 |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
1026 updating working directory |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
1027 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1028 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1029 $ hg -R share-1brev log -G |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
1030 @ changeset: 2:99f71071f117 |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1031 | bookmark: head2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1032 | tag: tip |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1033 | parent: 0:b5f04eac9d8f |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1034 | user: test |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1035 | date: Thu Jan 01 00:00:00 1970 +0000 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1036 | summary: head2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1037 | |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
1038 | o changeset: 1:4a8dc1ab4c13 |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1039 |/ bookmark: head1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1040 | user: test |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1041 | date: Thu Jan 01 00:00:00 1970 +0000 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1042 | summary: head1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1043 | |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1044 o changeset: 0:b5f04eac9d8f |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1045 user: test |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1046 date: Thu Jan 01 00:00:00 1970 +0000 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1047 summary: initial |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1048 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1049 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1050 Request to clone a single branch is respected in sharing mode |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1051 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1052 $ hg --config share.pool=sharebranch clone -b branch1 source1b share-1bbranch1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1053 (sharing from new pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1054 adding changesets |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1055 adding manifests |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1056 adding file changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1057 added 2 changesets with 2 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:
33794
diff
changeset
|
1058 new changesets b5f04eac9d8f:5f92a6c1a1b1 |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
1059 no changes found |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1060 updating working directory |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1061 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1062 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1063 $ hg -R share-1bbranch1 log -G |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1064 o changeset: 1:5f92a6c1a1b1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1065 | branch: branch1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1066 | tag: tip |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1067 | user: test |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1068 | date: Thu Jan 01 00:00:00 1970 +0000 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1069 | summary: branch1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1070 | |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1071 @ changeset: 0:b5f04eac9d8f |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1072 user: test |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1073 date: Thu Jan 01 00:00:00 1970 +0000 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1074 summary: initial |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1075 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1076 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1077 $ hg --config share.pool=sharebranch clone -b branch2 source1b share-1bbranch2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1078 (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1079 searching for changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1080 adding changesets |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1081 adding manifests |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1082 adding file changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1083 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:
33794
diff
changeset
|
1084 new changesets 6bacf4683960 |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
1085 updating working directory |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
1086 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25761
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1087 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1088 $ hg -R share-1bbranch2 log -G |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1089 o changeset: 2:6bacf4683960 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1090 | branch: branch2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1091 | tag: tip |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1092 | parent: 0:b5f04eac9d8f |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1093 | user: test |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1094 | date: Thu Jan 01 00:00:00 1970 +0000 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1095 | summary: branch2 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1096 | |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1097 | o changeset: 1:5f92a6c1a1b1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1098 |/ branch: branch1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1099 | user: test |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1100 | date: Thu Jan 01 00:00:00 1970 +0000 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1101 | summary: branch1 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1102 | |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1103 @ changeset: 0:b5f04eac9d8f |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1104 user: test |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1105 date: Thu Jan 01 00:00:00 1970 +0000 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1106 summary: initial |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1107 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1108 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1109 -U is respected in share clone mode |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1110 |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1111 $ hg --config share.pool=share clone -U source1a share-1anowc |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1112 (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1113 searching for changes |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1114 no changes found |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1115 adding remote bookmark bookA |
0d37b9b21467
hg: support for auto sharing stores when cloning
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25295
diff
changeset
|
1116 |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
43468
diff
changeset
|
1117 $ ls -A share-1anowc |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
43468
diff
changeset
|
1118 .hg |
26026
d08e7449ff27
hg: avoid auto sharing when the clone destination is remote
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25864
diff
changeset
|
1119 |
d08e7449ff27
hg: avoid auto sharing when the clone destination is remote
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25864
diff
changeset
|
1120 Test that auto sharing doesn't cause failure of "hg clone local remote" |
d08e7449ff27
hg: avoid auto sharing when the clone destination is remote
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25864
diff
changeset
|
1121 |
d08e7449ff27
hg: avoid auto sharing when the clone destination is remote
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25864
diff
changeset
|
1122 $ cd $TESTTMP |
d08e7449ff27
hg: avoid auto sharing when the clone destination is remote
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25864
diff
changeset
|
1123 $ hg -R a id -r 0 |
d08e7449ff27
hg: avoid auto sharing when the clone destination is remote
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25864
diff
changeset
|
1124 acb14030fe0a |
d08e7449ff27
hg: avoid auto sharing when the clone destination is remote
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25864
diff
changeset
|
1125 $ hg id -R remote -r 0 |
45921
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45866
diff
changeset
|
1126 abort: repository remote not found |
26026
d08e7449ff27
hg: avoid auto sharing when the clone destination is remote
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25864
diff
changeset
|
1127 [255] |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
1128 $ hg --config share.pool=share -q clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" a ssh://user@dummy/remote |
26026
d08e7449ff27
hg: avoid auto sharing when the clone destination is remote
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25864
diff
changeset
|
1129 $ hg -R remote id -r 0 |
d08e7449ff27
hg: avoid auto sharing when the clone destination is remote
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25864
diff
changeset
|
1130 acb14030fe0a |
28289
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1131 |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1132 Cloning into pooled storage doesn't race (issue5104) |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1133 |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1134 $ HGPOSTLOCKDELAY=2.0 hg --config share.pool=racepool --config extensions.lockdelay=$TESTDIR/lockdelay.py clone source1a share-destrace1 > race1.log 2>&1 & |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1135 $ HGPRELOCKDELAY=1.0 hg --config share.pool=racepool --config extensions.lockdelay=$TESTDIR/lockdelay.py clone source1a share-destrace2 > race2.log 2>&1 |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1136 $ wait |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1137 |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1138 $ hg -R share-destrace1 log -r tip |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1139 changeset: 2:e5bfe23c0b47 |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1140 bookmark: bookA |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1141 tag: tip |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1142 user: test |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1143 date: Thu Jan 01 00:00:00 1970 +0000 |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1144 summary: 1a |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1145 |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1146 |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1147 $ hg -R share-destrace2 log -r tip |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1148 changeset: 2:e5bfe23c0b47 |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1149 bookmark: bookA |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1150 tag: tip |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1151 user: test |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1152 date: Thu Jan 01 00:00:00 1970 +0000 |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1153 summary: 1a |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1154 |
30120
932faa29b4c1
test-clone: fix some instability in pooled clone race condition test
Augie Fackler <augie@google.com>
parents:
30041
diff
changeset
|
1155 One repo should be new, the other should be shared from the pool. We |
932faa29b4c1
test-clone: fix some instability in pooled clone race condition test
Augie Fackler <augie@google.com>
parents:
30041
diff
changeset
|
1156 don't care which is which, so we just make sure we always print the |
932faa29b4c1
test-clone: fix some instability in pooled clone race condition test
Augie Fackler <augie@google.com>
parents:
30041
diff
changeset
|
1157 one containing "new pooled" first, then one one containing "existing |
932faa29b4c1
test-clone: fix some instability in pooled clone race condition test
Augie Fackler <augie@google.com>
parents:
30041
diff
changeset
|
1158 pooled". |
932faa29b4c1
test-clone: fix some instability in pooled clone race condition test
Augie Fackler <augie@google.com>
parents:
30041
diff
changeset
|
1159 |
30121
bbbf6bbbd05f
test-clone: discard lock-related messages
Augie Fackler <augie@google.com>
parents:
30120
diff
changeset
|
1160 $ (grep 'new pooled' race1.log > /dev/null && cat race1.log || cat race2.log) | grep -v lock |
28289
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1161 (sharing from new pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1162 requesting all changes |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1163 adding changesets |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1164 adding manifests |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1165 adding file changes |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1166 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:
33794
diff
changeset
|
1167 new changesets b5f04eac9d8f:e5bfe23c0b47 |
28289
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1168 searching for changes |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1169 no changes found |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1170 adding remote bookmark bookA |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
1171 updating working directory |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
1172 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28289
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1173 |
30121
bbbf6bbbd05f
test-clone: discard lock-related messages
Augie Fackler <augie@google.com>
parents:
30120
diff
changeset
|
1174 $ (grep 'existing pooled' race1.log > /dev/null && cat race1.log || cat race2.log) | grep -v lock |
28289
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1175 (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1176 searching for changes |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1177 no changes found |
d493d64757eb
hg: obtain lock when creating share from pooled repo (issue5104)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
1178 adding remote bookmark bookA |
28632
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
1179 updating working directory |
a2c2dd399f3b
hg: perform update after pulling during clone with share (issue5103)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28289
diff
changeset
|
1180 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33651
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1181 |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1182 SEC: check for unsafe ssh url |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1183 |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1184 $ cat >> $HGRCPATH << EOF |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1185 > [ui] |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1186 > ssh = sh -c "read l; read l; read l" |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1187 > EOF |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1188 |
33651
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1189 $ hg clone 'ssh://-oProxyCommand=touch${IFS}owned/path' |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1190 abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path' |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1191 [255] |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1192 $ hg clone 'ssh://%2DoProxyCommand=touch${IFS}owned/path' |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1193 abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path' |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1194 [255] |
33658
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33657
diff
changeset
|
1195 $ hg clone 'ssh://fakehost|touch%20owned/path' |
45921
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45866
diff
changeset
|
1196 abort: no suitable response from remote hg |
33651
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1197 [255] |
33658
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33657
diff
changeset
|
1198 $ hg clone 'ssh://fakehost%7Ctouch%20owned/path' |
45921
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45866
diff
changeset
|
1199 abort: no suitable response from remote hg |
33651
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1200 [255] |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1201 |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1202 $ hg clone 'ssh://-oProxyCommand=touch owned%20foo@example.com/nonexistent/path' |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1203 abort: potentially unsafe url: 'ssh://-oProxyCommand=touch owned foo@example.com/nonexistent/path' |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1204 [255] |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1205 |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1206 #if windows |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1207 $ hg clone "ssh://%26touch%20owned%20/" --debug |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1208 running sh -c "read l; read l; read l" "&touch owned " "hg -R . serve --stdio" |
40176
41263df08109
wireprotov2: change how revisions are specified to changesetdata
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39819
diff
changeset
|
1209 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !) |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1210 sending hello command |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1211 sending between command |
46074
8dfcebd084b6
tests: drop the trailing exclamation point from some Windows abort messages
Matt Harbison <matt_harbison@yahoo.com>
parents:
45921
diff
changeset
|
1212 abort: no suitable response from remote hg |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1213 [255] |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1214 $ hg clone "ssh://example.com:%26touch%20owned%20/" --debug |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1215 running sh -c "read l; read l; read l" -p "&touch owned " example.com "hg -R . serve --stdio" |
40176
41263df08109
wireprotov2: change how revisions are specified to changesetdata
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39819
diff
changeset
|
1216 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !) |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1217 sending hello command |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1218 sending between command |
46074
8dfcebd084b6
tests: drop the trailing exclamation point from some Windows abort messages
Matt Harbison <matt_harbison@yahoo.com>
parents:
45921
diff
changeset
|
1219 abort: no suitable response from remote hg |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1220 [255] |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1221 #else |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1222 $ hg clone "ssh://%3btouch%20owned%20/" --debug |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1223 running sh -c "read l; read l; read l" ';touch owned ' 'hg -R . serve --stdio' |
40176
41263df08109
wireprotov2: change how revisions are specified to changesetdata
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39819
diff
changeset
|
1224 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !) |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1225 sending hello command |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1226 sending between command |
45921
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45866
diff
changeset
|
1227 abort: no suitable response from remote hg |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1228 [255] |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1229 $ hg clone "ssh://example.com:%3btouch%20owned%20/" --debug |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1230 running sh -c "read l; read l; read l" -p ';touch owned ' example.com 'hg -R . serve --stdio' |
40176
41263df08109
wireprotov2: change how revisions are specified to changesetdata
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39819
diff
changeset
|
1231 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !) |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1232 sending hello command |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1233 sending between command |
45921
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45866
diff
changeset
|
1234 abort: no suitable response from remote hg |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1235 [255] |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1236 #endif |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1237 |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1238 $ hg clone "ssh://v-alid.example.com/" --debug |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1239 running sh -c "read l; read l; read l" v-alid\.example\.com ['"]hg -R \. serve --stdio['"] (re) |
40176
41263df08109
wireprotov2: change how revisions are specified to changesetdata
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39819
diff
changeset
|
1240 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !) |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1241 sending hello command |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1242 sending between command |
45921
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45866
diff
changeset
|
1243 abort: no suitable response from remote hg |
33657
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1244 [255] |
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33651
diff
changeset
|
1245 |
33651
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1246 We should not have created a file named owned - if it exists, the |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1247 attack succeeded. |
0bcceb58b036
clone: add tests for unsafe ssh url (SEC)
Sean Farley <sean@farley.io>
parents:
33542
diff
changeset
|
1248 $ if test -f owned; then echo 'you got owned'; fi |
34885
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1249 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1250 Cloning without fsmonitor enabled does not print a warning for small repos |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1251 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1252 $ hg clone a fsmonitor-default |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1253 updating to bookmark @ on branch stable |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1254 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1255 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1256 Lower the warning threshold to simulate a large repo |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1257 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1258 $ cat >> $HGRCPATH << EOF |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1259 > [fsmonitor] |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1260 > warn_update_file_count = 2 |
45473
c1d6e930ac8a
fsmonitor: increase the threshold before we recommend it, when using rust
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
44724
diff
changeset
|
1261 > warn_update_file_count_rust = 2 |
34885
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1262 > EOF |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1263 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1264 We should see a warning about no fsmonitor on supported platforms |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1265 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1266 #if linuxormacos no-fsmonitor |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1267 $ hg clone a nofsmonitor |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1268 updating to bookmark @ on branch stable |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1269 (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor") |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1270 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1271 #else |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1272 $ hg clone a nofsmonitor |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1273 updating to bookmark @ on branch stable |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1274 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1275 #endif |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1276 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1277 We should not see warning about fsmonitor when it is enabled |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1278 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1279 #if fsmonitor |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1280 $ hg clone a fsmonitor-enabled |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1281 updating to bookmark @ on branch stable |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1282 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1283 #endif |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1284 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1285 We can disable the fsmonitor warning |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1286 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1287 $ hg --config fsmonitor.warn_when_unused=false clone a fsmonitor-disable-warning |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1288 updating to bookmark @ on branch stable |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1289 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1290 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1291 Loaded fsmonitor but disabled in config should still print warning |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1292 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1293 #if linuxormacos fsmonitor |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1294 $ hg --config fsmonitor.mode=off clone a fsmonitor-mode-off |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1295 updating to bookmark @ on branch stable |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1296 (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor") (fsmonitor !) |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1297 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1298 #endif |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1299 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1300 Warning not printed if working directory isn't empty |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1301 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1302 $ hg -q clone a fsmonitor-update |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1303 (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor") (?) |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1304 $ cd fsmonitor-update |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1305 $ hg up acb14030fe0a |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1306 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1307 (leaving bookmark @) |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1308 $ hg up cf0fe1914066 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1309 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1310 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1311 `hg update` from null revision also prints |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1312 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1313 $ hg up null |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1314 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1315 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1316 #if linuxormacos no-fsmonitor |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1317 $ hg up cf0fe1914066 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1318 (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor") |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1319 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1320 #else |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1321 $ hg up cf0fe1914066 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1322 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1323 #endif |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1324 |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1325 $ cd .. |
df2ff314e36f
fsmonitor: warn when fsmonitor could be used
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34866
diff
changeset
|
1326 |