timeless@mozdev.org [Fri, 04 Sep 2015 05:42:21 -0400] rev 26169
help: config indent committemplate.changeset section
timeless@mozdev.org [Wed, 02 Sep 2015 16:56:04 -0400] rev 26168
test-merge-tools: include /usr/sbin in path for sysctl (issue4813)
/bin/sh expects to be able to reach sysctl via path (it lives in /usr/sbin)
Matt Mackall <mpm@selenic.com> [Thu, 03 Sep 2015 18:32:17 -0500] rev 26167
merge with stable
timeless@mozdev.org [Wed, 02 Sep 2015 16:07:35 -0400] rev 26166
import-checker: accept .pyc and .pyo files (issue4812)
Python 2.6.1 (r261:67515, Jun 24 2010, 21:47:49)
[GCC 4.2.1 (Apple Inc. build 5646)] on darwin
$ ls '/System/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6'/BaseHTTPServer.py*
/System/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/BaseHTTPServer.pyc
/System/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/BaseHTTPServer.pyo
liscju <piotr.listkiewicz@gmail.com> [Tue, 01 Sep 2015 21:37:51 +0200] rev 26165
rebase: fix warning about ignoring tool option on rebase continue (issue4698)
Before this patch rebase --continue with specified --tool option outputs
warnings "tool option will be ignored". It is false statement because
in case of any merge conflicts it uses specified tool to resolve it.
This patch makes this warning appears only when user specified --tool
when running rebase --abort , in this case tool doesn't have any
sense
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 22 Aug 2015 16:39:29 -0700] rev 26164
hgweb: create websubtable on requestcontext
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 22 Aug 2015 16:28:22 -0700] rev 26163
hgweb: move templatepath to requestcontext
This does change behavior in that the templatepath could change during
the lifetime of the server. But everything else can change, I don't see
why template paths can't.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 22 Aug 2015 15:40:33 -0700] rev 26162
hgweb: extract web substitutions table generation to own function
It doesn't use any state in hgweb except for the repo instance.
Move it to a standalone function.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 22 Aug 2015 15:32:16 -0700] rev 26161
hgweb: remove hgweb.configbool
It is redundant with requestcontext.configbool.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 22 Aug 2015 15:30:39 -0700] rev 26160
hgweb: move additional state setting outside of refresh
We want refresh() to only be about refreshing repository
instances. This state doesn't belong in requestcontext
because it is shared across multiple threads.
timeless@mozdev.org [Wed, 02 Sep 2015 23:50:45 -0400] rev 26159
commands: support hg help scripting.HGPLAIN
keywords are lowercased within help/minirst...
timeless@mozdev.org [Wed, 02 Sep 2015 15:19:05 -0400] rev 26158
run-tests: use $HGTEST_RUN_TESTS_PURE
test-run-tests and test-hghave call run-tests;
if you don't have a working build environment, and you are trying
to use --pure, then if they don't use --pure or --with-hg,
they'll break.
timeless@mozdev.org [Wed, 02 Sep 2015 15:12:08 -0400] rev 26157
minirst: don't treat top level item as children of last item (issue4803)
test for "hg help -c config" in help config
Siddharth Agarwal <sid0@fb.com> [Wed, 02 Sep 2015 22:05:58 -0700] rev 26156
scmutil.readonlyvfs: implement join
Required in an upcoming patch.
Siddharth Agarwal <sid0@fb.com> [Wed, 02 Sep 2015 22:05:23 -0700] rev 26155
localrepo: move dirstate validate function to class scope
This will allow the function to be referred to by subclasses, as required for
upcoming patches.
Durham Goode <durham@fb.com> [Thu, 03 Sep 2015 10:29:42 -0700] rev 26154
convert: remove restriction on multiple --rev in hg source
Multiple --rev args on convert is a new feature, and was initially disabled for
all sources. It has since been enabled on git sources, and this patch enables it
on mercurial sources.