--- a/.hgsigs Sun Jul 02 04:26:42 2017 +0200
+++ b/.hgsigs Wed Jul 05 11:55:26 2017 -0400
@@ -145,3 +145,4 @@
616e788321cc4ae9975b7f0c54c849f36d82182b 0 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
--- a/.hgtags Sun Jul 02 04:26:42 2017 +0200
+++ b/.hgtags Wed Jul 05 11:55:26 2017 -0400
@@ -158,3 +158,4 @@
616e788321cc4ae9975b7f0c54c849f36d82182b 4.2-rc
bb96d4a497432722623ae60d9bc734a1e360179e 4.2
c850f0ed54c1d42f9aa079ad528f8127e5775217 4.2.1
+26c49ed51a698ec016d2b4c6b44ca3c3f73cc788 4.2.2
--- a/i18n/pt_BR.po Sun Jul 02 04:26:42 2017 +0200
+++ b/i18n/pt_BR.po Wed Jul 05 11:55:26 2017 -0400
@@ -27870,12 +27870,15 @@
" pager = less -FRX"
msgid ""
-"If no pager is set, Mercurial uses the environment variable\n"
-"$PAGER. If neither pager.pager, nor $PAGER is set, a default pager\n"
-"will be used, typically `less` on Unix and `more` on Windows."
-msgstr ""
-"Se nenhum paginador estiver definido, o Mercurial usará a variável de\n"
-"ambiente $PAGER. Se nem pager.pager nem $PAGER estiverem definidas,\n"
+"If no pager is set in the user or repository configuration, Mercurial uses the\n"
+"environment variable $PAGER. If $PAGER is not set, pager.pager from the default\n"
+"or system configuration is used. If none of these are set, a default pager will\n"
+"be used, typically `less` on Unix and `more` on Windows."
+msgstr ""
+"Se nenhum paginador estiver definido nas configurações do usuário\n"
+"ou do repositório, o Mercurial usará a variável de ambiente $PAGER.\n"
+"Se $PAGER não estiver definida, será usada a configuração pager.pager\n"
+"padrão ou de sistema. Se nenhuma dessas estiver definida,\n"
"um paginador padrão será usado, tipicamente `less` em Unix e\n"
"`more` no Windows."
@@ -28079,7 +28082,8 @@
" *.c any name ending in \".c\" in the current directory\n"
" **.c any name ending in \".c\" in any subdirectory of the\n"
" current directory including itself.\n"
-" foo/* any file in directory foo plus all its subdirectories,\n"
+" foo/* any file in directory foo\n"
+" foo/** any file in directory foo plus all its subdirectories,\n"
" recursively\n"
" foo/*.c any name ending in \".c\" in the directory foo\n"
" foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
@@ -28091,7 +28095,8 @@
" atual\n"
" **.c qualquer nome terminado por \".c\" no diretório\n"
" atual ou em qualquer subdiretório\n"
-" foo/* qualquer arquivo no diretório foo, ou em qualquer\n"
+" foo/* qualquer arquivo no diretório foo\n"
+" foo/** qualquer arquivo no diretório foo, ou em qualquer\n"
" de seus sub-diretórios, recursivamente\n"
" foo/*.c qualquer nome terminado por \".c\" no diretório\n"
" foo\n"
--- a/mercurial/help/config.txt Sun Jul 02 04:26:42 2017 +0200
+++ b/mercurial/help/config.txt Wed Jul 05 11:55:26 2017 -0400
@@ -861,31 +861,31 @@
Most hooks are run with environment variables set that give useful
additional information. For each hook below, the environment variables
-it is passed are listed with names of the form ``$HG_foo``. The
+it is passed are listed with names in the form ``$HG_foo``. The
``$HG_HOOKTYPE`` and ``$HG_HOOKNAME`` variables are set for all hooks.
-their respectively contains the type of hook which triggered the run and
-the full name of the hooks in the config. In the example about this will
+They contain the type of hook which triggered the run and the full name
+of the hook in the config, respectively. In the example above, this will
be ``$HG_HOOKTYPE=incoming`` and ``$HG_HOOKNAME=incoming.email``.
``changegroup``
- Run after a changegroup has been added via push, pull or unbundle. ID of the
- first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL
- from which changes came is in ``$HG_URL``.
+ Run after a changegroup has been added via push, pull or unbundle. The ID of
+ the first new changeset is in ``$HG_NODE`` and last is in ``$HG_NODE_LAST``.
+ The URL from which changes came is in ``$HG_URL``.
``commit``
- Run after a changeset has been created in the local repository. ID
+ Run after a changeset has been created in the local repository. The ID
of the newly created changeset is in ``$HG_NODE``. Parent changeset
IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
``incoming``
Run after a changeset has been pulled, pushed, or unbundled into
the local repository. The ID of the newly arrived changeset is in
- ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``.
+ ``$HG_NODE``. The URL that was source of the changes is in ``$HG_URL``.
``outgoing``
- Run after sending changes from local repository to another. ID of
- first changeset sent is in ``$HG_NODE``. Source of operation is in
- ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook.
+ Run after sending changes from the local repository to another. The ID of
+ first changeset sent is in ``$HG_NODE``. The source of operation is in
+ ``$HG_SOURCE``. Also see :hg:`help config.hooks.preoutgoing`.
``post-<command>``
Run after successful invocations of the associated command. The
@@ -917,93 +917,94 @@
``prechangegroup``
Run before a changegroup is added via push, pull or unbundle. Exit
- status 0 allows the changegroup to proceed. Non-zero status will
- cause the push, pull or unbundle to fail. URL from which changes
+ status 0 allows the changegroup to proceed. A non-zero status will
+ cause the push, pull or unbundle to fail. The URL from which changes
will come is in ``$HG_URL``.
``precommit``
Run before starting a local commit. Exit status 0 allows the
- commit to proceed. Non-zero status will cause the commit to fail.
+ commit to proceed. A non-zero status will cause the commit to fail.
Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
``prelistkeys``
Run before listing pushkeys (like bookmarks) in the
- repository. Non-zero status will cause failure. The key namespace is
+ repository. A non-zero status will cause failure. The key namespace is
in ``$HG_NAMESPACE``.
``preoutgoing``
Run before collecting changes to send from the local repository to
- another. Non-zero status will cause failure. This lets you prevent
- pull over HTTP or SSH. Also prevents against local pull, push
- (outbound) or bundle commands, but not effective, since you can
- just copy files instead then. Source of operation is in
- ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote
- SSH or HTTP repository. If "push", "pull" or "bundle", operation
- is happening on behalf of repository on same system.
+ another. A non-zero status will cause failure. This lets you prevent
+ pull over HTTP or SSH. It can also prevent propagating commits (via
+ local pull, push (outbound) or bundle commands), but not completely,
+ since you can just copy files instead. The source of operation is in
+ ``$HG_SOURCE``. If "serve", the operation is happening on behalf of a remote
+ SSH or HTTP repository. If "push", "pull" or "bundle", the operation
+ is happening on behalf of a repository on same system.
``prepushkey``
Run before a pushkey (like a bookmark) is added to the
- repository. Non-zero status will cause the key to be rejected. The
+ repository. A non-zero status will cause the key to be rejected. The
key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,
the old value (if any) is in ``$HG_OLD``, and the new value is in
``$HG_NEW``.
``pretag``
Run before creating a tag. Exit status 0 allows the tag to be
- created. Non-zero status will cause the tag to fail. ID of
- changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is
- local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``.
+ created. A non-zero status will cause the tag to fail. The ID of the
+ changeset to tag is in ``$HG_NODE``. The name of tag is in ``$HG_TAG``. The
+ tag is local if ``$HG_LOCAL=1``, or in the repository if ``$HG_LOCAL=0``.
``pretxnopen``
Run before any new repository transaction is open. The reason for the
- transaction will be in ``$HG_TXNNAME`` and a unique identifier for the
+ transaction will be in ``$HG_TXNNAME``, and a unique identifier for the
transaction will be in ``HG_TXNID``. A non-zero status will prevent the
transaction from being opened.
``pretxnclose``
Run right before the transaction is actually finalized. Any repository change
will be visible to the hook program. This lets you validate the transaction
- content or change it. Exit status 0 allows the commit to proceed. Non-zero
+ content or change it. Exit status 0 allows the commit to proceed. A non-zero
status will cause the transaction to be rolled back. The reason for the
- transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for
+ transaction opening will be in ``$HG_TXNNAME``, and a unique identifier for
the transaction will be in ``HG_TXNID``. The rest of the available data will
- vary according the transaction type. New changesets will add ``$HG_NODE`` (id
- of the first added changeset), ``$HG_NODE_LAST`` (id of the last added
- changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases
- changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc.
+ vary according the transaction type. New changesets will add ``$HG_NODE``
+ (the ID of the first added changeset), ``$HG_NODE_LAST`` (the ID of the last
+ added changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables. Bookmark and
+ phase changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``
+ respectively, etc.
``txnclose``
Run after any repository transaction has been committed. At this
point, the transaction can no longer be rolled back. The hook will run
- after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for
+ after the lock is released. See :hg:`help config.hooks.pretxnclose` for
details about available variables.
``txnabort``
Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose`
- docs for details about available variables.
+ for details about available variables.
``pretxnchangegroup``
Run after a changegroup has been added via push, pull or unbundle, but before
- the transaction has been committed. Changegroup is visible to hook program.
- This lets you validate incoming changes before accepting them. Passed the ID
- of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``.
- Exit status 0 allows the transaction to commit. Non-zero status will cause
- the transaction to be rolled back and the push, pull or unbundle will fail.
- URL that was source of changes is in ``$HG_URL``.
+ the transaction has been committed. The changegroup is visible to the hook
+ program. This allows validation of incoming changes before accepting them.
+ The ID of the first new changeset is in ``$HG_NODE`` and last is in
+ ``$HG_NODE_LAST``. Exit status 0 allows the transaction to commit. A non-zero
+ status will cause the transaction to be rolled back, and the push, pull or
+ unbundle will fail. The URL that was the source of changes is in ``$HG_URL``.
``pretxncommit``
- Run after a changeset has been created but the transaction not yet
- committed. Changeset is visible to hook program. This lets you
- validate commit message and changes. Exit status 0 allows the
- commit to proceed. Non-zero status will cause the transaction to
- be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset
- IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
+ Run after a changeset has been created, but before the transaction is
+ committed. The changeset is visible to the hook program. This allows
+ validation of the commit message and changes. Exit status 0 allows the
+ commit to proceed. A non-zero status will cause the transaction to
+ be rolled back. The ID of the new changeset is in ``$HG_NODE``. The parent
+ changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
``preupdate``
Run before updating the working directory. Exit status 0 allows
- the update to proceed. Non-zero status will prevent the update.
- Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID
- of second new parent is in ``$HG_PARENT2``.
+ the update to proceed. A non-zero status will prevent the update.
+ The changeset ID of first new parent is in ``$HG_PARENT1``. If updating to a
+ merge, the ID of second new parent is in ``$HG_PARENT2``.
``listkeys``
Run after listing pushkeys (like bookmarks) in the repository. The
@@ -1017,20 +1018,20 @@
value is in ``$HG_NEW``.
``tag``
- Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.
- Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in
- repository if ``$HG_LOCAL=0``.
+ Run after a tag is created. The ID of the tagged changeset is in ``$HG_NODE``.
+ The name of tag is in ``$HG_TAG``. The tag is local if ``$HG_LOCAL=1``, or in
+ the repository if ``$HG_LOCAL=0``.
``update``
- Run after updating the working directory. Changeset ID of first
- new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is
- in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the
- update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``.
+ Run after updating the working directory. The changeset ID of first
+ new parent is in ``$HG_PARENT1``. If updating to a merge, the ID of second new
+ parent is in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the
+ update failed (e.g. because conflicts were not resolved), ``$HG_ERROR=1``.
.. note::
It is generally better to use standard hooks rather than the
- generic pre- and post- command hooks as they are guaranteed to be
+ generic pre- and post- command hooks, as they are guaranteed to be
called in the appropriate contexts for influencing transactions.
Also, hooks like "commit" will be called in all contexts that
generate a commit (e.g. tag) and not just the commit command.