annotate tests/test-clone.t @ 41163:0101a35deae2

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