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