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