Martin Geisler <mg@aragost.com> [Fri, 04 May 2012 12:21:56 +0200] rev 16579
merge with stable
Matt Harbison <matt_harbison@yahoo.com> [Thu, 03 May 2012 21:32:57 -0400] rev 16578
largefiles: make archive -S store largefiles instead of standins
This is essentially a copy of largefile's override of archive() in the
archival class, adapted for overriding hgsubrepo's archive(). That
means decoding isn't taken into consideration, nor is .hg_archival.txt
generated (the same goes for regular subrepos). Unlike subrepos, but
consistent with largefile's handling of the top repo, ui.progress() is
*not* called. This should probably be refactored at some point, but
at least this generates the archives properly for now. Previously,
the standins were ignored and the largefiles were archived only for
the top level repo.
Long term, it would probably be most desirable to figure out how to
tweak archival's archive() if necessary such that largefiles doesn't
need to override it completely just to special case the translating of
standins to the real files. Largefiles will already return a context
with the true largefiles instead of the standins if lfilesrepo's
lfstatus is True- perhaps this can be leveraged?
Martin Geisler <mg@aragost.com> [Fri, 04 May 2012 12:04:07 +0200] rev 16577
paper, monoblue: link correctly to lines in annotate view
The links were to "foo#123" instead of "foo#l123". The gitweb and
spartan templates were already producing the correct links.
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2012 16:12:52 -0500] rev 16576
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2012 16:06:33 -0500] rev 16575
Added signature for changeset 5983de86462c
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2012 16:06:30 -0500] rev 16574
Added tag 2.2.1 for changeset 5983de86462c
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2012 16:03:08 -0500] rev 16573
bookmarks: catch the proper exception for missing revisions
This fixes a regression from 1.7
Bryan O'Sullivan <bryano@fb.com> [Wed, 02 May 2012 14:37:44 -0700] rev 16572
parsers: fix refcount leak, simplify init of index (issue3417)
This is most easily verified using valgrind on a long-running
process, as the leak has no visible consequences during normal
one-shot command usage.
In one window:
valgrind --leak-check=full --suppressions=valgrind-python.supp \
python ./hg serve
In another:
for ((i=0;i<100;i++)); do
curl -s http://localhost:8000/file/tip/README >/dev/null
done
valgrind should report no leaks.
Na'Tosha Bard <natosha@unity3d.com> [Thu, 03 May 2012 15:24:45 +0200] rev 16571
largefiles: fix commit of both largefiles and non-largefiles (issue3354)
This bug was caused by some old code that should have been removed long ago.
Paul Boddie <paul@boddie.org.uk> [Thu, 03 May 2012 01:07:22 +0200] rev 16570
help: added description for the web.collapse setting
The collapse configuration setting for hgweb was recently
introduced, but the help text was unfortunately omitted from the
patch concerned. This patch provides a suitable help text.