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.
Mon, 23 Feb 2015 13:41:02 -0800 manifest: make copy logic local to copy()
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.
Sat, 21 Feb 2015 00:40:18 -0500 extensions: indicate loaded for an immediately called afterload callback
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.
Tue, 24 Feb 2015 00:08:04 -0800 tests: add test showing tags cache drops filtered heads (issue4550)
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.
Tue, 24 Feb 2015 00:06:47 -0800 tags: write tags cache deterministically
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.
Thu, 22 Jan 2015 12:36:38 -0800 histedit: add --edit-plan option to histedit
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
Thu, 22 Jan 2015 10:52:50 -0800 histedit: generalize makedesc
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)
Mon, 23 Feb 2015 10:57:27 -0800 histedit: extract method ruleeditor
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.
Tue, 24 Feb 2015 11:37:07 -0500 churn: deprecate -t option in favour of -T
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.
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 tip