This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12391

pullbundle: fix file name in the help text
ClosedPublic

Authored by joerg.sonnenberger on Mon, Mar 21, 10:19 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6e7ae547e38d: pullbundle: fix file name in the help text
Summary

It is pullbundles.manifest and not pullbundle.manifest.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare accepted this revision.Tue, Mar 22, 4:45 AM
This revision is now accepted and ready to land.Tue, Mar 22, 4:45 AM
joerg.sonnenberger added a commit: rHG6e7ae547e38d: pullbundle: fix file name in the help text.Tue, Mar 22, 9:35 AM
Closed by commit rHG6e7ae547e38d: pullbundle: fix file name in the help text (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mi18n/ja.po (2 lines)
Mi18n/pt_BR.po (4 lines)
Mmercurial/helptext/config.txt (2 lines)
Mtests/test-pull-bundle.t (2 lines)

Diff 32724

i18n/ja.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
"``streamunbundle``\n" "``streamunbundle``\n"
" When set, servers will apply data sent from the client directly,\n" " When set, servers will apply data sent from the client directly,\n"
" otherwise it will be written to a temporary file first. This option\n" " otherwise it will be written to a temporary file first. This option\n"
" effectively prevents concurrent pushes." " effectively prevents concurrent pushes."
msgstr "" msgstr ""
msgid "" msgid ""
"``pullbundle``\n" "``pullbundle``\n"
" When set, the server will check pullbundle.manifest for bundles\n" " When set, the server will check pullbundles.manifest for bundles\n"
" covering the requested heads and common nodes. The first matching\n" " covering the requested heads and common nodes. The first matching\n"
" entry will be streamed to the client." " entry will be streamed to the client."
msgstr "" msgstr ""
msgid "" msgid ""
" For HTTP transport, the stream will still use zlib compression\n" " For HTTP transport, the stream will still use zlib compression\n"
" for older clients." " for older clients."
msgstr "" msgstr ""

i18n/pt_BR.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
"``streamunbundle``\n" "``streamunbundle``\n"
" Se definido, servidores aplicação dados enviados pelo cliente\n" " Se definido, servidores aplicação dados enviados pelo cliente\n"
" diretamente; caso contrário, os dados serão primeiro escritos em\n" " diretamente; caso contrário, os dados serão primeiro escritos em\n"
" um arquivo temporário. Esta opção efetivamente impede operações\n" " um arquivo temporário. Esta opção efetivamente impede operações\n"
" push concorrentes." " push concorrentes."
msgid "" msgid ""
"``pullbundle``\n" "``pullbundle``\n"
" When set, the server will check pullbundle.manifest for bundles\n" " When set, the server will check pullbundles.manifest for bundles\n"
" covering the requested heads and common nodes. The first matching\n" " covering the requested heads and common nodes. The first matching\n"
" entry will be streamed to the client." " entry will be streamed to the client."
msgstr "" msgstr ""
"``pullbundle``\n" "``pullbundle``\n"
" Se definido, o servidor verificará pullbundle.manifest para\n" " Se definido, o servidor verificará pullbundles.manifest para\n"
" arquivos de bundle que contiverem as cabeças e nós comuns\n" " arquivos de bundle que contiverem as cabeças e nós comuns\n"
" pedidos. A primeira entrada correspondente será enviadas para\n" " pedidos. A primeira entrada correspondente será enviadas para\n"
" o cliente." " o cliente."
msgid "" msgid ""
" For HTTP transport, the stream will still use zlib compression\n" " For HTTP transport, the stream will still use zlib compression\n"
" for older clients." " for older clients."
msgstr "" msgstr ""

mercurial/helptext/config.txt

(default: False) (default: False)
``streamunbundle`` ``streamunbundle``
When set, servers will apply data sent from the client directly, When set, servers will apply data sent from the client directly,
otherwise it will be written to a temporary file first. This option otherwise it will be written to a temporary file first. This option
effectively prevents concurrent pushes. effectively prevents concurrent pushes.
``pullbundle`` ``pullbundle``
When set, the server will check pullbundle.manifest for bundles When set, the server will check pullbundles.manifest for bundles
covering the requested heads and common nodes. The first matching covering the requested heads and common nodes. The first matching
entry will be streamed to the client. entry will be streamed to the client.
For HTTP transport, the stream will still use zlib compression For HTTP transport, the stream will still use zlib compression
for older clients. for older clients.
``concurrent-push-mode`` ``concurrent-push-mode``
Level of allowed race condition between two pushing clients. Level of allowed race condition between two pushing clients.

tests/test-pull-bundle.t

[50] [50]
$ cd .. $ cd ..
$ killdaemons.py $ killdaemons.py
$ grep 'sending pullbundle ' repo/.hg/blackbox.log $ grep 'sending pullbundle ' repo/.hg/blackbox.log
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
$ rm repo/.hg/blackbox.log $ rm repo/.hg/blackbox.log
Test processing when nodes used in the pullbundle.manifest end up being hidden Test processing when nodes used in the pullbundles.manifest end up being hidden
$ hg --repo repo debugobsolete ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a $ hg --repo repo debugobsolete ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a
1 new obsolescence markers 1 new obsolescence markers
$ hg serve --repo repo --config server.view=visible -p $HGPORT -d --pid-file=hg.pid -E errors.log $ hg serve --repo repo --config server.view=visible -p $HGPORT -d --pid-file=hg.pid -E errors.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT repo-obs $ hg clone http://localhost:$HGPORT repo-obs
requesting all changes requesting all changes
adding changesets adding changesets