Hello community,
here is the log from the commit of package mercurial for openSUSE:Factory
checked in at 2016-09-27 13:41:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mercurial (Old)
and /work/SRC/openSUSE:Factory/.mercurial.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2016-08-05
18:13:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2016-09-27
13:41:22.000000000 +0200
@@ -1,0 +2,18 @@
+Mon Sep 19 16:16:20 UTC 2016 - devel...@develop7.info
+
+- Mercurial 3.9.1 (2016-9-1)
+ This is a regularly-scheduled bugfix release.
+
+ * bundle2: fail faster when interrupted
+ * bundle2: localize handleoutput remote prompts
+ * convert: move svn config initializer out of the module level
+ * debian: update source URL in copyright file
+ * exchange: correctly specify url to unbundle (issue5145)
+ * help: add example of '[templates]' usage
+ * help: update link to wiki/CommandServer
+ * osx: update bugzilla link in readme
+ * revset: fix keyword arguments to go through optimization process
+ * win32: update link to mailing list in readme
+ * win32: update wiki link in mercurial.ini
+
+-------------------------------------------------------------------
Old:
----
mercurial-3.9.tar.gz
mercurial-3.9.tar.gz.asc
New:
----
mercurial-3.9.1.tar.gz
mercurial-3.9.1.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mercurial.spec ++++++
--- /var/tmp/diff_new_pack.BPqpiJ/_old 2016-09-27 13:41:23.000000000 +0200
+++ /var/tmp/diff_new_pack.BPqpiJ/_new 2016-09-27 13:41:23.000000000 +0200
@@ -20,7 +20,7 @@
%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
%endif
Name: mercurial
-Version: 3.9
+Version: 3.9.1
Release: 0
Summary: Scalable Distributed SCM
License: GPL-2.0+
++++++ mercurial-3.9.tar.gz -> mercurial-3.9.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/.hgsigs new/mercurial-3.9.1/.hgsigs
--- old/mercurial-3.9/.hgsigs 2016-08-01 18:37:26.000000000 +0200
+++ new/mercurial-3.9.1/.hgsigs 2016-09-01 21:01:44.000000000 +0200
@@ -130,3 +130,4 @@
a9764ab80e11bcf6a37255db7dd079011f767c6c 0
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/.hgtags new/mercurial-3.9.1/.hgtags
--- old/mercurial-3.9/.hgtags 2016-08-01 18:37:26.000000000 +0200
+++ new/mercurial-3.9.1/.hgtags 2016-09-01 21:01:44.000000000 +0200
@@ -143,3 +143,4 @@
a9764ab80e11bcf6a37255db7dd079011f767c6c 3.8.3
26a5d605b8683a292bb89aea11f37a81b06ac016 3.8.4
519bb4f9d3a47a6e83c2b414d58811ed38f503c2 3.9-rc
+299546f84e68dbb9bd026f0f3a974ce4bdb93686 3.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/PKG-INFO new/mercurial-3.9.1/PKG-INFO
--- old/mercurial-3.9/PKG-INFO 2016-08-01 18:37:49.000000000 +0200
+++ new/mercurial-3.9.1/PKG-INFO 2016-09-01 21:01:56.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: mercurial
-Version: 3.9
+Version: 3.9.1
Summary: Fast scalable distributed SCM (revision control, version control)
system
Home-page: https://mercurial-scm.org/
Author: Matt Mackall and many others
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/contrib/debian/copyright
new/mercurial-3.9.1/contrib/debian/copyright
--- old/mercurial-3.9/contrib/debian/copyright 2016-08-01 18:37:20.000000000
+0200
+++ new/mercurial-3.9.1/contrib/debian/copyright 2016-09-01
21:01:36.000000000 +0200
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mercurial
-Source: http://www.selenic.com/mercurial/
+Source: https://www.mercurial-scm.org/
Files: *
Copyright: 2005-2015, Matt Mackall <m...@selenic.com> and others.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/contrib/macosx/Readme.html
new/mercurial-3.9.1/contrib/macosx/Readme.html
--- old/mercurial-3.9/contrib/macosx/Readme.html 2016-08-01
18:37:20.000000000 +0200
+++ new/mercurial-3.9.1/contrib/macosx/Readme.html 2016-09-01
21:01:36.000000000 +0200
@@ -32,6 +32,6 @@
<p class="p1"><b>Reporting problems</b></p>
<p class="p2"><br></p>
<p class="p3">If you run into any problems, please file a bug online:</p>
-<p class="p3"><a href="http://bz.selenic.com/";>http://bz.selenic.com/</a></p>
+<p class="p3"><a
href="https://bz.mercurial-scm.org/";>https://bz.mercurial-scm.org/</a></p>
</body>
</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/contrib/win32/ReadMe.html
new/mercurial-3.9.1/contrib/win32/ReadMe.html
--- old/mercurial-3.9/contrib/win32/ReadMe.html 2016-08-01 18:37:20.000000000
+0200
+++ new/mercurial-3.9.1/contrib/win32/ReadMe.html 2016-09-01
21:01:36.000000000 +0200
@@ -117,7 +117,7 @@
<p>
If you cannot find an answer to your question, please feel free
to send mail to the Mercurial mailing list, at <a
- href="mailto:mercur...@selenic.com";>mercur...@selenic.com</a>.
+
href="mailto:mercur...@mercurial-scm.org";>mercur...@mercurial-scm.org</a>.
<b>Remember</b>, the more useful information you include in your
report, the easier it will be for us to help you!
</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/contrib/win32/mercurial.ini
new/mercurial-3.9.1/contrib/win32/mercurial.ini
--- old/mercurial-3.9/contrib/win32/mercurial.ini 2016-08-01
18:37:20.000000000 +0200
+++ new/mercurial-3.9.1/contrib/win32/mercurial.ini 2016-09-01
21:01:36.000000000 +0200
@@ -30,7 +30,7 @@
;
; For more information about mercurial extensions, start here
-; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions
+; https://www.mercurial-scm.org/wiki/UsingExtensions
;
; Extensions shipped with Mercurial
;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/doc/hg.1 new/mercurial-3.9.1/doc/hg.1
--- old/mercurial-3.9/doc/hg.1 2016-08-01 18:37:32.000000000 +0200
+++ new/mercurial-3.9.1/doc/hg.1 2016-09-01 21:01:47.000000000 +0200
@@ -7469,7 +7469,7 @@
\%\fBhg serve\fP\: can also start a "command server." Clients can connect
to this server and issue Mercurial commands over a special protocol.
For more details on the command server, including links to client
-libraries, see \%https://mercurial.selenic.com/wiki/CommandServer\:.
+libraries, see \%https://www.mercurial\-scm.org/wiki/CommandServer\:.
.sp
\%\fBhg serve\fP\: based interfaces (the hgweb and command servers) have the
advantage over simple \fBhg\fP process invocations in that they are
@@ -8327,6 +8327,26 @@
defines two symbol aliases, \fBr\fP and \fBrn\fP, and a function alias
\fBleftpad()\fP.
.sp
+It\(aqs also possible to specify complete template strings, using the
+\fBtemplates\fP section. The syntax used is the general template string syntax.
+.sp
+For example,
+.sp
+.nf
+.ft C
+[templates]
+nodedate = "{node|short}: {date(date, "%Y\-%m\-%d")}\en"
+.ft P
+.fi
+.sp
+defines a template, \fBnodedate\fP, which can be called like:
+.sp
+.nf
+.ft C
+$ hg log \-r . \-Tnodedate
+.ft P
+.fi
+.sp
Some sample command line templates:
.INDENT 0.0
.IP \(bu 2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/doc/hg.1.html
new/mercurial-3.9.1/doc/hg.1.html
--- old/mercurial-3.9/doc/hg.1.html 2016-08-01 18:37:38.000000000 +0200
+++ new/mercurial-3.9.1/doc/hg.1.html 2016-09-01 21:01:50.000000000 +0200
@@ -5728,7 +5728,7 @@
<p><a class="reference external" href="hg.1.html#serve"><tt class="docutils
literal">hg serve</tt></a> can also start a "command server." Clients
can connect
to this server and issue Mercurial commands over a special protocol.
For more details on the command server, including links to client
-libraries, see <a class="reference external"
href="https://mercurial.selenic.com/wiki/CommandServer";>https://mercurial.selenic.com/wiki/CommandServer</a>.</p>
+libraries, see <a class="reference external"
href="https://www.mercurial-scm.org/wiki/CommandServer";>https://www.mercurial-scm.org/wiki/CommandServer</a>.</p>
<p><a class="reference external" href="hg.1.html#serve"><tt class="docutils
literal">hg serve</tt></a> based interfaces (the hgweb and command servers)
have the
advantage over simple <tt class="docutils literal">hg</tt> process invocations
in that they are
likely more efficient. This is because there is significant overhead
@@ -6374,6 +6374,17 @@
</pre>
<p>defines two symbol aliases, <tt class="docutils literal">r</tt> and <tt
class="docutils literal">rn</tt>, and a function alias
<tt class="docutils literal">leftpad()</tt>.</p>
+<p>It's also possible to specify complete template strings, using the
+<tt class="docutils literal">templates</tt> section. The syntax used is the
general template string syntax.</p>
+<p>For example,</p>
+<pre class="literal-block">
+[templates]
+nodedate = "{node|short}: {date(date, "%Y-%m-%d")}\n"
+</pre>
+<p>defines a template, <tt class="docutils literal">nodedate</tt>, which can
be called like:</p>
+<pre class="literal-block">
+$ hg log -r . -Tnodedate
+</pre>
<p>Some sample command line templates:</p>
<ul>
<li><p class="first">Format lists, e.g. files:</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/doc/hgrc.5
new/mercurial-3.9.1/doc/hgrc.5
--- old/mercurial-3.9/doc/hgrc.5 2016-08-01 18:37:34.000000000 +0200
+++ new/mercurial-3.9.1/doc/hgrc.5 2016-09-01 21:01:48.000000000 +0200
@@ -2011,6 +2011,10 @@
.SS \fBtemplatealias\fP
.sp
Alias definitions for templates. See \%\fBhg help templates\fP\: for details.
+.SS \fBtemplates\fP
+.sp
+Use the \fB[templates]\fP section to define template strings.
+See \%\fBhg help templates\fP\: for details.
.SS \fBtrusted\fP
.sp
Mercurial will not use the settings in the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/doc/hgrc.5.html
new/mercurial-3.9.1/doc/hgrc.5.html
--- old/mercurial-3.9/doc/hgrc.5.html 2016-08-01 18:37:40.000000000 +0200
+++ new/mercurial-3.9.1/doc/hgrc.5.html 2016-09-01 21:01:51.000000000 +0200
@@ -66,16 +66,17 @@
<li><a class="reference internal" href="#smtp" id="id34"><tt class="docutils
literal">smtp</tt></a></li>
<li><a class="reference internal" href="#subpaths" id="id35"><tt
class="docutils literal">subpaths</tt></a></li>
<li><a class="reference internal" href="#templatealias" id="id36"><tt
class="docutils literal">templatealias</tt></a></li>
-<li><a class="reference internal" href="#trusted" id="id37"><tt
class="docutils literal">trusted</tt></a></li>
-<li><a class="reference internal" href="#ui" id="id38"><tt class="docutils
literal">ui</tt></a></li>
-<li><a class="reference internal" href="#web" id="id39"><tt class="docutils
literal">web</tt></a></li>
-<li><a class="reference internal" href="#websub" id="id40"><tt class="docutils
literal">websub</tt></a></li>
-<li><a class="reference internal" href="#worker" id="id41"><tt class="docutils
literal">worker</tt></a></li>
+<li><a class="reference internal" href="#templates" id="id37"><tt
class="docutils literal">templates</tt></a></li>
+<li><a class="reference internal" href="#trusted" id="id38"><tt
class="docutils literal">trusted</tt></a></li>
+<li><a class="reference internal" href="#ui" id="id39"><tt class="docutils
literal">ui</tt></a></li>
+<li><a class="reference internal" href="#web" id="id40"><tt class="docutils
literal">web</tt></a></li>
+<li><a class="reference internal" href="#websub" id="id41"><tt class="docutils
literal">websub</tt></a></li>
+<li><a class="reference internal" href="#worker" id="id42"><tt class="docutils
literal">worker</tt></a></li>
</ul>
</li>
-<li><a class="reference internal" href="#author" id="id42">Author</a></li>
-<li><a class="reference internal" href="#see-also" id="id43">See Also</a></li>
-<li><a class="reference internal" href="#copying" id="id44">Copying</a></li>
+<li><a class="reference internal" href="#author" id="id43">Author</a></li>
+<li><a class="reference internal" href="#see-also" id="id44">See Also</a></li>
+<li><a class="reference internal" href="#copying" id="id45">Copying</a></li>
</ul>
</div>
<div class="section" id="description">
@@ -1509,6 +1510,11 @@
<h2><a class="toc-backref" href="#contents"><tt class="docutils
literal">templatealias</tt></a></h2>
<p>Alias definitions for templates. See <a class="reference external"
href="hg.1.html#templates"><tt class="docutils literal">hg help
templates</tt></a> for details.</p>
</div>
+<div class="section" id="templates">
+<h2><a class="toc-backref" href="#contents"><tt class="docutils
literal">templates</tt></a></h2>
+<p>Use the <tt class="docutils literal">[templates]</tt> section to define
template strings.
+See <a class="reference external" href="hg.1.html#templates"><tt
class="docutils literal">hg help templates</tt></a> for details.</p>
+</div>
<div class="section" id="trusted">
<h2><a class="toc-backref" href="#contents"><tt class="docutils
literal">trusted</tt></a></h2>
<p>Mercurial will not use the settings in the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/hgext/convert/transport.py
new/mercurial-3.9.1/hgext/convert/transport.py
--- old/mercurial-3.9/hgext/convert/transport.py 2016-08-01
18:37:20.000000000 +0200
+++ new/mercurial-3.9.1/hgext/convert/transport.py 2016-09-01
21:01:36.000000000 +0200
@@ -34,8 +34,7 @@
# won't work worth a darn against those libraries anyway!
svn.ra.initialize()
-svn_config = svn.core.svn_config_get_config(None)
-
+svn_config = None
def _create_auth_baton(pool):
"""Create a Subversion authentication baton. """
@@ -88,6 +87,9 @@
svn.core.svn_auth_set_parameter(
ab, svn.core.SVN_AUTH_PARAM_DEFAULT_PASSWORD,
self.password)
self.client.auth_baton = ab
+ global svn_config
+ if svn_config is None:
+ svn_config = svn.core.svn_config_get_config(None)
self.client.config = svn_config
try:
self.ra = svn.client.open_ra_session(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/i18n/pt_BR.po
new/mercurial-3.9.1/i18n/pt_BR.po
--- old/mercurial-3.9/i18n/pt_BR.po 2016-08-01 18:37:20.000000000 +0200
+++ new/mercurial-3.9.1/i18n/pt_BR.po 2016-09-01 21:01:36.000000000 +0200
@@ -4117,18 +4117,6 @@
" diretório de trabalho serão comparados com seu pai."
#, python-format
-msgid "use %(path)s to diff repository (or selected files)"
-msgstr "usa %(path)s para exibir diffs do repositório ou arquivos"
-
-#, python-format
-msgid ""
-" Show differences between revisions for the specified files, using\n"
-" the %(path)s program."
-msgstr ""
-" Mostra diferenças entre revisões para os arquivos especificados,\n"
-" usando o programa %(path)s."
-
-#, python-format
msgid "hg %s [OPTION]... [FILE]..."
msgstr "hg %s [OPÇÃO]... [ARQUIVO]..."
@@ -5616,6 +5604,14 @@
" bookmarks and the working copy; each line will then include the
bookmark\n"
" name, or '.' for the working copy, as well."
msgstr ""
+" O journal é usado para ver as revisões anteriores para as quais\n"
+" marcadores e a cópia de trabalho apontaram.\n"
+" Por padrão, mostra as localizações anteriores da cópia de trabalho.\n"
+" Ao receber um nome de marcador, mostra todas as posições anteriores\n"
+" desse marcador.\n"
+" Use a opção --all para mostrar localizações anteriores para todos\n"
+" os marcadores e para a cópia de trabalho; cada linha incluirá o\n"
+" nome do marcador, ou '.' para a cópia de trabalho."
msgid ""
" If `name` starts with `re:`, the remainder of the name is treated as\n"
@@ -6425,8 +6421,8 @@
msgstr "sistema operacional desconhecido: %s\n"
#, python-format
-msgid "unknown %s usercache location\n"
-msgstr "localização de cache de usuário %s desconhecida\n"
+msgid "unknown %s usercache location"
+msgstr "localização de cache de usuário %s desconhecida"
#, python-format
msgid "found %s in store\n"
@@ -14126,45 +14122,45 @@
"são:"
msgid ""
-" rev revision number\n"
-" chainid delta chain identifier (numbered by unique base)\n"
-" chainlen delta chain length to this revision\n"
-" prevrev previous revision in delta chain\n"
-" deltatype role of delta / how it was computed\n"
-" compsize compressed size of revision\n"
-" uncompsize uncompressed size of revision\n"
-" chainsize total size of compressed revisions in chain\n"
-" chainratio total chain size divided by uncompressed revision size\n"
+" :``rev``: revision number\n"
+" :``chainid``: delta chain identifier (numbered by unique base)\n"
+" :``chainlen``: delta chain length to this revision\n"
+" :``prevrev``: previous revision in delta chain\n"
+" :``deltatype``: role of delta / how it was computed\n"
+" :``compsize``: compressed size of revision\n"
+" :``uncompsize``: uncompressed size of revision\n"
+" :``chainsize``: total size of compressed revisions in chain\n"
+" :``chainratio``: total chain size divided by uncompressed revision size\n"
" (new delta chains typically start at ratio 2.00)\n"
-" lindist linear distance from base revision in delta chain to
end\n"
+" :``lindist``: linear distance from base revision in delta chain to
end\n"
" of this revision\n"
-" extradist total size of revisions not part of this delta chain
from\n"
+" :``extradist``: total size of revisions not part of this delta chain
from\n"
" base of delta chain to end of this revision; a
measurement\n"
" of how much extra data we need to read/seek across to
read\n"
" the delta chain for this revision\n"
-" extraratio extradist divided by chainsize; another representation
of\n"
+" :``extraratio``: extradist divided by chainsize; another representation
of\n"
" how much unrelated data is needed to load this delta
chain\n"
" "
msgstr ""
-" rev número da revisão\n"
-" chainid identificador de cadeia de deltas (numerado por base
única)\n"
-" chainlen comprimento da cadeia de deltas para esta revisão\n"
-" prevrev revisão anterior na cadeia de deltas\n"
-" deltatype tipo de delta / como foi computado\n"
-" compsize tamanho comprimido da revisão\n"
-" uncompsize tamanho não comprimido da revisão\n"
-" chainsize tamanho total das revisões comprimidas na cadeia\n"
-" chainratio tamanho total da cadeia dividido pelo tamanho não\n"
+" :``rev``: número da revisão\n"
+" :``chainid``: identificador de cadeia de deltas (numerado por base
única)\n"
+" :``chainlen``: comprimento da cadeia de deltas para esta revisão\n"
+" :``prevrev``: revisão anterior na cadeia de deltas\n"
+" :``deltatype``: tipo de delta / como foi computado\n"
+" :``compsize``: tamanho comprimido da revisão\n"
+" :``uncompsize``: tamanho não comprimido da revisão\n"
+" :``chainsize``: tamanho total das revisões comprimidas na cadeia\n"
+" :``chainratio``: tamanho total da cadeia dividido pelo tamanho não\n"
" comprimido da revisão\n"
" (novas cadeias de deltas tipicamente começam em 2.00)\n"
-" lindist distância linear da revisão base na cadeia de deltas\n"
+" :``lindist``: distância linear da revisão base na cadeia de deltas\n"
" até o final desta revisão\n"
-" extradist tamanho total de revisões que não fazem parte desta\n"
+" :``extradist``: tamanho total de revisões que não fazem parte desta\n"
" cadeia de deltas da base da cadeia de deltas até o\n"
" fim desta revisão; uma medida de quantos dados\n"
" extras em leitura ou posicionamento são necessários\n"
" para ler a cadeia de deltas para esta revisão\n"
-" extraratio extradist dividido por chainsize; outra representação\n"
+" :``extraratio``: extradist dividido por chainsize; outra representação\n"
" de quantos dados não relacionados são necessários para\n"
" carregar esta cadeia de deltas\n"
" "
@@ -15621,7 +15617,7 @@
" resulting changeset has a different ID than the one recorded in\n"
" the patch. This will guard against various ways that portable\n"
" patch formats and mail systems might fail to transfer Mercurial\n"
-" data or metadata. See ':hg: bundle' for lossless transmission."
+" data or metadata. See :hg:`bundle` for lossless transmission."
msgstr ""
" Se --exact for especificado, import irá posicionar o diretório de\n"
" trabalho no pai de cada patch antes de aplicá-lo, e irá abortar\n"
@@ -15630,7 +15626,7 @@
" Isso protegerá contra várias falhas nos formatos portáveis\n"
" de patch e sistemas de email ao transferir dados ou metadados\n"
" do Mercurial.\n"
-" Veja ':hg: bundle' para uma forma de transmissão sem perdas."
+" Veja :hg:`bundle` para uma forma de transmissão sem perdas."
msgid ""
" Use --partial to ensure a changeset will be created from the patch\n"
@@ -21922,7 +21918,7 @@
" Esta opção não tem efeito se a opção ``fingerprints`` estiver\n"
" definida para o servidor."
-msgid " The format of the file is as follows:"
+msgid " The format of the file is as follows::"
msgstr " O formato do arquivo é como segue::"
msgid ""
@@ -23119,6 +23115,20 @@
"mais detalhes."
msgid ""
+"``templates``\n"
+"-------------"
+msgstr ""
+"``templates``\n"
+"-------------"
+
+msgid ""
+"Use the ``[templates]`` section to define template strings.\n"
+"See :hg:`help templates` for details."
+msgstr ""
+"Use a seção ``[templates]`` para definir strings de modelos.\n"
+"Veja :hg:`help templates` para detalhes."
+
+msgid ""
"``trusted``\n"
"-----------"
msgstr ""
@@ -23401,12 +23411,12 @@
msgid ""
"``interface.chunkselector``\n"
-" Select the interface for change recording (e.g. :hg:`commit` -i).\n"
+" Select the interface for change recording (e.g. :hg:`commit -i`).\n"
" Possible values are 'text' and 'curses'.\n"
" This config overrides the interface specified by ui.interface."
msgstr ""
"``interface.chunkselector``\n"
-" Seleciona a interface para gravar mudanças (por exemplo em :hg:`commit`
-i).\n"
+" Seleciona a interface para gravar mudanças (por exemplo em :hg:`commit
-i`).\n"
" Os valores possíveis são 'text' e 'curses'.\n"
" Esta configuração se sobrepõe à interface especificada à configuração\n"
" ui.interface."
@@ -27927,14 +27937,14 @@
":hg:`serve` can also start a \"command server.\" Clients can connect\n"
"to this server and issue Mercurial commands over a special protocol.\n"
"For more details on the command server, including links to client\n"
-"libraries, see https://mercurial.selenic.com/wiki/CommandServer.";
+"libraries, see https://www.mercurial-scm.org/wiki/CommandServer.";
msgstr ""
":hg:`serve` também pode iniciar um \"servidor de comandos.\"\n"
"Clientes podem conectar a esse servidor e enviar comandos\n"
"do Mercurial através de um protocolo especial.\n"
"Para mais detalhes sobre o servidor de comandos, incluindo\n"
"referências para bibliotecas de clientes, veja\n"
-"https://mercurial.selenic.com/wiki/CommandServer.";
+"https://www.mercurial-scm.org/wiki/CommandServer.";
msgid ""
":hg:`serve` based interfaces (the hgweb and command servers) have the\n"
@@ -28804,6 +28814,27 @@
"define dois apelidos de símbolos, ``r`` e ``rn``, e um apelido de função\n"
"``leftpad()``."
+msgid ""
+"It's also possible to specify complete template strings, using the\n"
+"``templates`` section. The syntax used is the general template string syntax."
+msgstr ""
+"Também é possível especificar strings de modelo completas, usando\n"
+"a seção ``templates``. A sintaxe usada é a mesma sintaxe geral de\n"
+"strings de modelo."
+
+msgid ""
+" [templates]\n"
+" nodedate = \"{node|short}: {date(date, \"%Y-%m-%d\")}\\n\""
+msgstr ""
+" [templates]\n"
+" nodedate = \"{node|short}: {date(date, \"%Y-%m-%d\")}\\n\""
+
+msgid "defines a template, ``nodedate``, which can be called like::"
+msgstr "define um modelo, ``nodedate``, que pode ser chamado assim::"
+
+msgid " $ hg log -r . -Tnodedate"
+msgstr " $ hg log -r . -Tnodedate"
+
msgid "Some sample command line templates:"
msgstr "Alguns exemplos de modelos de linha de comando:"
@@ -29191,10 +29222,6 @@
msgstr "checando links para sub-repositórios\n"
#, python-format
-msgid "%s: %s\n"
-msgstr "%s: %s\n"
-
-#, python-format
msgid ".hgsubstate is corrupt in revision %s\n"
msgstr ".hgsubstate está corrompido na revisão %s\n"
@@ -31668,9 +31695,11 @@
msgid "unknown sort key %r"
msgstr "especificação de ordenação desconhecida: %r"
+#. i18n: "topo" is a keyword
msgid "topo sort order cannot be combined with other sort keys"
msgstr "a ordem topo não pode ser combinada com outras formas de ordenação"
+#. i18n: "topo" and "topo.firstbranch" are keywords
msgid "topo.firstbranch can only be used when using the topo sort key"
msgstr "topo.firstbranch só pode ser usada com a chave de ordenação topo"
@@ -32032,14 +32061,56 @@
"carregado; veja https://mercurial-scm.org/wiki/SecureConnections para como "
"configurar o Mercurial para evitar este erro)\n"
+#, python-format
msgid ""
-"(could not negotiate a common protocol; see https://mercurial-";
-"scm.org/wiki/SecureConnections for how to configure Mercurial to avoid this "
-"error)\n"
+"(could not communicate with %s using security protocols %s; if you are using"
+" a modern Mercurial version, consider contacting the operator of this "
+"server; see https://mercurial-scm.org/wiki/SecureConnections for more "
+"info)\n"
msgstr ""
-"(não foi possível negociar um protocolo em comum; veja https://mercurial-";
-"scm.org/wiki/SecureConnections para como configurar o Mercurial para evitar "
-"este erro)\n"
+"(não foi possível comunicar com %s usando os protocolos de segurança %s; se "
+"você estiver usando uma versão moderna do Mercurial, considere contactar o "
+"operador deste servidor; veja https://mercurial-";
+"scm.org/wiki/SecureConnections para mais informações)\n"
+
+#, python-format
+msgid ""
+"(could not communicate with %s using TLS 1.0; the likely cause of this is "
+"the server no longer supports TLS 1.0 because it has known security "
+"vulnerabilities; see https://mercurial-scm.org/wiki/SecureConnections for "
+"more info)\n"
+msgstr ""
+"(não foi possível comunicar com %s usando TLS 1.0; a causa mais provável "
+"deste problema é o servidor não suportar mais TLS 1.0 por essa versão "
+"apresentar vulnerabilidades de segurança conhecidas; veja https://mercurial-";
+"scm.org/wiki/SecureConnections para mais informações)\n"
+
+#, python-format
+msgid ""
+"(could not negotiate a common security protocol (%s+) with %s; the likely "
+"cause is Mercurial is configured to be more secure than the server can "
+"support)\n"
+msgstr ""
+"(não foi possível negociar um protocolo de segurança comum (%s+) com %s; a "
+"causa mais provável deste problema é o Mercurial estar configurado para ser "
+"mais seguro do que o servidor suporta)\n"
+
+#, python-format
+msgid ""
+"(consider contacting the operator of this server and ask them to support "
+"modern TLS protocol versions; or, set hostsecurity.%s:minimumprotocol=tls1.0"
+" to allow use of legacy, less secure protocols when communicating with this "
+"server)\n"
+msgstr ""
+"(considere entrar em contato com o operador deste servidor e solicitar que "
+"suporte versões modernas de protocolo TLS; ou defina "
+"hostsecurity.%s:minimumprotocol=tls1.0 para permitir o uso de protocolos "
+"legados menos seguros ao comunicar com este servidor)\n"
+
+msgid "(see https://mercurial-scm.org/wiki/SecureConnections for more info)\n"
+msgstr ""
+"(veja https://mercurial-scm.org/wiki/SecureConnections para mais "
+"informações)\n"
msgid "ssl connection failed"
msgstr "a conexão ssl falhou"
@@ -33765,6 +33836,28 @@
msgid "number of cpus must be an integer"
msgstr "o número de cpus deve ser um inteiro"
+#~ msgid "use %(path)s to diff repository (or selected files)"
+#~ msgstr "usa %(path)s para exibir diffs do repositório ou arquivos"
+
+#~ msgid ""
+#~ " Show differences between revisions for the specified files, using\n"
+#~ " the %(path)s program."
+#~ msgstr ""
+#~ " Mostra diferenças entre revisões para os arquivos especificados,\n"
+#~ " usando o programa %(path)s."
+
+#~ msgid "%s: %s\n"
+#~ msgstr "%s: %s\n"
+
+#~ msgid ""
+#~ "(could not negotiate a common protocol; see https://mercurial-";
+#~ "scm.org/wiki/SecureConnections for how to configure Mercurial to avoid
this "
+#~ "error)\n"
+#~ msgstr ""
+#~ "(não foi possível negociar um protocolo em comum; veja https://mercurial-";
+#~ "scm.org/wiki/SecureConnections para como configurar o Mercurial para
evitar "
+#~ "este erro)\n"
+
#~ msgid "hooks for integrating with the CIA.vc notification service"
#~ msgstr "ganchos para integração com o serviço de notificação CIA.vc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/mercurial/__version__.py
new/mercurial-3.9.1/mercurial/__version__.py
--- old/mercurial-3.9/mercurial/__version__.py 2016-08-01 18:37:45.000000000
+0200
+++ new/mercurial-3.9.1/mercurial/__version__.py 2016-09-01
21:01:54.000000000 +0200
@@ -1,2 +1,2 @@
# this file is autogenerated by setup.py
-version = "3.9"
+version = "3.9.1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/mercurial/bundle2.py
new/mercurial-3.9.1/mercurial/bundle2.py
--- old/mercurial-3.9/mercurial/bundle2.py 2016-08-01 18:37:20.000000000
+0200
+++ new/mercurial-3.9.1/mercurial/bundle2.py 2016-09-01 21:01:36.000000000
+0200
@@ -353,7 +353,7 @@
try:
for nbpart, part in iterparts:
_processpart(op, part)
- except BaseException as exc:
+ except Exception as exc:
for nbpart, part in iterparts:
# consume the bundle content
part.seek(0, 2)
@@ -382,6 +382,7 @@
The part is guaranteed to have been fully consumed when the function exits
(even if an exception is raised)."""
status = 'unknown' # used by debug output
+ hardabort = False
try:
try:
handler = parthandlermapping.get(part.type)
@@ -436,9 +437,15 @@
outpart = op.reply.newpart('output', data=output,
mandatory=False)
outpart.addparam('in-reply-to', str(part.id), mandatory=False)
+ # If exiting or interrupted, do not attempt to seek the stream in the
+ # finally block below. This makes abort faster.
+ except (SystemExit, KeyboardInterrupt):
+ hardabort = True
+ raise
finally:
# consume the part content to not corrupt the stream.
- part.seek(0, 2)
+ if not hardabort:
+ part.seek(0, 2)
def decodecaps(blob):
@@ -1464,7 +1471,7 @@
def handleoutput(op, inpart):
"""forward output captured on the server to the client"""
for line in inpart.read().splitlines():
- op.ui.status(('remote: %s\n' % line))
+ op.ui.status(_('remote: %s\n') % line)
@parthandler('replycaps')
def handlereplycaps(op, inpart):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/mercurial/exchange.py
new/mercurial-3.9.1/mercurial/exchange.py
--- old/mercurial-3.9/mercurial/exchange.py 2016-08-01 18:37:21.000000000
+0200
+++ new/mercurial-3.9.1/mercurial/exchange.py 2016-09-01 21:01:36.000000000
+0200
@@ -856,7 +856,8 @@
stream = util.chunkbuffer(bundler.getchunks())
try:
try:
- reply = pushop.remote.unbundle(stream, ['force'], 'push')
+ reply = pushop.remote.unbundle(
+ stream, ['force'], pushop.remote.url())
except error.BundleValueError as exc:
raise error.Abort(_('missing support for %s') % exc)
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/mercurial/help/config.txt
new/mercurial-3.9.1/mercurial/help/config.txt
--- old/mercurial-3.9/mercurial/help/config.txt 2016-08-01 18:37:21.000000000
+0200
+++ new/mercurial-3.9.1/mercurial/help/config.txt 2016-09-01
21:01:36.000000000 +0200
@@ -1615,6 +1615,12 @@
Alias definitions for templates. See :hg:`help templates` for details.
+``templates``
+-------------
+
+Use the ``[templates]`` section to define template strings.
+See :hg:`help templates` for details.
+
``trusted``
-----------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/mercurial/help/scripting.txt
new/mercurial-3.9.1/mercurial/help/scripting.txt
--- old/mercurial-3.9/mercurial/help/scripting.txt 2016-08-01
18:37:21.000000000 +0200
+++ new/mercurial-3.9.1/mercurial/help/scripting.txt 2016-09-01
21:01:36.000000000 +0200
@@ -22,7 +22,7 @@
:hg:`serve` can also start a "command server." Clients can connect
to this server and issue Mercurial commands over a special protocol.
For more details on the command server, including links to client
-libraries, see https://mercurial.selenic.com/wiki/CommandServer.
+libraries, see https://www.mercurial-scm.org/wiki/CommandServer.
:hg:`serve` based interfaces (the hgweb and command servers) have the
advantage over simple ``hg`` process invocations in that they are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/mercurial/help/templates.txt
new/mercurial-3.9.1/mercurial/help/templates.txt
--- old/mercurial-3.9/mercurial/help/templates.txt 2016-08-01
18:37:21.000000000 +0200
+++ new/mercurial-3.9.1/mercurial/help/templates.txt 2016-09-01
21:01:36.000000000 +0200
@@ -71,6 +71,20 @@
defines two symbol aliases, ``r`` and ``rn``, and a function alias
``leftpad()``.
+It's also possible to specify complete template strings, using the
+``templates`` section. The syntax used is the general template string syntax.
+
+For example,
+
+::
+
+ [templates]
+ nodedate = "{node|short}: {date(date, "%Y-%m-%d")}\n"
+
+defines a template, ``nodedate``, which can be called like::
+
+ $ hg log -r . -Tnodedate
+
Some sample command line templates:
- Format lists, e.g. files::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/mercurial/revset.py
new/mercurial-3.9.1/mercurial/revset.py
--- old/mercurial-3.9/mercurial/revset.py 2016-08-01 18:37:21.000000000
+0200
+++ new/mercurial-3.9.1/mercurial/revset.py 2016-09-01 21:01:36.000000000
+0200
@@ -2423,6 +2423,9 @@
elif op == 'list':
ws, ts = zip(*(_optimize(y, small) for y in x[1:]))
return sum(ws), (op,) + ts
+ elif op == 'keyvalue':
+ w, t = _optimize(x[2], small)
+ return w, (op, x[1], t)
elif op == 'func':
f = getsymbol(x[1])
wa, ta = _optimize(x[2], small)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/tests/test-bundle2-exchange.t
new/mercurial-3.9.1/tests/test-bundle2-exchange.t
--- old/mercurial-3.9/tests/test-bundle2-exchange.t 2016-08-01
18:37:21.000000000 +0200
+++ new/mercurial-3.9.1/tests/test-bundle2-exchange.t 2016-09-01
21:01:36.000000000 +0200
@@ -257,7 +257,7 @@
remote: lock: free
remote: wlock: free
remote: postclose-tip:eea13746799a public book_eea1
- remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1
HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f
HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1
HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob)
+ remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1
HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f
HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1
HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/other (glob)
updating bookmark book_eea1
pre-close-tip:02de42196ebe draft book_02de
postclose-tip:02de42196ebe draft book_02de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/tests/test-hook.t
new/mercurial-3.9.1/tests/test-hook.t
--- old/mercurial-3.9/tests/test-hook.t 2016-08-01 18:37:22.000000000 +0200
+++ new/mercurial-3.9.1/tests/test-hook.t 2016-09-01 21:01:36.000000000
+0200
@@ -236,9 +236,9 @@
searching for changes
no changes found
pretxnopen hook: HG_TXNID=TXN:* HG_TXNNAME=push (glob)
- pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_PENDING=$TESTTMP/a
HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob)
+ pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_PENDING=$TESTTMP/a
HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/a (glob)
pushkey hook: HG_KEY=foo HG_NAMESPACE=bookmarks
HG_NEW=0000000000000000000000000000000000000000 HG_RET=1
- txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_SOURCE=push
HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob)
+ txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_SOURCE=push
HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/a (glob)
exporting bookmark foo
[1]
$ cd ../a
@@ -271,7 +271,7 @@
listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar':
'0000000000000000000000000000000000000000', 'foo':
'0000000000000000000000000000000000000000'}
no changes found
pretxnopen hook: HG_TXNID=TXN:* HG_TXNNAME=push (glob)
- prepushkey.forbid hook: HG_BUNDLE2=1 HG_KEY=baz HG_NAMESPACE=bookmarks
HG_NEW=0000000000000000000000000000000000000000 HG_SOURCE=push HG_TXNID=TXN:*
HG_URL=push (glob)
+ prepushkey.forbid hook: HG_BUNDLE2=1 HG_KEY=baz HG_NAMESPACE=bookmarks
HG_NEW=0000000000000000000000000000000000000000 HG_SOURCE=push HG_TXNID=TXN:*
HG_URL=file:$TESTTMP/a (glob)
pushkey-abort: prepushkey hook exited with status 1
abort: exporting bookmark baz failed!
[255]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mercurial-3.9/tests/test-revset.t
new/mercurial-3.9.1/tests/test-revset.t
--- old/mercurial-3.9/tests/test-revset.t 2016-08-01 18:37:21.000000000
+0200
+++ new/mercurial-3.9.1/tests/test-revset.t 2016-09-01 21:01:36.000000000
+0200
@@ -470,6 +470,25 @@
hg: parse error: can't use a key-value pair in this context
[255]
+ right-hand side should be optimized recursively
+
+ $ try --optimize 'foo=(not public())'
+ (keyvalue
+ ('symbol', 'foo')
+ (group
+ (not
+ (func
+ ('symbol', 'public')
+ None))))
+ * optimized:
+ (keyvalue
+ ('symbol', 'foo')
+ (func
+ ('symbol', '_notpublic')
+ None))
+ hg: parse error: can't use a key-value pair in this context
+ [255]
+
Test that symbols only get parsed as functions if there's an opening
parenthesis.
@@ -1649,6 +1668,11 @@
hg: parse error: topo.firstbranch can only be used when using the topo sort
key
[255]
+topo.firstbranch should accept any kind of expressions:
+
+ $ hg log -r 'sort(0, topo, topo.firstbranch=(book1))'
+ 0 b12 m111 u112 111 10800
+
$ cd ..
$ cd repo
++++++ mercurial.keyring ++++++
++++ 1394 lines (skipped)
++++ between mercurial.keyring
++++ and /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.keyring
