Yuya Nishihara <yuya@tcha.org> [Tue, 15 Sep 2015 00:32:39 +0900] rev 26251
localrepo: refresh filecache stats only if transaction finished successfully
If commit is aborted by pretxncommit hook, in-memory changelog and manifest
have entries that would be added. So they must be discarded on invalidate().
But the mechanism introduced by
a710936c3037 doesn't handle this case well.
It tries to mitigate the penalty of invalidate() by marking in-memory cache
as "clean" on unlock assuming that they are identical to the stored data.
But this assumption is wrong if stored data are rolled back by tr.abort().
This patch moves the hook to post-close action so that it will never be
triggered on abort.
This bug was originally reported to thg, which is only reproducible in
command-server process on unix, evolve disabled.
https://bitbucket.org/tortoisehg/thg/issues/4285/
Yuya Nishihara <yuya@tcha.org> [Tue, 15 Sep 2015 21:00:28 +0900] rev 26250
localrepo: move closure of lock release to class
It only captures "self", so it isn't necessary to be created dynamically.
Anton Shestakov <av6@dwimlabs.net> [Wed, 16 Sep 2015 22:30:36 +0800] rev 26249
highlight: add highlightfiles config option which takes a fileset (
issue3005)
Highlight extension lacked a way to limit files by size, by extension, and/or
by any other part of file path. A good solution would be to use a fileset,
since it can check file path, extension and size (and more) in one expression.
So this change introduces such an option, highlighfiles, which takes a fileset
and on each request decides if the requested file should be highlighted.
The default "size('<5M')" is, in a way, suggested in
issue3005.
checkfctx() limits the amount of work to just one file (subset kwarg in
fileset.matchctx()).
Monkey-patching works around
issue4568, otherwise using filesets here while
running hgweb in directory mode would say, for example, "Abort: **.py not under
root", but this fix is very local and probably far from ideal. I suspect there
to be a way to fix this for the whole hgweb and resolve the issue, but I don't
know how to do it.
timeless@mozdev.org [Fri, 04 Sep 2015 11:15:02 -0400] rev 26248
posix: shellquote do not require quoting for "+" (
issue4818)
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Sep 2015 12:16:39 -0700] rev 26247
hgweb: consume generator inside context manager (
issue4756)
If code inside a context manager returns a generator, the context
manager exits before the generator is iterated.
hgweb was using a context manager to control thread safe access to a
localrepository instance. But it was returning a generator, so there was
a race condition between a previous request streaming a response to the
client and a new request obtaining the released but in use repository.
By iterating the generator inside the context manager, we ensure we
don't release the repo instance until after the response has finished.
With this change, hgweb finally appears to have full localrepository
isolation between threads. I can no longer reproduce the 2 exceptions
reported in
issue4756.
test-hgweb-non-interactive.t has been modified to consume the output
of calling into a WSGI application. Without this, execution of the WSGI
application stalls because of the added yield statement.
Augie Fackler <augie@google.com> [Thu, 27 Aug 2015 14:46:26 -0400] rev 26246
histedit: use one editor when multiple folds happen in a row (
issue3524) (BC)
This was the first ever feature request for histedit, originally filed
back on April 4, 2009. Finally fixed.
In the future we'll probably want to make it possible for other
preprocessing steps to be added to the list, but for now we're
skipping that because it's unclear what the API should look like
without a proposed consumer.
Anton Shestakov <av6@dwimlabs.net> [Mon, 14 Sep 2015 18:41:09 +0800] rev 26245
hgweb: replace .sourcelast with .bottomline that does the same
In paper and Coal, basically, div.sourcelast was only used to make a 1px border
on the bottom of file source view (and only there). It's better to use
bottomline class, that also exists for the same purpose (visually), but is used
more widely and works without needing an empty <div>.
Anton Shestakov <av6@dwimlabs.net> [Sun, 13 Sep 2015 21:01:34 +0800] rev 26244
coal: copy newer things from paper
Basically, coal style in hgweb is intended to be functionally equivalent (just
different in style) to paper, and does this by reusing almost all templates
from paper (except header.tmpl, where it specifies a different css file). Looks
like everybody forgot this and so many improvements to paper templates, that
should've also made it into coal, were often only half-done there (usually
thanks to template reuse). Let's fix this by bulk-copying missing things from
paper/map and style-paper.css to coal/map and style-coal.css.
There were many improvements to paper that didn't touch coal, and that makes it
hard to untangle the code and split this patch into many, but here are some of
the changes (paper-only), that now get into coal:
41c4bdd1d585 - hgweb: color line which is linked to in file source view
f3393d458bf5 - hgweb: highlight line which is linked to at annotate view
f2e4fdb3dd27 - hgweb: code selection without line numbers in file source view
5ec5097b4c0f - hgweb: add line wrapping switch to file source view
bf661a03fddc - hgweb: use css margin instead of empty <p> before diffstat table
It also fixes line anchor in annotateline template (#42 vs #l42).
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Sep 2015 16:11:17 -0700] rev 26243
revlog: optionally cache the full text when adding revisions
revlog instances can cache the full text of a single revision. Typically
the most recently read revision is cached.
When adding a delta group via addgroup() and _addrevision(), the
full text isn't always computed: sometimes only the passed in delta is
sufficient for adding a new revision to the revlog.
When writing the changelog from a delta group, the just-added full
text revision is always read immediately after it is written because
the changegroup code needs to extract the set of files from the entry.
In other words, revision() is *always* being called and caching the full
text of the just-added revision is guaranteed to result in a cache hit,
making the cache worthwhile.
This patch adds support to _addrevision() for always building and
caching the full text. This option is currently only active when
processing changelog entries from a changegroup.
While the total number of revision() calls is the same, the location
matters: buildtext() calls into revision() on the base revision when
building the full text of the just-added revision. Since the previous
revision's _addrevision() built the full text and the the previous
revision is likely the base revision, this means that the base
revision's full text is likely cached and can be used to compute the
current full text from just a delta. No extra I/O required.
The end result is the changelog isn't opened and read after adding every
revision from a changegroup.
On my 2013 MacBook Pro running OS X 10.10.5 from an SSD and Python 2.7,
this patch impacted the time taken to apply ~262,000 changesets from a
mozilla-central gzip bundle:
before: ~43s
after: ~32s
~25% reduction in changelog processing times. Not bad.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Sep 2015 15:16:47 -0700] rev 26242
revlog: drop local assignment of cache variable
The purpose of this code was to provide thread safety. With the
conversion of hgweb to use separate localrepository instances per
request/thread, we should no longer have any consumers that need to
access revlog instances from multiple threads. Remove the code.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Sep 2015 12:47:00 -0700] rev 26241
revlog: rename generic "i" variable to "indexdata"
Increase readability.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Sep 2015 11:31:56 -0700] rev 26240
hg: always create new localrepository instance
cachedlocalrepo.copy() didn't actually create new localrepository
instances. This meant that the new thread isolation code in hgweb wasn't
actually using separate localrepository instances, even though it was
properly using separate cachedlocalrepo instances.
Because the behavior of the API changed, the single caller in hgweb had
to be refactored to always call _webifyrepo() or it may not have used
the proper filter.
I confirmed via print() debugging that id(repo) is in fact different on
each thread. This was not the case before.
For reasons I can't yet explain, this does not fix
issue4756. I suspect
there is shared cache somewhere that isn't thread safe.
timeless@mozdev.org [Thu, 10 Sep 2015 19:45:46 -0400] rev 26239
test-bad-extension: reduce dependencies on other things
test-bad-extension would jitter if the format of the first line
of hg help changed, which isn't relevant to its goal.
timeless@mozdev.org [Thu, 10 Sep 2015 20:22:37 -0400] rev 26238
help: fix help argument parsing and documentation
support combining -c and -e
previously -k was misdocumented:
* the first line didn't mention it
* the help half implied you could do help -k keyword topic
with these changes, -k just changes the search method
support -c and -e for -k searches
timeless@mozdev.org [Thu, 10 Sep 2015 10:48:20 -0400] rev 26237
minirst: establish leveling for nested definitions