Thu, 03 Sep 2015 18:32:17 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Sep 2015 18:32:17 -0500] rev 26167
merge with stable
Wed, 02 Sep 2015 16:07:35 -0400 import-checker: accept .pyc and .pyo files (issue4812)
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
Tue, 01 Sep 2015 21:37:51 +0200 rebase: fix warning about ignoring tool option on rebase continue (issue4698)
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
Sat, 22 Aug 2015 16:39:29 -0700 hgweb: create websubtable on requestcontext
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 22 Aug 2015 16:39:29 -0700] rev 26164
hgweb: create websubtable on requestcontext
Sat, 22 Aug 2015 16:28:22 -0700 hgweb: move templatepath to 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.
Sat, 22 Aug 2015 15:40:33 -0700 hgweb: extract web substitutions table generation to own function
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.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 tip