Mercurial > hg
annotate tests/test-paths.t @ 33611:a2b55ee62803 stable
tests: make pdiff return appropriate exit code at comparison of files
Before this patch, pdiff script returns 0, even if diff is detected.
This issue doesn't cause failure of tests using it, if it is invoked
via extdiff extension, because extdiff itself examines changes between
specified revisions and decides exit code.
BTW, this patch ignores recursive comparison case, because:
- there is no portable way for current while-read based
implementation to return 1 at detecting changes
- it isn't yet needed to replace direct "diff -r" invocation by
pdiff for portability
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Mon, 31 Jul 2017 13:10:19 +0900 |
parents | 21299e1fb446 |
children | 8c3dd5e462cc |
rev | line source |
---|---|
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
1 $ hg init a |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
2 $ hg clone a b |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
3 updating to branch default |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
5 $ cd a |
27726
7e9dc8bbebf6
paths: use single loop for both search=None|pattern cases
Yuya Nishihara <yuya@tcha.org>
parents:
27329
diff
changeset
|
6 |
7e9dc8bbebf6
paths: use single loop for both search=None|pattern cases
Yuya Nishihara <yuya@tcha.org>
parents:
27329
diff
changeset
|
7 with no paths: |
7e9dc8bbebf6
paths: use single loop for both search=None|pattern cases
Yuya Nishihara <yuya@tcha.org>
parents:
27329
diff
changeset
|
8 |
7e9dc8bbebf6
paths: use single loop for both search=None|pattern cases
Yuya Nishihara <yuya@tcha.org>
parents:
27329
diff
changeset
|
9 $ hg paths |
7e9dc8bbebf6
paths: use single loop for both search=None|pattern cases
Yuya Nishihara <yuya@tcha.org>
parents:
27329
diff
changeset
|
10 $ hg paths unknown |
7e9dc8bbebf6
paths: use single loop for both search=None|pattern cases
Yuya Nishihara <yuya@tcha.org>
parents:
27329
diff
changeset
|
11 not found! |
7e9dc8bbebf6
paths: use single loop for both search=None|pattern cases
Yuya Nishihara <yuya@tcha.org>
parents:
27329
diff
changeset
|
12 [1] |
27728
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
13 $ hg paths -Tjson |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
14 [ |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
15 ] |
27726
7e9dc8bbebf6
paths: use single loop for both search=None|pattern cases
Yuya Nishihara <yuya@tcha.org>
parents:
27329
diff
changeset
|
16 |
7e9dc8bbebf6
paths: use single loop for both search=None|pattern cases
Yuya Nishihara <yuya@tcha.org>
parents:
27329
diff
changeset
|
17 with paths: |
7e9dc8bbebf6
paths: use single loop for both search=None|pattern cases
Yuya Nishihara <yuya@tcha.org>
parents:
27329
diff
changeset
|
18 |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
19 $ echo '[paths]' >> .hg/hgrc |
27320
59d5f619e69e
paths: include #fragment again
Yuya Nishihara <yuya@tcha.org>
parents:
16913
diff
changeset
|
20 $ echo 'dupe = ../b#tip' >> .hg/hgrc |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
21 $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
22 $ hg in dupe |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
23 comparing with $TESTTMP/b (glob) |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
24 no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11785
diff
changeset
|
25 [1] |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
26 $ cd .. |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
27 $ hg -R a in dupe |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
28 comparing with $TESTTMP/b (glob) |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
29 no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11785
diff
changeset
|
30 [1] |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
31 $ cd a |
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
32 $ hg paths |
27320
59d5f619e69e
paths: include #fragment again
Yuya Nishihara <yuya@tcha.org>
parents:
16913
diff
changeset
|
33 dupe = $TESTTMP/b#tip (glob) |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
34 expand = $TESTTMP/a/$SOMETHING/bar (glob) |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
35 $ SOMETHING=foo hg paths |
27320
59d5f619e69e
paths: include #fragment again
Yuya Nishihara <yuya@tcha.org>
parents:
16913
diff
changeset
|
36 dupe = $TESTTMP/b#tip (glob) |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
37 expand = $TESTTMP/a/foo/bar (glob) |
16843
61f3ca8e4d39
test-paths.t: enable for Windows using #if
Adrian Buehlmann <adrian@cadifra.com>
parents:
15567
diff
changeset
|
38 #if msys |
61f3ca8e4d39
test-paths.t: enable for Windows using #if
Adrian Buehlmann <adrian@cadifra.com>
parents:
15567
diff
changeset
|
39 $ SOMETHING=//foo hg paths |
27320
59d5f619e69e
paths: include #fragment again
Yuya Nishihara <yuya@tcha.org>
parents:
16913
diff
changeset
|
40 dupe = $TESTTMP/b#tip (glob) |
16843
61f3ca8e4d39
test-paths.t: enable for Windows using #if
Adrian Buehlmann <adrian@cadifra.com>
parents:
15567
diff
changeset
|
41 expand = /foo/bar |
61f3ca8e4d39
test-paths.t: enable for Windows using #if
Adrian Buehlmann <adrian@cadifra.com>
parents:
15567
diff
changeset
|
42 #else |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
43 $ SOMETHING=/foo hg paths |
27320
59d5f619e69e
paths: include #fragment again
Yuya Nishihara <yuya@tcha.org>
parents:
16913
diff
changeset
|
44 dupe = $TESTTMP/b#tip (glob) |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
45 expand = /foo/bar |
16843
61f3ca8e4d39
test-paths.t: enable for Windows using #if
Adrian Buehlmann <adrian@cadifra.com>
parents:
15567
diff
changeset
|
46 #endif |
14331
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
47 $ hg paths -q |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
48 dupe |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
49 expand |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
50 $ hg paths dupe |
27320
59d5f619e69e
paths: include #fragment again
Yuya Nishihara <yuya@tcha.org>
parents:
16913
diff
changeset
|
51 $TESTTMP/b#tip (glob) |
14331
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
52 $ hg paths -q dupe |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
53 $ hg paths unknown |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
54 not found! |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
55 [1] |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
56 $ hg paths -q unknown |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
57 [1] |
27728
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
58 |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
59 formatter output with paths: |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
60 |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
61 $ echo 'dupe:pushurl = https://example.com/dupe' >> .hg/hgrc |
28173
1ff28873830e
test-paths: fix up json output to match $TESTTMP on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
27728
diff
changeset
|
62 $ hg paths -Tjson | sed 's|\\\\|\\|g' |
27728
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
63 [ |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
64 { |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
65 "name": "dupe", |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
66 "pushurl": "https://example.com/dupe", |
28173
1ff28873830e
test-paths: fix up json output to match $TESTTMP on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
27728
diff
changeset
|
67 "url": "$TESTTMP/b#tip" (glob) |
27728
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
68 }, |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
69 { |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
70 "name": "expand", |
28173
1ff28873830e
test-paths: fix up json output to match $TESTTMP on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
27728
diff
changeset
|
71 "url": "$TESTTMP/a/$SOMETHING/bar" (glob) |
27728
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
72 } |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
73 ] |
28173
1ff28873830e
test-paths: fix up json output to match $TESTTMP on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
27728
diff
changeset
|
74 $ hg paths -Tjson dupe | sed 's|\\\\|\\|g' |
27728
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
75 [ |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
76 { |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
77 "name": "dupe", |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
78 "pushurl": "https://example.com/dupe", |
28173
1ff28873830e
test-paths: fix up json output to match $TESTTMP on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
27728
diff
changeset
|
79 "url": "$TESTTMP/b#tip" (glob) |
27728
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
80 } |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
81 ] |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
82 $ hg paths -Tjson -q unknown |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
83 [ |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
84 ] |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
85 [1] |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
86 |
33414
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
87 log template: |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
88 |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
89 (behaves as a {name: path-string} dict by default) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
90 |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
91 $ hg log -rnull -T '{peerpaths}\n' |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
92 dupe=$TESTTMP/b#tip expand=$TESTTMP/a/$SOMETHING/bar (glob) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
93 $ hg log -rnull -T '{join(peerpaths, "\n")}\n' |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
94 dupe=$TESTTMP/b#tip (glob) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
95 expand=$TESTTMP/a/$SOMETHING/bar (glob) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
96 $ hg log -rnull -T '{peerpaths % "{name}: {path}\n"}' |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
97 dupe: $TESTTMP/a/$SOMETHING/bar (glob) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
98 expand: $TESTTMP/a/$SOMETHING/bar (glob) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
99 $ hg log -rnull -T '{get(peerpaths, "dupe")}\n' |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
100 $TESTTMP/a/$SOMETHING/bar (glob) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
101 |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
102 (but a path is actually a dict of url and sub-options) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
103 |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
104 $ hg log -rnull -T '{join(get(peerpaths, "dupe"), "\n")}\n' |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
105 url=$TESTTMP/b#tip (glob) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
106 pushurl=https://example.com/dupe |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
107 $ hg log -rnull -T '{get(peerpaths, "dupe") % "{key}: {value}\n"}' |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
108 url: $TESTTMP/b#tip (glob) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
109 pushurl: https://example.com/dupe |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
110 $ hg log -rnull -T '{get(get(peerpaths, "dupe"), "pushurl")}\n' |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
111 https://example.com/dupe |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
112 |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
113 (so there's weird behavior) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
114 |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
115 $ hg log -rnull -T '{get(peerpaths, "dupe")|count}\n' |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
116 2 |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
117 $ hg log -rnull -T '{get(peerpaths, "dupe")|stringify|count}\n' |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
118 [0-9]{2,} (re) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
119 |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
120 (in JSON, it's a dict of dicts) |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
121 |
33430
21299e1fb446
test-paths: mask out JSON specific path differences for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33414
diff
changeset
|
122 $ hg log -rnull -T '{peerpaths|json}\n' | sed 's|\\\\|/|g' |
21299e1fb446
test-paths: mask out JSON specific path differences for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33414
diff
changeset
|
123 {"dupe": {"pushurl": "https://example.com/dupe", "url": "$TESTTMP/b#tip"}, "expand": {"url": "$TESTTMP/a/$SOMETHING/bar"}} |
33414
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
124 |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
125 password should be masked in plain output, but not in machine-readable/template |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
126 output: |
27728
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
127 |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
128 $ echo 'insecure = http://foo:insecure@example.com/' >> .hg/hgrc |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
129 $ hg paths insecure |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
130 http://foo:***@example.com/ |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
131 $ hg paths -Tjson insecure |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
132 [ |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
133 { |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
134 "name": "insecure", |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
135 "url": "http://foo:insecure@example.com/" |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
136 } |
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
137 ] |
33414
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
138 $ hg log -rnull -T '{get(peerpaths, "insecure")}\n' |
16ed67164002
templatekw: export ui.paths as {peerpaths}
Yuya Nishihara <yuya@tcha.org>
parents:
28218
diff
changeset
|
139 http://foo:insecure@example.com/ |
27728
294037159c64
paths: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
27726
diff
changeset
|
140 |
28038
72f2a19c5f88
zeroconf: forward all arguments passed to ui.configitems() wrapper
Yuya Nishihara <yuya@tcha.org>
parents:
27728
diff
changeset
|
141 zeroconf wraps ui.configitems(), which shouldn't crash at least: |
72f2a19c5f88
zeroconf: forward all arguments passed to ui.configitems() wrapper
Yuya Nishihara <yuya@tcha.org>
parents:
27728
diff
changeset
|
142 |
72f2a19c5f88
zeroconf: forward all arguments passed to ui.configitems() wrapper
Yuya Nishihara <yuya@tcha.org>
parents:
27728
diff
changeset
|
143 $ hg paths --config extensions.zeroconf= |
72f2a19c5f88
zeroconf: forward all arguments passed to ui.configitems() wrapper
Yuya Nishihara <yuya@tcha.org>
parents:
27728
diff
changeset
|
144 dupe = $TESTTMP/b#tip (glob) |
72f2a19c5f88
zeroconf: forward all arguments passed to ui.configitems() wrapper
Yuya Nishihara <yuya@tcha.org>
parents:
27728
diff
changeset
|
145 dupe:pushurl = https://example.com/dupe |
72f2a19c5f88
zeroconf: forward all arguments passed to ui.configitems() wrapper
Yuya Nishihara <yuya@tcha.org>
parents:
27728
diff
changeset
|
146 expand = $TESTTMP/a/$SOMETHING/bar (glob) |
72f2a19c5f88
zeroconf: forward all arguments passed to ui.configitems() wrapper
Yuya Nishihara <yuya@tcha.org>
parents:
27728
diff
changeset
|
147 insecure = http://foo:***@example.com/ |
72f2a19c5f88
zeroconf: forward all arguments passed to ui.configitems() wrapper
Yuya Nishihara <yuya@tcha.org>
parents:
27728
diff
changeset
|
148 |
13797
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
149 $ cd .. |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
150 |
27266
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
151 sub-options for an undeclared path are ignored |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
152 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
153 $ hg init suboptions |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
154 $ cd suboptions |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
155 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
156 $ cat > .hg/hgrc << EOF |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
157 > [paths] |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
158 > path0 = https://example.com/path0 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
159 > path1:pushurl = https://example.com/path1 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
160 > EOF |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
161 $ hg paths |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
162 path0 = https://example.com/path0 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
163 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
164 unknown sub-options aren't displayed |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
165 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
166 $ cat > .hg/hgrc << EOF |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
167 > [paths] |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
168 > path0 = https://example.com/path0 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
169 > path0:foo = https://example.com/path1 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
170 > EOF |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
171 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
172 $ hg paths |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
173 path0 = https://example.com/path0 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
174 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
175 :pushurl must be a URL |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
176 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
177 $ cat > .hg/hgrc << EOF |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
178 > [paths] |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
179 > default = /path/to/nothing |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
180 > default:pushurl = /not/a/url |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
181 > EOF |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
182 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
183 $ hg paths |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
184 (paths.default:pushurl not a URL; ignoring) |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
185 default = /path/to/nothing |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
186 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
187 #fragment is not allowed in :pushurl |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
188 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
189 $ cat > .hg/hgrc << EOF |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
190 > [paths] |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
191 > default = https://example.com/repo |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
192 > invalid = https://example.com/repo |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
193 > invalid:pushurl = https://example.com/repo#branch |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
194 > EOF |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
195 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
196 $ hg paths |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
197 ("#fragment" in paths.invalid:pushurl not supported; ignoring) |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
198 default = https://example.com/repo |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
199 invalid = https://example.com/repo |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
200 invalid:pushurl = https://example.com/repo |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
201 |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
202 $ cd .. |
4dccc37b87bd
ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
203 |
13797
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
204 'file:' disables [paths] entries for clone destination |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
205 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
206 $ cat >> $HGRCPATH <<EOF |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
207 > [paths] |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
208 > gpath1 = http://hg.example.com |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
209 > EOF |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
210 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
211 $ hg clone a gpath1 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
212 abort: cannot create new http repository |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
213 [255] |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
214 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
215 $ hg clone a file:gpath1 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
216 updating to branch default |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
217 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
218 $ cd gpath1 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
219 $ hg -q id |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
220 000000000000 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
221 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16843
diff
changeset
|
222 $ cd .. |