##// END OF EJS Templates
config: rename allow_archive to allow-archive...
David Demelier -
r38215:f715faea default
parent child Browse files
Show More
@@ -13696,7 +13696,7 b' msgid ""'
13696 msgstr ""
13696 msgstr ""
13697
13697
13698 msgid ""
13698 msgid ""
13699 "``allow_archive``\n"
13699 "``allow-archive``\n"
13700 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
13700 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
13701 " Default is empty."
13701 " Default is empty."
13702 msgstr ""
13702 msgstr ""
@@ -17347,7 +17347,7 b' msgid ""'
17347 msgstr ""
17347 msgstr ""
17348
17348
17349 msgid ""
17349 msgid ""
17350 "``allow_archive``\n"
17350 "``allow-archive``\n"
17351 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
17351 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
17352 " Default is empty."
17352 " Default is empty."
17353 msgstr ""
17353 msgstr ""
@@ -23682,11 +23682,11 b' msgstr ""'
23682 " サーバの待ちうけアドレス。 (デフォルト値: ホストの持つ全アドレス)"
23682 " サーバの待ちうけアドレス。 (デフォルト値: ホストの持つ全アドレス)"
23683
23683
23684 msgid ""
23684 msgid ""
23685 "``allow_archive``\n"
23685 "``allow-archive``\n"
23686 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
23686 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
23687 " (default: empty)"
23687 " (default: empty)"
23688 msgstr ""
23688 msgstr ""
23689 "``allow_archive``\n"
23689 "``allow-archive``\n"
23690 " 利用可能なダウンロード向けのアーカイブ形式 (bz2, gz, zip) 一覧。\n"
23690 " 利用可能なダウンロード向けのアーカイブ形式 (bz2, gz, zip) 一覧。\n"
23691 " (デフォルト値: 空 = ダウンロード不可)"
23691 " (デフォルト値: 空 = ダウンロード不可)"
23692
23692
@@ -27391,11 +27391,11 b' msgstr ""'
27391 " (padrão: usa todos os endereços)"
27391 " (padrão: usa todos os endereços)"
27392
27392
27393 msgid ""
27393 msgid ""
27394 "``allow_archive``\n"
27394 "``allow-archive``\n"
27395 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
27395 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
27396 " (default: empty)"
27396 " (default: empty)"
27397 msgstr ""
27397 msgstr ""
27398 "``allow_archive``\n"
27398 "``allow-archive``\n"
27399 " Lista de formatos de pacote (bz2, gz, zip) permitidos para download.\n"
27399 " Lista de formatos de pacote (bz2, gz, zip) permitidos para download.\n"
27400 " (padrão: lista vazia)"
27400 " (padrão: lista vazia)"
27401
27401
@@ -12099,7 +12099,7 b' msgid ""'
12099 msgstr ""
12099 msgstr ""
12100
12100
12101 msgid ""
12101 msgid ""
12102 "``allow_archive``\n"
12102 "``allow-archive``\n"
12103 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
12103 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
12104 " Default is empty."
12104 " Default is empty."
12105 msgstr ""
12105 msgstr ""
@@ -19776,11 +19776,11 b' msgstr ""'
19776 " Адрес прослушиваемого интерфейса. По умолчанию все интерфейсы."
19776 " Адрес прослушиваемого интерфейса. По умолчанию все интерфейсы."
19777
19777
19778 msgid ""
19778 msgid ""
19779 "``allow_archive``\n"
19779 "``allow-archive``\n"
19780 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
19780 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
19781 " Default is empty."
19781 " Default is empty."
19782 msgstr ""
19782 msgstr ""
19783 "``allow_archive``\n"
19783 "``allow-archive``\n"
19784 " Список форматов архивов (bz2, gz, zip), которые можно скачивать.\n"
19784 " Список форматов архивов (bz2, gz, zip), которые можно скачивать.\n"
19785 " По умолчанию пуст."
19785 " По умолчанию пуст."
19786
19786
@@ -15034,7 +15034,7 b' msgid ""'
15034 msgstr ""
15034 msgstr ""
15035
15035
15036 msgid ""
15036 msgid ""
15037 "``allow_archive``\n"
15037 "``allow-archive``\n"
15038 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
15038 " List of archive format (bz2, gz, zip) allowed for downloading.\n"
15039 " Default is empty."
15039 " Default is empty."
15040 msgstr ""
15040 msgstr ""
@@ -1225,7 +1225,8 b" coreconfigitem('web', 'accesslog',"
1225 coreconfigitem('web', 'address',
1225 coreconfigitem('web', 'address',
1226 default='',
1226 default='',
1227 )
1227 )
1228 coreconfigitem('web', 'allow_archive',
1228 coreconfigitem('web', 'allow-archive',
1229 alias=[('web', 'allow_archive')],
1229 default=list,
1230 default=list,
1230 )
1231 )
1231 coreconfigitem('web', 'allow_read',
1232 coreconfigitem('web', 'allow_read',
@@ -2329,7 +2329,7 b' The full set of options is:'
2329 ``address``
2329 ``address``
2330 Interface address to bind to. (default: all)
2330 Interface address to bind to. (default: all)
2331
2331
2332 ``allow_archive``
2332 ``allow-archive``
2333 List of archive format (bz2, gz, zip) allowed for downloading.
2333 List of archive format (bz2, gz, zip) allowed for downloading.
2334 (default: empty)
2334 (default: empty)
2335
2335
@@ -1162,7 +1162,7 b' def archive(web):'
1162 """
1162 """
1163
1163
1164 type_ = web.req.qsparams.get('type')
1164 type_ = web.req.qsparams.get('type')
1165 allowed = web.configlist("web", "allow_archive")
1165 allowed = web.configlist("web", "allow-archive")
1166 key = web.req.qsparams['node']
1166 key = web.req.qsparams['node']
1167
1167
1168 if type_ not in webutil.archivespecs:
1168 if type_ not in webutil.archivespecs:
@@ -51,7 +51,7 b' archivespecs = util.sortdict(('
51 ))
51 ))
52
52
53 def archivelist(ui, nodeid, url=None):
53 def archivelist(ui, nodeid, url=None):
54 allowed = ui.configlist('web', 'allow_archive', untrusted=True)
54 allowed = ui.configlist('web', 'allow-archive', untrusted=True)
55 archives = []
55 archives = []
56
56
57 for typ, spec in archivespecs.iteritems():
57 for typ, spec in archivespecs.iteritems():
@@ -94,7 +94,7 b' hg subrepos are shared into existence on'
94 $ echo "archivesubrepos = True" >> .hg/hgrc
94 $ echo "archivesubrepos = True" >> .hg/hgrc
95 $ cp .hg/hgrc .hg/hgrc-base
95 $ cp .hg/hgrc .hg/hgrc-base
96 > test_archtype() {
96 > test_archtype() {
97 > echo "allow_archive = $1" >> .hg/hgrc
97 > echo "allow-archive = $1" >> .hg/hgrc
98 > test_archtype_run "$@"
98 > test_archtype_run "$@"
99 > }
99 > }
100 > test_archtype_deprecated() {
100 > test_archtype_deprecated() {
@@ -293,7 +293,7 b' check http return codes (with deprecated'
293
293
294 body: size=1451, sha1=4c5cf0f574446c44feb7f88f4e0e2a56bd92c352
294 body: size=1451, sha1=4c5cf0f574446c44feb7f88f4e0e2a56bd92c352
295
295
296 $ echo "allow_archive = gz bz2 zip" >> .hg/hgrc
296 $ echo "allow-archive = gz bz2 zip" >> .hg/hgrc
297 $ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
297 $ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
298 $ cat hg.pid >> $DAEMON_PIDS
298 $ cat hg.pid >> $DAEMON_PIDS
299
299
@@ -101,7 +101,7 b''
101
101
102
102
103 $ echo '[web]' >> .hg/hgrc
103 $ echo '[web]' >> .hg/hgrc
104 $ echo 'allow_archive = bz2' >> .hg/hgrc
104 $ echo 'allow-archive = bz2' >> .hg/hgrc
105 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E error.log
105 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E error.log
106 $ cat hg.pid >> $DAEMON_PIDS
106 $ cat hg.pid >> $DAEMON_PIDS
107
107
@@ -30,7 +30,7 b' Set up the repo'
30 |
30 |
31 o 0:43c799df6e75
31 o 0:43c799df6e75
32
32
33 $ hg serve --config web.allow_archive=zip -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
33 $ hg serve --config web.allow-archive=zip -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
34 $ cat hg.pid >> $DAEMON_PIDS
34 $ cat hg.pid >> $DAEMON_PIDS
35
35
36 $ REVLINKS='href=[^>]+(rev=|/)(43c799df6e75|0|a7c1559b7bba|1|xyzzy|9d8c40cba617|2|tip|default)'
36 $ REVLINKS='href=[^>]+(rev=|/)(43c799df6e75|0|a7c1559b7bba|1|xyzzy|9d8c40cba617|2|tip|default)'
@@ -26,7 +26,7 b' of largefiles.'
26 > patterns=glob:**.dat
26 > patterns=glob:**.dat
27 > usercache=${USERCACHE}
27 > usercache=${USERCACHE}
28 > [web]
28 > [web]
29 > allow_archive = zip
29 > allow-archive = zip
30 > [hooks]
30 > [hooks]
31 > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
31 > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
32 > EOF
32 > EOF
General Comments 0
You need to be logged in to leave comments. Login now