Mon, 02 Mar 2015 01:06:31 -0600 Added signature for changeset 5b4ed033390b stable
Matt Mackall <mpm@selenic.com> [Mon, 02 Mar 2015 01:06:31 -0600] rev 24161
Added signature for changeset 5b4ed033390b
Mon, 02 Mar 2015 01:06:27 -0600 Added tag 3.3.1 for changeset 5b4ed033390b stable
Matt Mackall <mpm@selenic.com> [Mon, 02 Mar 2015 01:06:27 -0600] rev 24160
Added tag 3.3.1 for changeset 5b4ed033390b
Fri, 06 Feb 2015 02:52:10 +0100 revisionbranchcache: fall back to slow path if starting readonly (issue4531) stable 3.3.1
Mads Kiilerich <madski@unity3d.com> [Fri, 06 Feb 2015 02:52:10 +0100] rev 24159
revisionbranchcache: fall back to slow path if starting readonly (issue4531) Transitioning to Mercurial versions with revision branch cache could be slow as long as all operations were readonly (revset queries) and the cache would be populated but not written back. Instead, fall back to using the consistently slow path when readonly and the cache doesn't exist yet. That avoids the overhead of populating the cache without writing it back. If not readonly, it will still populate all missing entries initially. That avoids repeated writing of the cache file with small updates, and it also makes sure a fully populated cache available for the readonly operations.
Thu, 26 Feb 2015 06:03:39 +0900 largefiles: access to specific fields only if largefiles enabled (issue4547) stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 26 Feb 2015 06:03:39 +0900] rev 24158
largefiles: access to specific fields only if largefiles enabled (issue4547) Even if largefiles extension is enabled in a repository, "repo" object, which isn't "largefiles.reposetup()"-ed, is passed to overridden functions in the cases below unexpectedly, because extensions are enabled for each repositories strictly. (1) clone without -U: (2) pull with -U: (3) pull with --rebase: combination of "enabled@src", "disabled@dst" and "not-required@src" cause this situation. largefiles requirement @src @dst @src result -------- -------- --------------- -------------------- enabled disabled not-required aborted unexpectedly required requirement error (intentional) -------- -------- --------------- -------------------- enabled enabled * success -------- -------- --------------- -------------------- disabled enabled * success (only for "pull") -------- -------- --------------- -------------------- disabled disabled not-required success required requirement error (intentional) -------- -------- --------------- -------------------- (4) update/revert with a subrepo disabling largefiles In these cases, overridden functions cause accessing to largefiles specific fields of not "largefiles.reposetup()"-ed "repo" object, and execution is aborted. - (1), (2), (4) cause accessing to "_lfstatuswriters" in "getstatuswriter()" invoked via "updatelfiles()" - (3) causes accessing to "_lfcommithooks" in "overriderebase()" For safe accessing to these fields, this patch examines whether passed "repo" object is "largefiles.reposetup()"-ed or not before accessing to them. This patch chooses examining existence of newly introduced "_largefilesenabled" instead of "_lfcommithooks" and "_lfstatuswriters" directly, because the former is better name for the generic "largefiles is enabled in this repo" mark than the latter. In the future, all other overridden functions should avoid largefiles specific processing for efficiency, and "_largefilesenabled" is better also for such purpose. BTW, "lfstatus" can't be used for such purpose, because some code paths set it forcibly regardless of existence of it in specified "repo" object.
Wed, 18 Feb 2015 22:17:35 +0900 templatekw: fix {join(bookmarks, sep)} to always show associated bookmarks stable
Yuya Nishihara <yuya@tcha.org> [Wed, 18 Feb 2015 22:17:35 +0900] rev 24157
templatekw: fix {join(bookmarks, sep)} to always show associated bookmarks The default joinfmt, "x.values()[0]", can't be used here because it picks either 'bookmark' or 'current' randomly. I got wrong result with PYTHONHASHSEED=1 on my amd64 machine.
Wed, 18 Feb 2015 22:10:17 +0900 templatekw: inline showlist() into showbookmarks() stable
Yuya Nishihara <yuya@tcha.org> [Wed, 18 Feb 2015 22:10:17 +0900] rev 24156
templatekw: inline showlist() into showbookmarks() showlist() is the helper to build _hybrid object from a trivial list. It can't be applied if each value has more than one items, 'bookmark' and 'current' in this case. This change is necessary to fix random failure of "{join(bookmarks, sep)}".
Mon, 02 Mar 2015 00:12:29 -0600 transaction: disable hardlink backups (issue4546) stable
Matt Mackall <mpm@selenic.com> [Mon, 02 Mar 2015 00:12:29 -0600] rev 24155
transaction: disable hardlink backups (issue4546) Causing troubles, simplest fix.
Sun, 01 Mar 2015 23:20:02 -0600 repoview: invalidate cached changelog if _delayed changes (issue4549) stable
Matt Mackall <mpm@selenic.com> [Sun, 01 Mar 2015 23:20:02 -0600] rev 24154
repoview: invalidate cached changelog if _delayed changes (issue4549) Starting with 2d54aa5397cd, when a clone reached the checkout stage, the cached changelog in the filtered view was still seeing the _delayed flag, even though the changelog had already been finalized.
Thu, 26 Feb 2015 10:23:04 -0800 test: make test-extdiff resilient to */gnubin/echo stable
Sean Farley <sean.michael.farley@gmail.com> [Thu, 26 Feb 2015 10:23:04 -0800] rev 24153
test: make test-extdiff resilient to */gnubin/echo My Mac test machine has 'echo' in '/opt/local/libexec/gnubin/echo' since, well, GNU is not BSD. Also, I feel it need to be said about using regexes: Some people, when confronted with a problem, think "I know, I'll use regular expressions." Now they have two problems.
Thu, 26 Feb 2015 23:30:33 +0900 dispatch: work around UnicodeDecodeError caused by SSLError of Python 2.7.9 stable
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
Thu, 05 Feb 2015 14:45:49 +0900 revset: mask specific names for named() predicate stable
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.
Sun, 01 Mar 2015 00:18:43 -0300 i18n-pt_BR: synchronized with 756c5c8331b0 stable
Wagner Bruna <wbruna@yahoo.com> [Sun, 01 Mar 2015 00:18:43 -0300] rev 24150
i18n-pt_BR: synchronized with 756c5c8331b0
Sun, 01 Mar 2015 01:28:05 +0900 i18n-ja: synchronized with 756c5c8331b0 stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 01 Mar 2015 01:28:05 +0900] rev 24149
i18n-ja: synchronized with 756c5c8331b0
Fri, 27 Feb 2015 17:46:03 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 27 Feb 2015 17:46:03 -0600] rev 24148
merge with stable
Tue, 24 Feb 2015 09:08:54 -0800 manifest: rename 'mf', 'map', and 'mapping' to 'm'
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.
(0) -10000 -3000 -1000 -300 -100 -15 +15 +100 +300 +1000 +3000 +10000 tip