Yuya Nishihara <yuya@tcha.org> [Thu, 26 Feb 2015 23:30:33 +0900] rev 24152
dispatch: work around UnicodeDecodeError caused by SSLError of Python 2.7.9
SSLError of Python 2.7.9 may keep error message in unicode. It will be
wrapped by URLError(reason) at KeepAliveHandler.do_open, so inst.reason can
be a unicode.
https://hg.python.org/cpython/file/v2.7.9/Modules/_ssl.c#l329
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 05 Feb 2015 14:45:49 +0900] rev 24151
revset: mask specific names for named() predicate
Before this patch, revset predicate "tag()" and "named('tags')" differ
from each other, because the former doesn't include "tip" but the
latter does.
For equivalence, "named('tags')" shouldn't include the revision
corresponded to "tip". But just removing "tip" from the "tags"
namespace causes breaking backward compatibility, even though "tip"
itself is planned to be eliminated, as mentioned below.
http://selenic.com/pipermail/mercurial-devel/2015-February/066157.html
To mask specific names ("tip" in this case) for "named()" predicate,
this patch introduces "deprecated" into "namespaces", and makes
"named()" predicate examine whether each names are masked by the
namespace, to which they belong.
"named()" will really work correctly after 3.3.1 (see 873eb5db89c8 for
detail), and fixing this on STABLE before 3.3.1 can prevent initial
users of "named()" from expecting "named('tags')" to include "tip".
It is reason why this patch is posted for STABLE, even though problem
itself isn't so serious.
This may have to be flagged as "(BC)", if applied on DEFAULT.
Wagner Bruna <wbruna@yahoo.com> [Sun, 01 Mar 2015 00:18:43 -0300] rev 24150
i18n-pt_BR: synchronized with 756c5c8331b0
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 01 Mar 2015 01:28:05 +0900] rev 24149
i18n-ja: synchronized with 756c5c8331b0
Matt Mackall <mpm@selenic.com> [Fri, 27 Feb 2015 17:46:03 -0600] rev 24148
merge with stable
Martin von Zweigbergk <martinvonz@google.com> [Tue, 24 Feb 2015 09:08:54 -0800] rev 24147
manifest: rename 'mf', 'map', and 'mapping' to 'm'
We mostly call manifest variables 'm', so let's use that in
manifest.py too. This makes it clearer that the variables do, in fact,
contain manifestsdict instances and never a plain dict.
Martin von Zweigbergk <martinvonz@google.com> [Mon, 23 Feb 2015 13:41:02 -0800] rev 24146
manifest: make copy logic local to copy()
The optional arguments to the manfifestdict constructor are only used
by copy(), so assign the fields from that method instead so it's clear
that the arguments are not used for anything else.
Matt Harbison <matt_harbison@yahoo.com> [Sat, 21 Feb 2015 00:40:18 -0500] rev 24145
extensions: indicate loaded for an immediately called afterload callback
Otherwise, there's no way to tell between the immediate callback when it is
already loaded, and when the extension is not loaded at all.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 24 Feb 2015 00:08:04 -0800] rev 24144
tests: add test showing tags cache drops filtered heads (issue4550)
The tags cache can lose .hgtags filenode entries for filtered heads. Add
a test demonstrating this (bad) behavior.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 24 Feb 2015 00:06:47 -0800] rev 24143
tags: write tags cache deterministically
An upcoming test verifies content of the .hg/cache/tags file. During
testing, inconsistent output was observed. This is the result of
iterating over a dictionary.
Throw a sorted() around tags entries to ensure .hg/cache/tags is written
deterministically so test output is stable.
Mateusz Kwapich <mitrandir@fb.com> [Thu, 22 Jan 2015 12:36:38 -0800] rev 24142
histedit: add --edit-plan option to histedit
--edit-plan allows user to edit remaining histedit rules in the middle of
histedit process
Mateusz Kwapich <mitrandir@fb.com> [Thu, 22 Jan 2015 10:52:50 -0800] rev 24141
histedit: generalize makedesc
Allow makedesc to generate description for any action - not only pick.
(to be used in histedit --edit-plan)
Mateusz Kwapich <mitrandir@fb.com> [Mon, 23 Feb 2015 10:57:27 -0800] rev 24140
histedit: extract method ruleeditor
Extract functionality of editing histedit rules to separate method so we can
reuse it in upcoming --edit-plan option.
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Tue, 24 Feb 2015 11:37:07 -0500] rev 24139
churn: deprecate -t option in favour of -T
We use -T consistently elsewhere to refer to the --template option.
The old -t option is now renamed to --oldtemplate so that -t still
works. This has the benign side effect of introducing and immediately
deprecating a new long option.
We also test with both -t and -T options.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 24 Feb 2015 10:55:24 +0100] rev 24138
pull: print "pulling from foo" before accessing the other repo
1. This is consistent with pushing.
2. This allows to see the URL of the other repo in case accessing the repo
fails, e.g. wrong ssh path or issues with the https certificate, without
using --debug or showconfig paths.
Additionally add test for this in the context of ssh with a wrong path.