annotate tests/test-clone.t @ 17863:034e55bbf7c0 stable

amend: fix incompatibity between logfile and message option (issue3675) Bug introduced by 9732473aa24b
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 24 Oct 2012 15:37:32 +0200
parents 92980a8dfdfe
children c79b404b99ae
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
1 Prepare repo a:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
2
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 13058
diff changeset
3 $ hg init a
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
4 $ cd a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
5 $ echo a > a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
6 $ hg add a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
7 $ hg commit -m test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
8 $ echo first line > b
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
9 $ hg add b
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
10
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
11 Create a non-inlined filelog:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
12
15522
cf0f3cb8a332 tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents: 15521
diff changeset
13 $ python -c 'file("data1", "wb").write("".join("%s\n" % x for x in range(10000)))'
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
14 $ for j in 0 1 2 3 4 5 6 7 8 9; do
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
15 > cat data1 >> b
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
16 > hg commit -m test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
17 > done
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
18
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
19 List files in store/data (should show a 'b.d'):
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
20
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
21 $ for i in .hg/store/data/*; do
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
22 > echo $i
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
23 > done
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
24 .hg/store/data/a.i
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
25 .hg/store/data/b.d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
26 .hg/store/data/b.i
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
27
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
28 Default operation:
550
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset
29
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
30 $ hg clone . ../b
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
31 updating to branch default
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
32 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
33 $ cd ../b
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
34 $ cat a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
35 a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
36 $ hg verify
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
37 checking changesets
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
38 checking manifests
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
39 crosschecking files in changesets and manifests
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
40 checking files
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
41 2 files, 11 changesets, 11 total revisions
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
42
13058
5986f44ea63c test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents: 12847
diff changeset
43 Invalid dest '' must abort:
5986f44ea63c test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents: 12847
diff changeset
44
5986f44ea63c test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents: 12847
diff changeset
45 $ 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
46 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
47 [255]
5986f44ea63c test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents: 12847
diff changeset
48
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
49 No update, with debug option:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
50
16971
8aeb2f1ae94c tests: introduce hghave hardlinks
Mads Kiilerich <mads@kiilerich.com>
parents: 16898
diff changeset
51 #if hardlink
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
52 $ hg --debug clone -U . ../c
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
53 linked 8 files
17293
d3f84ccc5495 pushkey: add more verbose debug output regarding pushkey
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17159
diff changeset
54 listing keys for "bookmarks"
16971
8aeb2f1ae94c tests: introduce hghave hardlinks
Mads Kiilerich <mads@kiilerich.com>
parents: 16898
diff changeset
55 #else
8aeb2f1ae94c tests: introduce hghave hardlinks
Mads Kiilerich <mads@kiilerich.com>
parents: 16898
diff changeset
56 $ hg --debug clone -U . ../c
8aeb2f1ae94c tests: introduce hghave hardlinks
Mads Kiilerich <mads@kiilerich.com>
parents: 16898
diff changeset
57 copied 8 files
17307
a028ce66e2b7 test-clone: fix for vfat
Adrian Buehlmann <adrian@cadifra.com>
parents: 17293
diff changeset
58 listing keys for "bookmarks"
16971
8aeb2f1ae94c tests: introduce hghave hardlinks
Mads Kiilerich <mads@kiilerich.com>
parents: 16898
diff changeset
59 #endif
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
60 $ cd ../c
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
61 $ cat a 2>/dev/null || echo "a not present"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
62 a not present
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
63 $ hg verify
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
64 checking changesets
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
65 checking manifests
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
66 crosschecking files in changesets and manifests
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
67 checking files
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
68 2 files, 11 changesets, 11 total revisions
550
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset
69
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
70 Default destination:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
71
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
72 $ mkdir ../d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
73 $ cd ../d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
74 $ hg clone ../a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
75 destination directory: a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
76 updating to branch default
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
77 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
78 $ cd a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
79 $ hg cat a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
80 a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
81 $ cd ../..
550
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset
82
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
83 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
84
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
85 $ hg clone file:a e
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
86 updating to branch default
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
87 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
88 $ grep 'file:' e/.hg/hgrc
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11839
diff changeset
89 [1]
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
90
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
91 Check that path aliases are expanded:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
92
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
93 $ 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
94 $ hg -R f showconfig paths.default
15520
d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows
Mads Kiilerich <mads@kiilerich.com>
parents: 14553
diff changeset
95 $TESTTMP/a#0 (glob)
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
96
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
97 Use --pull:
550
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset
98
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
99 $ hg clone --pull a g
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
100 requesting all changes
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
101 adding changesets
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
102 adding manifests
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
103 adding file changes
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
104 added 11 changesets with 11 changes to 2 files
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
105 updating to branch default
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
106 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
107 $ hg -R g verify
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
108 checking changesets
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
109 checking manifests
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
110 crosschecking files in changesets and manifests
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
111 checking files
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
112 2 files, 11 changesets, 11 total revisions
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
113
13058
5986f44ea63c test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents: 12847
diff changeset
114 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
115
5986f44ea63c test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents: 12847
diff changeset
116 $ 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
117 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
118 [255]
5986f44ea63c test-clone.t: add basic cases for destination ''
Adrian Buehlmann <adrian@cadifra.com>
parents: 12847
diff changeset
119
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
120 Clone to '.':
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
121
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
122 $ mkdir h
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
123 $ cd h
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
124 $ hg clone ../a .
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
125 updating to branch default
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
126 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
127 $ cd ..
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
128
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
129
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
130 *** 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
131
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
132 Adding some more history to repo a:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
133
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
134 $ cd a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
135 $ hg tag ref1
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
136 $ echo the quick brown fox >a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
137 $ hg ci -m "hacked default"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
138 $ hg up ref1
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
139 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
140 $ hg branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
141 marked working directory as branch stable
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 14553
diff changeset
142 (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
143 $ echo some text >a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
144 $ hg ci -m "starting branch stable"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
145 $ hg tag ref2
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
146 $ echo some more text >a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
147 $ hg ci -m "another change for branch stable"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
148 $ hg up ref2
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
149 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
150 $ hg parents
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
151 changeset: 13:e8ece76546a6
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
152 branch: stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
153 tag: ref2
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
154 parent: 10:a7949464abda
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
155 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
156 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
157 summary: starting branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
158
5225
76c4cadb49fc clone: remove "file://" before making the path absolute
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1926
diff changeset
159
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
160 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
161
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
162 $ hg heads
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
163 changeset: 15:0aae7cf88f0d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
164 branch: stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
165 tag: tip
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
166 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
167 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
168 summary: another change for branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
169
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
170 changeset: 12:f21241060d6a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
171 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
172 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
173 summary: hacked default
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
174
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
175
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
176 $ cd ..
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
177
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 Testing --noupdate with --updaterev (must abort):
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
180
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
181 $ hg clone --noupdate --updaterev 1 a ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
182 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
183 [255]
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
184
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
185
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
186 Testing clone -u:
6947
a7fcb43af82e increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 6088
diff changeset
187
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
188 $ hg clone -u . a ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
189 updating to branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
190 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
191
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
192 Repo ua has both heads:
7927
a218ba5f60df allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents: 6947
diff changeset
193
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
194 $ hg -R ua heads
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
195 changeset: 15:0aae7cf88f0d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
196 branch: stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
197 tag: tip
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
198 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
199 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
200 summary: another change for branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
201
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
202 changeset: 12:f21241060d6a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
203 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
204 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
205 summary: hacked default
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
206
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
207
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
208 Same revision checked out in repo a and ua:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
209
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
210 $ hg -R a parents --template "{node|short}\n"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
211 e8ece76546a6
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
212 $ hg -R ua parents --template "{node|short}\n"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
213 e8ece76546a6
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
214
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
215 $ rm -r ua
9714
2f1ab7f77ddc clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
216
2f1ab7f77ddc clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
217
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
218 Testing clone --pull -u:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
219
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
220 $ hg clone --pull -u . a ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
221 requesting all changes
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
222 adding changesets
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
223 adding manifests
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
224 adding file changes
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
225 added 16 changesets with 16 changes to 3 files (+1 heads)
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
226 updating to branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
227 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
228
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
229 Repo ua has both heads:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
230
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
231 $ hg -R ua heads
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
232 changeset: 15:0aae7cf88f0d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
233 branch: stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
234 tag: tip
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
235 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
236 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
237 summary: another change for branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
238
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
239 changeset: 12:f21241060d6a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
240 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
241 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
242 summary: hacked default
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
243
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
244
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
245 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
246
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
247 $ hg -R a parents --template "{node|short}\n"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
248 e8ece76546a6
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
249 $ hg -R ua parents --template "{node|short}\n"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
250 e8ece76546a6
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
251
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
252 $ rm -r ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
253
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
254
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
255 Testing clone -u <branch>:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
256
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
257 $ hg clone -u stable a ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
258 updating to branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
259 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
260
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
261 Repo ua has both heads:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
262
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
263 $ hg -R ua heads
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
264 changeset: 15:0aae7cf88f0d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
265 branch: stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
266 tag: tip
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
267 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
268 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
269 summary: another change for branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
270
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
271 changeset: 12:f21241060d6a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
272 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
273 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
274 summary: hacked default
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
275
9714
2f1ab7f77ddc clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
276
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
277 Branch 'stable' is checked out:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
278
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
279 $ hg -R ua parents
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
280 changeset: 15:0aae7cf88f0d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
281 branch: stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
282 tag: tip
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
283 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
284 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
285 summary: another change for branch stable
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
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
288 $ rm -r ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
289
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
290
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
291 Testing default checkout:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
292
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
293 $ hg clone a ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
294 updating to branch default
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
295 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
296
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
297 Repo ua has both heads:
9714
2f1ab7f77ddc clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
298
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
299 $ hg -R ua heads
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
300 changeset: 15:0aae7cf88f0d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
301 branch: stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
302 tag: tip
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
303 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
304 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
305 summary: another change for branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
306
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
307 changeset: 12:f21241060d6a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
308 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
309 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
310 summary: hacked default
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 Branch 'default' is checked out:
9714
2f1ab7f77ddc clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
314
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
315 $ hg -R ua parents
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
316 changeset: 12:f21241060d6a
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
317 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
318 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
319 summary: hacked default
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
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
322 $ rm -r ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
323
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
324
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
325 Testing #<branch>:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
326
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
327 $ hg clone -u . a#stable ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
328 adding changesets
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
329 adding manifests
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
330 adding file changes
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
331 added 14 changesets with 14 changes to 3 files
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
332 updating to branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
333 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
334
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
335 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
336
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
337 $ hg -R ua heads
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
338 changeset: 13:0aae7cf88f0d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
339 branch: stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
340 tag: tip
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
341 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
342 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
343 summary: another change for branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
344
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
345 changeset: 10:a7949464abda
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
346 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
347 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
348 summary: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
349
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 Same revision checked out in repo a and ua:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
352
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
353 $ hg -R a parents --template "{node|short}\n"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
354 e8ece76546a6
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
355 $ hg -R ua parents --template "{node|short}\n"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
356 e8ece76546a6
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
357
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
358 $ rm -r ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
359
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
360
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
361 Testing -u -r <branch>:
9714
2f1ab7f77ddc clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
362
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
363 $ hg clone -u . -r stable a ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
364 adding changesets
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
365 adding manifests
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
366 adding file changes
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
367 added 14 changesets with 14 changes to 3 files
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
368 updating to branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
369 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
370
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
371 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
372
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
373 $ hg -R ua heads
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
374 changeset: 13:0aae7cf88f0d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
375 branch: stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
376 tag: tip
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
377 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
378 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
379 summary: another change for branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
380
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
381 changeset: 10:a7949464abda
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
382 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
383 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
384 summary: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
385
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
386
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
387 Same revision checked out in repo a and ua:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
388
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
389 $ hg -R a parents --template "{node|short}\n"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
390 e8ece76546a6
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
391 $ hg -R ua parents --template "{node|short}\n"
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
392 e8ece76546a6
9714
2f1ab7f77ddc clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
393
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
394 $ rm -r ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
395
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
396
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
397 Testing -r <branch>:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
398
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
399 $ hg clone -r stable a ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
400 adding changesets
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
401 adding manifests
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
402 adding file changes
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
403 added 14 changesets with 14 changes to 3 files
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
404 updating to branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
405 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
406
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
407 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
408
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
409 $ hg -R ua heads
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
410 changeset: 13:0aae7cf88f0d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
411 branch: stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
412 tag: tip
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
413 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
414 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
415 summary: another change for branch stable
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 changeset: 10:a7949464abda
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
418 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
419 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
420 summary: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
421
9714
2f1ab7f77ddc clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
422
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
423 Branch 'stable' is checked out:
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
424
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
425 $ hg -R ua parents
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
426 changeset: 13:0aae7cf88f0d
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
427 branch: stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
428 tag: tip
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
429 user: test
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
430 date: Thu Jan 01 00:00:00 1970 +0000
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
431 summary: another change for branch stable
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
432
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
433
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
434 $ rm -r ua
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
435
9714
2f1ab7f77ddc clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
436
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
437 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
438 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
439
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
440 $ cat <<EOF > simpleclone.py
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
441 > from mercurial import ui, hg
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
442 > myui = ui.ui()
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
443 > 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
444 > hg.clone(myui, {}, repo, dest="ua")
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
445 > EOF
11544
be5e86c80628 hg.clone: fix branch value when passing a repo object (issue2267)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11295
diff changeset
446
11806
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
447 $ python simpleclone.py
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
448 updating to branch default
fd66a181f575 tests: unify test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents: 11544
diff changeset
449 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
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
11839
8c034517b406 test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents: 11823
diff changeset
453 $ cat <<EOF > branchclone.py
17135
06733dfe1a43 test-clone: load extensions before doing anything
Bryan O'Sullivan <bryano@fb.com>
parents: 16971
diff changeset
454 > from mercurial import ui, hg, extensions
11839
8c034517b406 test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents: 11823
diff changeset
455 > myui = ui.ui()
17135
06733dfe1a43 test-clone: load extensions before doing anything
Bryan O'Sullivan <bryano@fb.com>
parents: 16971
diff changeset
456 > extensions.loadall(myui)
11839
8c034517b406 test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents: 11823
diff changeset
457 > 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
458 > 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
459 > 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
460
11839
8c034517b406 test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents: 11823
diff changeset
461 $ python branchclone.py
8c034517b406 test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents: 11823
diff changeset
462 adding changesets
8c034517b406 test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents: 11823
diff changeset
463 adding manifests
8c034517b406 test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents: 11823
diff changeset
464 adding file changes
8c034517b406 test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents: 11823
diff changeset
465 added 14 changesets with 14 changes to 3 files
8c034517b406 test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents: 11823
diff changeset
466 updating to branch stable
8c034517b406 test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb
Martin Geisler <mg@aragost.com>
parents: 11823
diff changeset
467 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
468 $ rm -r ua
16847
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
469
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
470
17756
92980a8dfdfe clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents: 17424
diff changeset
471 Test clone with special '@' bookmark:
92980a8dfdfe clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents: 17424
diff changeset
472 $ cd a
92980a8dfdfe clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents: 17424
diff changeset
473 $ 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
474 $ hg clone . ../i
92980a8dfdfe clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents: 17424
diff changeset
475 updating to branch default
92980a8dfdfe clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents: 17424
diff changeset
476 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
477 $ hg id -i ../i
92980a8dfdfe clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents: 17424
diff changeset
478 a7949464abda
92980a8dfdfe clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents: 17424
diff changeset
479
92980a8dfdfe clone: update to @ bookmark if it exists
Kevin Bullock <kbullock@ringworld.org>
parents: 17424
diff changeset
480
16847
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
481 Testing failures:
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
482
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
483 $ mkdir fail
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
484 $ cd fail
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
485
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
486 No local source
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
487
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
488 $ hg clone a b
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
489 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
490 [255]
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
491
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
492 No remote source
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
493
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
494 $ hg clone http://127.0.0.1:3121/a b
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
495 abort: error: *refused* (glob)
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
496 [255]
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
497 $ 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
498
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
499
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
500 #if unix-permissions
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
501
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
502 Inaccessible source
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
503
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
504 $ mkdir a
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
505 $ chmod 000 a
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
506 $ hg clone a b
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
507 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
508 [255]
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
509
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
510 Inaccessible destination
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
511
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
512 $ hg init b
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
513 $ cd b
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
514 $ hg clone . ../a
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
515 abort: Permission denied: ../a
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
516 [255]
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
517 $ cd ..
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
518 $ chmod 700 a
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
519 $ rm -r a b
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
520
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
521 #endif
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
522
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
523
16898
bb91c602d4ad tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16847
diff changeset
524 #if fifo
bb91c602d4ad tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16847
diff changeset
525
16847
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
526 Source of wrong type
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
527
16898
bb91c602d4ad tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16847
diff changeset
528 $ mkfifo a
bb91c602d4ad tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16847
diff changeset
529 $ 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
530 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
531 [255]
bb91c602d4ad tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16847
diff changeset
532 $ rm a
bb91c602d4ad tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16847
diff changeset
533
bb91c602d4ad tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16847
diff changeset
534 #endif
16847
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
535
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
536 Default destination, same directory
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
537
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
538 $ hg init q
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
539 $ hg clone q
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
540 destination directory: q
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
541 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
542 [255]
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
543
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
544 destination directory not empty
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
545
17345
4f8054d3171b check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17307
diff changeset
546 $ mkdir a
16847
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
547 $ echo stuff > a/a
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
548 $ hg clone q a
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
549 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
550 [255]
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
551
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
552
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
553 #if unix-permissions
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
554
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
555 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
556
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
557 $ hg init c
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
558 $ cd c
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
559 $ echo c > c
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
560 $ 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
561 adding c
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
562 $ 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
563 $ cd ..
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
564 $ mkdir d
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
565 $ 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
566 [255]
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
567 $ test -d d
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
568 $ test -d d/.hg
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
569 [1]
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
570
17424
e7cfe3587ea4 fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
571 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
572
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
573 $ 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
574
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
575 #endif
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
576
cda5402b1739 tests: roll test-clone-failure.t into test-clone.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 15623
diff changeset
577 $ cd ..