annotate tests/test-convert-datesort.t @ 18510:f254ab6207ae stable

subrepo: use sharepath if available when locating the source repo This is an alternative fix for issue3518, enabling sharing of repositories with subrepos, without unconditionally setting the default path in the resulting repo's hgrc file. Better test coverage is added here, but won't prove this code is working until fd903f89e42b is backed out. The problem with the original fix is, if a default path is not available to be copied over from the share source, the default path on the resulting repo is set to the source location. Since that's where the actual repository is stored, the path is essentially self-referential, so push, pull, incoming and outgoing effectively operate on itself. While incoming and outgoing make it look like nothing was changed, push currently hangs (see issue3657). In this case where there is not a real default path, these operations should abort with "default(-push) not found", like the source repo would. Note this problem with the original fix affected repos without subrepos too.
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 27 Nov 2012 20:56:27 -0500
parents 41885892796e
children 05acdf8e1f23
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6100
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
1
12528
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
2 $ cat >> $HGRCPATH <<EOF
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
3 > [extensions]
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
4 > convert=
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
5 > graphlog=
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
6 > EOF
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
7 $ hg init t
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
8 $ cd t
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
9 $ echo a >> a
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
10 $ hg ci -Am a0 -d '1 0'
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
11 adding a
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
12 $ hg branch brancha
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
13 marked working directory as branch brancha
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 12528
diff changeset
14 (branches are permanent and global, did you want a bookmark?)
12528
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
15 $ echo a >> a
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
16 $ hg ci -m a1 -d '2 0'
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
17 $ echo a >> a
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
18 $ hg ci -m a2 -d '3 0'
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
19 $ echo a >> a
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
20 $ hg ci -m a3 -d '4 0'
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
21 $ hg up -C 0
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
23 $ hg branch branchb
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
24 marked working directory as branch branchb
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 12528
diff changeset
25 (branches are permanent and global, did you want a bookmark?)
12528
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
26 $ echo b >> b
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
27 $ hg ci -Am b0 -d '6 0'
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
28 adding b
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
29 $ hg up -C brancha
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
30 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
31 $ echo a >> a
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
32 $ hg ci -m a4 -d '5 0'
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
33 $ echo a >> a
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
34 $ hg ci -m a5 -d '7 0'
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
35 $ echo a >> a
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
36 $ hg ci -m a6 -d '8 0'
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
37 $ hg up -C branchb
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
38 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
39 $ echo b >> b
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
40 $ hg ci -m b1 -d '9 0'
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
41 $ cd ..
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
42
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
43 convert with datesort
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
44
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
45 $ hg convert --datesort t t-datesort
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
46 initializing destination t-datesort repository
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
47 scanning source...
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
48 sorting...
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
49 converting...
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
50 8 a0
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
51 7 a1
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
52 6 a2
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
53 5 a3
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
54 4 a4
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
55 3 b0
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
56 2 a5
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
57 1 a6
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
58 0 b1
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
59
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
60 graph converted repo
6100
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
61
12528
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
62 $ hg -R t-datesort glog --template '{rev} "{desc}"\n'
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
63 o 8 "b1"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
64 |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
65 | o 7 "a6"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
66 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
67 | o 6 "a5"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
68 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
69 o | 5 "b0"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
70 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
71 | o 4 "a4"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
72 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
73 | o 3 "a3"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
74 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
75 | o 2 "a2"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
76 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
77 | o 1 "a1"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
78 |/
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
79 o 0 "a0"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
80
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
81
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
82 convert with datesort (default mode)
6100
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
83
12528
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
84 $ hg convert t t-sourcesort
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
85 initializing destination t-sourcesort repository
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
86 scanning source...
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
87 sorting...
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
88 converting...
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
89 8 a0
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
90 7 a1
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
91 6 a2
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
92 5 a3
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
93 4 b0
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
94 3 a4
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
95 2 a5
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
96 1 a6
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
97 0 b1
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
98
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
99 graph converted repo
6100
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
100
12528
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
101 $ hg -R t-sourcesort glog --template '{rev} "{desc}"\n'
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
102 o 8 "b1"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
103 |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
104 | o 7 "a6"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
105 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
106 | o 6 "a5"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
107 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
108 | o 5 "a4"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
109 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
110 o | 4 "b0"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
111 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
112 | o 3 "a3"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
113 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
114 | o 2 "a2"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
115 | |
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
116 | o 1 "a1"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
117 |/
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
118 o 0 "a0"
f6b206417ba4 tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents: 8692
diff changeset
119