annotate tests/test-children.t @ 42341:27d6956d386b

match: use '' instead of '.' for root directory (API) I think '' is generally a better value for the root directory than '.' is. For example, os.path.join('', 'foo') => 'foo', while os.path.join('.', 'foo') => './foo'. This patch mostly makes it so we use '' internally in match.py. However, it also affects the API in visitdir(), visitchildrenset() and files(). The two former now also accept '' as input. I've updated the callers of these methods. I've also added a deprecation warning for passing '.' (for external callers). The only caller I could find that was affected by files() returning '' instead of '.' was in dirstate.walk(). I've updated that. The next few patches show some workarounds we can remove by using '' instead of '.'. Differential Revision: https://phab.mercurial-scm.org/D6401
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 15 May 2017 00:12:19 -0700
parents 7c8524efd847
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
1 test children command
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
3 $ cat <<EOF >> $HGRCPATH
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
4 > [extensions]
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
5 > children =
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
6 > EOF
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
7
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
8 init
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
9 $ hg init t
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
10 $ cd t
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
11
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
12 no working directory
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
13 $ hg children
4783
8b90d763ea90 Add extension to provide the 'hg children' command (with tests)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
14
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
15 setup
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
16 $ echo 0 > file0
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
17 $ hg ci -qAm 0 -d '0 0'
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
18
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
19 $ echo 1 > file1
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
20 $ hg ci -qAm 1 -d '1 0'
4783
8b90d763ea90 Add extension to provide the 'hg children' command (with tests)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
21
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
22 $ echo 2 >> file0
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
23 $ hg ci -qAm 2 -d '2 0'
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
24
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
25 $ hg co null
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
26 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
27 $ echo 3 > file3
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
28 $ hg ci -qAm 3 -d '3 0'
4783
8b90d763ea90 Add extension to provide the 'hg children' command (with tests)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
29
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
30 hg children at revision 3 (tip)
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
31 $ hg children
4783
8b90d763ea90 Add extension to provide the 'hg children' command (with tests)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
32
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
33 $ hg co null
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
34 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4783
8b90d763ea90 Add extension to provide the 'hg children' command (with tests)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
35
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
36 hg children at nullrev (should be 0 and 3)
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
37 $ hg children
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
38 changeset: 0:4df8521a7374
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
39 user: test
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
40 date: Thu Jan 01 00:00:00 1970 +0000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
41 summary: 0
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
42
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
43 changeset: 3:e2962852269d
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
44 tag: tip
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
45 parent: -1:000000000000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
46 user: test
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
47 date: Thu Jan 01 00:00:03 1970 +0000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
48 summary: 3
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
49
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
50 $ hg co 1
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
51 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
4783
8b90d763ea90 Add extension to provide the 'hg children' command (with tests)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
52
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
53 hg children at revision 1 (should be 2)
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
54 $ hg children
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
55 changeset: 2:8f5eea5023c2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
56 user: test
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
57 date: Thu Jan 01 00:00:02 1970 +0000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
58 summary: 2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
59
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
60 $ hg co 2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4783
8b90d763ea90 Add extension to provide the 'hg children' command (with tests)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
62
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
63 hg children at revision 2 (other head)
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
64 $ hg children
4783
8b90d763ea90 Add extension to provide the 'hg children' command (with tests)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
65
37357
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
66 $ for i in null 0 1 2 3 '2^'; do
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
67 > echo "hg children -r '$i'"
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
68 > hg children -r $i
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
69 > done
37357
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
70 hg children -r 'null'
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
71 changeset: 0:4df8521a7374
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
72 user: test
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
73 date: Thu Jan 01 00:00:00 1970 +0000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
74 summary: 0
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
75
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
76 changeset: 3:e2962852269d
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
77 tag: tip
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
78 parent: -1:000000000000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
79 user: test
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
80 date: Thu Jan 01 00:00:03 1970 +0000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
81 summary: 3
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
82
37357
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
83 hg children -r '0'
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
84 changeset: 1:708c093edef0
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
85 user: test
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
86 date: Thu Jan 01 00:00:01 1970 +0000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
87 summary: 1
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
88
37357
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
89 hg children -r '1'
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
90 changeset: 2:8f5eea5023c2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
91 user: test
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
92 date: Thu Jan 01 00:00:02 1970 +0000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
93 summary: 2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
94
37357
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
95 hg children -r '2'
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
96 hg children -r '3'
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
97 hg children -r '2^'
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
98 changeset: 2:8f5eea5023c2
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
99 user: test
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
100 date: Thu Jan 01 00:00:02 1970 +0000
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
101 summary: 2
7c8524efd847 children: support specifying revision by revset
Martin von Zweigbergk <martinvonz@google.com>
parents: 24482
diff changeset
102
4783
8b90d763ea90 Add extension to provide the 'hg children' command (with tests)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
103
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
104 hg children -r 0 file0 (should be 2)
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
105 $ hg children -r 0 file0
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
106 changeset: 2:8f5eea5023c2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
107 user: test
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
108 date: Thu Jan 01 00:00:02 1970 +0000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
109 summary: 2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
110
4783
8b90d763ea90 Add extension to provide the 'hg children' command (with tests)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
111
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
112 hg children -r 1 file0 (should be 2)
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
113 $ hg children -r 1 file0
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
114 changeset: 2:8f5eea5023c2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
115 user: test
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
116 date: Thu Jan 01 00:00:02 1970 +0000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
117 summary: 2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
118
4783
8b90d763ea90 Add extension to provide the 'hg children' command (with tests)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
119
11920
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
120 $ hg co 0
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
121 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
122
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
123 hg children file0 at revision 0 (should be 2)
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
124 $ hg children file0
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
125 changeset: 2:8f5eea5023c2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
126 user: test
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
127 date: Thu Jan 01 00:00:02 1970 +0000
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
128 summary: 2
d0a7e700b5d1 tests: unify test-children
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 10119
diff changeset
129
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 11920
diff changeset
130
24482
3eb9045396b0 children: don't pass filectx to displayer
Yuya Nishihara <yuya@tcha.org>
parents: 16913
diff changeset
131 should be compatible with templater (don't pass fctx to displayer)
3eb9045396b0 children: don't pass filectx to displayer
Yuya Nishihara <yuya@tcha.org>
parents: 16913
diff changeset
132 $ hg children file0 -Tdefault
3eb9045396b0 children: don't pass filectx to displayer
Yuya Nishihara <yuya@tcha.org>
parents: 16913
diff changeset
133 changeset: 2:8f5eea5023c2
3eb9045396b0 children: don't pass filectx to displayer
Yuya Nishihara <yuya@tcha.org>
parents: 16913
diff changeset
134 user: test
3eb9045396b0 children: don't pass filectx to displayer
Yuya Nishihara <yuya@tcha.org>
parents: 16913
diff changeset
135 date: Thu Jan 01 00:00:02 1970 +0000
3eb9045396b0 children: don't pass filectx to displayer
Yuya Nishihara <yuya@tcha.org>
parents: 16913
diff changeset
136 summary: 2
3eb9045396b0 children: don't pass filectx to displayer
Yuya Nishihara <yuya@tcha.org>
parents: 16913
diff changeset
137
3eb9045396b0 children: don't pass filectx to displayer
Yuya Nishihara <yuya@tcha.org>
parents: 16913
diff changeset
138
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 11920
diff changeset
139 $ cd ..