Andrei Polushin <polushin@gmail.com> [Wed, 11 Jan 2012 04:12:11 +0700] rev 15863
i18n-ru: using correct abbreviated units for megabytes.
See http://ru.wikipedia.org/wiki/МБ
Olav Reinert <seroton10@gmail.com> [Wed, 11 Jan 2012 18:14:55 +0100] rev 15862
help: fix column alignment in "hg help" output
The output of "hg help" is changed to ensure that the column containing
descriptions of commands, extensions, and other topics is correctly alignmened.
Olav Reinert <seroton10@gmail.com> [Wed, 11 Jan 2012 18:08:25 +0100] rev 15861
minirst: simplify and standardize field list formatting
The default width of field lists is changed from 12 to 14 to align minirst with
the rst2html tool. Shrinking the width of the left column to fit the content is
removed, to keep formatting simple and uniform.
Na'Tosha Bard <natosha@unity3d.com> [Wed, 11 Jan 2012 16:53:51 +0100] rev 15860
largefiles: correctly download new largefiles when merging
There is a bug in the merge process where, if a new largefile is introduced
in a merge and the user does not have that largefile in his repo's local store
nor in his system cache, the working copy will retain the old largefile. Upon
the commit of the merge, the standin is re-written to contain the hash of the
old largefile, and the lfdirstate retains a "Modified" status for the file.
The end result is that the largefile can show up in the merge commit as
"Modified", but the standin has no diff. This is wrong in two ways:
1) Such a "wedged" history with a nonsense change in a commit should not be
possible
2) It effectively reverts a largefile to an old version when doing a merge
This is caused by the fact that the updatelfiles() command always checks the
current largefile's hash against the hash stored in the current node's standin.
This is correct behavior in every case except for a merge. When merging, we
must assume that the standin in the working copy contains the correct hash,
because the original hg.merge() has already updated it for us.
This patch fixes the issue by patching the repo object to carry a "_ismerging"
attribute, that the updatelfiles() command checks for. When this attribute is
found, it checks against the working copy's standin, rather than the standin
in the current node.
Markus Zapke-Gründemann <info@keimlink.de> [Wed, 11 Jan 2012 15:38:31 +0100] rev 15859
tests: add htmlcov option
Matt Mackall <mpm@selenic.com> [Thu, 12 Jan 2012 14:39:02 -0600] rev 15858
run-tests: use a list comprehension instead of map
Markus Zapke-Gründemann <info@keimlink.de> [Wed, 11 Jan 2012 15:37:25 +0100] rev 15857
tests: fix omit path list
All directories need a trailing asterisk. Otherwise the files are not excluded
from coverage.
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 14:52:47 +0100] rev 15856
commands: partial backout of fbb68b382040
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:53:51 +0100] rev 15855
phase: add metavar to -r help text
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:50:06 +0100] rev 15854
phase: the REV argument can be repeated
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:38:49 +0100] rev 15853
commands: no need to rename merge and phases on import
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:34:09 +0100] rev 15852
phase: there is actually no -C option
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:29:47 +0100] rev 15851
phase: use standard syntax for command line flags
We don't mark them as literal text and we mention the short option the
first time we talk about a given flag.
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:26:24 +0100] rev 15850
phase: fix RST markup (use ``...`` for literal text)
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:23:45 +0100] rev 15849
phase: lowercase option help, rephrase slightly
Yuya Nishihara <yuya@tcha.org> [Thu, 12 Jan 2012 00:49:45 +0900] rev 15848
filectx: fix cmp() of file starting with '\1\n'
If file data starts with '\1\n', it will be escaped in the revlog to
create an empty metadata block, thus adding four bytes to the size in
the revlog size index. There's no way to detect that this has happened
in filelog.size() faster than decompressing each revision [1].
For filectx.cmp(), we have the size of the file in the working directory
available. If it differs by exactly four bytes, it may be this case, so
do a full comparison.
[1]: http://markmail.org/message/5akdbmmqx7vq2fsg
Matt Mackall <mpm@selenic.com> [Wed, 11 Jan 2012 09:27:53 -0600] rev 15847
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 11 Jan 2012 09:27:37 -0600] rev 15846
merge with i18n
Matt Mackall <mpm@selenic.com> [Wed, 11 Jan 2012 09:26:47 -0600] rev 15845
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 10 Jan 2012 15:56:33 -0200] rev 15844
i18n-pt_BR: synchronized with e6c44dbe902f
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 10 Jan 2012 15:48:16 -0200] rev 15843
merge with i18n
Andrei Polushin <polushin@gmail.com> [Mon, 09 Jan 2012 02:32:01 +0700] rev 15842
i18n-ru: spellcheck
Andrei Polushin <polushin@gmail.com> [Mon, 09 Jan 2012 01:12:54 +0700] rev 15841
i18n-ru: editorial for vocabulary words.
Edited for: backup, bundle, repository, checkout
Andrei Polushin <polushin@gmail.com> [Sun, 08 Jan 2012 19:16:22 +0700] rev 15840
i18n-ru: editorial for hg help hgignore
Steven Brown <StevenGBrown@gmail.com> [Wed, 11 Jan 2012 22:18:20 +0800] rev 15839
tests: make {date|age} template output independent of the current date
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 11 Jan 2012 00:27:46 +0100] rev 15838
phases: make outgoing object and discovery aware of exclusion
The outgoing object gains an "excluded" members holding all changesets which
were excluded because there where secret.
The core discovery code now remove secret changeset from discovery by default.
This means that any command relying on discovery will exclude secret changeset.
Most notable one are outgoing and bundle. (But bundle with and explicit
``--base`` still allow to bundle outgoing changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 09 Jan 2012 03:47:16 +0100] rev 15837
discovery: introduce outgoing object for result of findcommonoutgoing
Simplifies client logic in multiple places since it encapsulates the
computation of the common and, more importantly, the missing node lists.
This also allows an upcomping patch to communicate precomputed versions of
these lists to clients.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 09 Jan 2012 04:16:00 +0100] rev 15836
commands: make bundle use heads computed by findoutgoing
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 09 Jan 2012 04:15:31 +0100] rev 15835
revlog: improve docstring for findcommonmissing
Martin Geisler <mg@aragost.com> [Wed, 11 Jan 2012 15:51:02 +0100] rev 15834
commands: bump copyright year
Matt Mackall <mpm@selenic.com> [Tue, 10 Jan 2012 16:36:36 -0600] rev 15833
phase: mark messages for i18n
Matt Mackall <mpm@selenic.com> [Tue, 10 Jan 2012 16:36:33 -0600] rev 15832
phase: fix up help string
Matt Mackall <mpm@selenic.com> [Tue, 10 Jan 2012 16:36:32 -0600] rev 15831
phase: drop reference to working directory phase
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 10 Jan 2012 19:45:35 +0100] rev 15830
phases: add a phases command to display and manipulate phases
Ion Savin <ion.savin@tora.com> [Tue, 10 Jan 2012 10:18:19 +0200] rev 15829
annotate: append newline after non newline-terminated file listings
The last line of a non newline-terminated file would mix with the first line of
the next file in multiple-file listings before this patch.
Possible compatibility issue: no longer possible to tell from the annotate
output if the file is terminated by new line or not.
Matt Mackall <mpm@selenic.com> [Tue, 10 Jan 2012 13:48:42 -0600] rev 15828
subrepo: avoid syncing bookmarks twice on clone (issue3191)
Clone internally handles bookmark synchronization.
(Fix spotted by Eric Blood)
Steven Brown <StevenGBrown@gmail.com> [Tue, 10 Jan 2012 22:35:25 +0800] rev 15827
revlog: clarify strip docstring "readd" -> "re-add"
I misread it as "read".
Martin Geisler <mg@aragost.com> [Tue, 10 Jan 2012 15:23:49 +0100] rev 15826
merge with stable
Martin Geisler <mg@aragost.com> [Tue, 10 Jan 2012 15:20:16 +0100] rev 15825
filesets: use example with quotes for encoding predicate
A user on IRC was confused that "encoding(ASCII)" works and
"encoding(UTF-8)" fails with "parse error: encoding requires an
encoding name".
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 07 Jan 2012 17:03:33 +0100] rev 15824
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 06 Jan 2012 11:20:49 +0100] rev 15823
phases: ``{phase}`` template keyword display the phase name
``{phaseidx}`` is providing the phase index as integer. This integer
representation is useful when people need to use the fact that phase are
ordered.
Test keep using the number version for readability purpose.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 29 Dec 2011 04:40:09 +0100] rev 15822
phases: add a phasestr method on context
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 04 Jan 2012 01:02:16 +0100] rev 15821
phases: add list of string to access phase name
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 04 Jan 2012 01:12:31 +0100] rev 15820
phases: fix phase synchronization on push
The bugs seemed to show up when element not in future common changeset should
hold new hold phase data.
The whole phase push machinery was rewritten in the process.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 06 Jan 2012 10:04:20 +0100] rev 15819
phases: implements simple revset symbol
This changeset adds ``public()``, ``draft()`` and ``secret`` symbol for
revset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 06 Jan 2012 09:51:35 +0100] rev 15818
phases: store phase values in constant instead of using raw integer
Phases constant are named after the phase name. Usage of integer have been
replaced by proper constant.
Mads Kiilerich <mads@kiilerich.com> [Mon, 09 Jan 2012 14:56:05 +0100] rev 15817
sslutil: abort properly if no certificate received for https connection
According to the documentation SSLSocket.getpeercert() can return None.
Mads Kiilerich <mads@kiilerich.com> [Mon, 09 Jan 2012 14:43:25 +0100] rev 15816
sslutil: work around validator crash getting certificate on failed sockets
The previous workaround for correct handling of wrapping of failing connections
might be enough to prevent this from happening, but the check here makes this
function more robust.
Mads Kiilerich <mads@kiilerich.com> [Mon, 09 Jan 2012 14:43:24 +0100] rev 15815
sslutil: reorder validator code to make it more readable
Mads Kiilerich <mads@kiilerich.com> [Mon, 09 Jan 2012 14:43:24 +0100] rev 15814
sslutil: show fingerprint when cacerts validation fails
Mads Kiilerich <mads@kiilerich.com> [Mon, 09 Jan 2012 14:43:23 +0100] rev 15813
sslutil: handle setups without .getpeercert() early in the validator
This simplifies the code and makes the flow more obvious and reduces the
indentation level.
Mads Kiilerich <mads@kiilerich.com> [Mon, 09 Jan 2012 14:43:15 +0100] rev 15812
sslutil: verify that wrap_socket really wrapped the socket
This works around that ssl.wrap_socket silently skips ssl negotiation on
sockets that was connected but since then has been reset by the peer but not
yet closed at the Python level. That leaves the socket in a state where
.getpeercert() fails with an AttributeError on None. See
http://bugs.python.org/issue13721 .
A call to .cipher() is now used to verify that the wrapping really did succeed.
Otherwise it aborts with "ssl connection failed".
Levi Bard <levi@unity3d.com> [Sun, 08 Jan 2012 17:46:27 +0100] rev 15811
largefiles: remove pasted code
Refactor and remove pasted code from lfcommands.py
Levi Bard <levi@unity3d.com> [Sun, 08 Jan 2012 17:09:01 +0100] rev 15810
largefiles: add tests for uncovered codepaths (issue3092)
Add tests for lfconvert codepaths where:
* largefiles have been both renamed and relinked
* .hgtags has invalid content
Levi Bard <levi@unity3d.com> [Sun, 08 Jan 2012 17:06:34 +0100] rev 15809
largefiles: add error checking to tags conversion (issue3092)
Check for errors when parsing .hgtags during lfconvert,
and skip lines that don't parse or refer to invalid changesets.
Levi Bard <levi@unity3d.com> [Sun, 08 Jan 2012 17:03:39 +0100] rev 15808
largefiles: don't reference uninitialized variable (issue3092)
Matt Mackall <mpm@selenic.com> [Mon, 09 Jan 2012 20:17:37 -0600] rev 15807
merge with i18n
Alexander Sauta <demosito@gmail.com> [Sun, 08 Jan 2012 13:54:36 +0400] rev 15806
i18n-ru: synchronized with e251250ac20b
Andrei Polushin <polushin@gmail.com> [Sun, 08 Jan 2012 03:48:09 +0700] rev 15805
i18n-ru: revsets predicates translated
Alexander Sauta <demosito@gmail.com> [Fri, 06 Jan 2012 00:16:14 +0400] rev 15804
i18-ru: debug commands translated
Alexander Sauta <demosito@gmail.com> [Thu, 05 Jan 2012 02:04:30 +0400] rev 15803
i18n-ru: user prompt related strings translated
Alexander Sauta <demosito@gmail.com> [Thu, 05 Jan 2012 01:00:43 +0400] rev 15802
i18n-ru: tanslated record-zeroconf
Matt Mackall <mpm@selenic.com> [Mon, 09 Jan 2012 20:16:57 -0600] rev 15801
merge with stable
Steven Brown <StevenGBrown@gmail.com> [Sun, 08 Jan 2012 23:09:35 +0800] rev 15800
rebase: reinstate old-style rev spec support for the source and base (issue3181)
As of b12362ab13e7 (first released as part of Mercurial 2.0), the rebase command
accepted ONLY revsets for the source and base arguments and no longer accepted
old-style revision specifications. As a result, some revision names were no
longer recognised, e.g.
hg rebase --base br-anch
abort: unknown revision 'br'!
These arguments are now interpreted first as old-style revision specifications,
then as revsets when no matching revision is found. This restores backwards
compatibility with releases prior to 2.0.