Mercurial > hg
annotate mercurial/templates/map-cmdline.bisect @ 23042:2cd3fa4412dc
ssl: only use the dummy cert hack if using an Apple Python (issue4410)
The hack for using certificate store in addition to the provided CAs resides in
Apple's OpenSSL. Apple's own Pythons will use it, but other custom built
Pythons might use a custom built OpenSSL without that hack and will fail when
exposed to the dummy cacert introduced in d7f7f1860f00.
There do not seem to be a simple way to check from Python if we are using a
patched OpenSSL or if it is an Apple OpenSSL.
Instead, check if the Python executable resides in /usr/bin/python* or in
/System/Library/Frameworks/Python.framework/ and assume that all Pythons found
there will be native Pythons using the patched OpenSSL.
Custom built Pythons will not get the benefit of using the CAs from the
certificate store.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 17 Oct 2014 18:56:12 +0200 |
parents | 143c78b4fc8c |
children | 7c324f65e4ef |
rev | line source |
---|---|
15156
143c78b4fc8c
styles: add new 'bisect' style that prints the bisection status
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13387
diff
changeset
|
1 changeset = 'changeset: {rev}:{node|short}\nbisect: {bisect}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n' |
143c78b4fc8c
styles: add new 'bisect' style that prints the bisection status
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13387
diff
changeset
|
2 changeset_quiet = '{bisect|shortbisect} {rev}:{node|short}\n' |
143c78b4fc8c
styles: add new 'bisect' style that prints the bisection status
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13387
diff
changeset
|
3 changeset_verbose = 'changeset: {rev}:{node|short}\nbisect: {bisect}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\n{files}{file_copies_switch}description:\n{desc|strip}\n\n\n' |
143c78b4fc8c
styles: add new 'bisect' style that prints the bisection status
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13387
diff
changeset
|
4 changeset_debug = 'changeset: {rev}:{node}\nbisect: {bisect}\n{branches}{bookmarks}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies_switch}{extras}description:\n{desc|strip}\n\n\n' |
3459
0600d326d96a
Adjust default cmdline style to really match verbose/debug log.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3197
diff
changeset
|
5 start_files = 'files: ' |
0600d326d96a
Adjust default cmdline style to really match verbose/debug log.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3197
diff
changeset
|
6 file = ' {file}' |
0600d326d96a
Adjust default cmdline style to really match verbose/debug log.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3197
diff
changeset
|
7 end_files = '\n' |
5550
db6633f11d59
cmdutil: make "files" list all files, add "file_mods" for modified files
Patrick Mezard <pmezard@gmail.com>
parents:
5545
diff
changeset
|
8 start_file_mods = 'files: ' |
db6633f11d59
cmdutil: make "files" list all files, add "file_mods" for modified files
Patrick Mezard <pmezard@gmail.com>
parents:
5545
diff
changeset
|
9 file_mod = ' {file_mod}' |
db6633f11d59
cmdutil: make "files" list all files, add "file_mods" for modified files
Patrick Mezard <pmezard@gmail.com>
parents:
5545
diff
changeset
|
10 end_file_mods = '\n' |
1907
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
11 start_file_adds = 'files+: ' |
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 file_add = ' {file_add}' |
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 end_file_adds = '\n' |
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 start_file_dels = 'files-: ' |
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 file_del = ' {file_del}' |
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
16 end_file_dels = '\n' |
10776
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10060
diff
changeset
|
17 start_file_copies = 'copies: ' |
3197 | 18 file_copy = ' {name} ({source})' |
10776
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10060
diff
changeset
|
19 end_file_copies = '\n' |
4352
051fb8c2567c
command line templates: add formatnode filter
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3462
diff
changeset
|
20 parent = 'parent: {rev}:{node|formatnode}\n' |
1907
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
21 manifest = 'manifest: {rev}:{node}\n' |
3461
451ec905625b
Add new branch info to templater and use it in map-cmdline.default.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3459
diff
changeset
|
22 branch = 'branch: {branch}\n' |
1907
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
23 tag = 'tag: {tag}\n' |
13387
0be2fe6a0843
templates: add bookmarks to command line styles
David Soria Parra <dsp@php.net>
parents:
10776
diff
changeset
|
24 bookmark = 'bookmark: {bookmark}\n' |
3462
fab28100ea88
Added extra changeset info to templater and map-cmdline.default.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3461
diff
changeset
|
25 extra = 'extra: {key}={value|stringescape}\n' |