Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 07 Mar 2006 22:27:18 +0100] rev 1851
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Mar 2006 08:46:19 +0100] rev 1850
Hide debug commands in ambiguous command list, unless no normal command matches.
This will execute diff if 'hg d' is typed and hide rawcommit on 'hg r'.
Based on a patch by TK Soh.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Mar 2006 08:41:13 +0100] rev 1849
Show ambiguous aliases, if they are not simple abbreviations. Sort output.
TK Soh <teekaysoh@yahoo.com> [Tue, 07 Mar 2006 08:05:17 +0100] rev 1848
show choices on ambiguous commands
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 07 Mar 2006 20:37:27 +0100] rev 1847
fix annotate for removed files
walk in the manifest files instead of the working dir files
when running annotate
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 06 Mar 2006 21:06:53 -0800] rev 1846
only put numbers on patches if > 1 patch.
Lee Cantey <lcantey@gmail.com> [Mon, 06 Mar 2006 21:05:18 -0800] rev 1845
Patchbomb only sends introductory message [0 of N] if there are multiple patches.
Lee Cantey <lcantey@gmail.com> [Mon, 06 Mar 2006 21:03:46 -0800] rev 1844
Remove patchbomb from list of contrib files to install since it's now an extension.
Innosetup script was referencing old contrib location.
Also cosmetic change to group related files.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 23:16:42 +0100] rev 1843
Removed PKG-INFO from repository, because it already gets auto-generated.
Canonical place for changing the contained info is setup.py.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 06 Mar 2006 10:50:26 -0800] rev 1842
merge with crew.
Eung-ju Park <eungju@gmail.com> [Mon, 06 Mar 2006 10:49:34 -0800] rev 1841
Fix py2exe packagescan problem with new demandload
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 17:53:11 +0100] rev 1840
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 17:47:41 +0100] rev 1839
Create local ui object per repository, so .hg/hgrc don't get mixed.
This is needed for hooks, but may be important for other settings, too.
Fixes issue113, also integrated push-hook-lock.sh as a test case for this.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 17:34:49 +0100] rev 1838
Call hooks in alphabetical (=defined) order, of course still grouped by type.
Output of test-hook adjusted.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 06 Mar 2006 08:35:15 -0800] rev 1837
make ui flush output. this makes error happen if printing to /dev/full.
before this change, error happened with some pythons, but not others.
now always happens.
fixes issue 155.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 05 Mar 2006 01:37:28 -0800] rev 1836
make lock module use demandload.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 04 Mar 2006 19:01:45 +0100] rev 1835
Validate paths before reading or writing files in repository or working dir.
Fixes security relevant issue134.
Lee Cantey <lcantey@gmail.com> [Fri, 03 Mar 2006 13:41:12 -0800] rev 1834
Fixes running 'hg serve' with Windows executable and no explicit template path configured.
PY2EXE executables don't support __file__ but do place the directory of the
shared code library into sys.prefix.
Fixes bug 152.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 13:24:26 -0800] rev 1833
i made a mistake in last change.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 13:11:25 -0800] rev 1832
generate profile even when exception raised.
otherwise, is not possible to profile hg serve.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 09:40:18 -0800] rev 1831
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 09:39:37 -0800] rev 1830
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Feb 2006 11:25:07 -0800] rev 1829
hgwebdir: export collections of repos
now you can use [collections] section in hgweb.config to export entire
tree of repos.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 08:44:37 -0800] rev 1828
merge with crew.
Vadim Gelfer <vadim.gelger@gmail.com> [Thu, 02 Mar 2006 11:38:39 -0800] rev 1827
get patchbomb extension to use demandload. speeds up hg startup by 50%.
Vadim Gelfer <vadim.gelger@gmail.com> [Thu, 02 Mar 2006 11:38:03 -0800] rev 1826
rewrite demandload module to be more flexible.
performance not affected.
old demandload module could only import top-level modules like os and
sys.
with rewrite, all of following syntax is emulated perfectly:
import foo, bar foo bar
import foo.bar.quux foo.bar.quux
from foo.bar import quux, blurfl foo.bar:quux,blurfl
only thing missing is "import foo as bar".
also, namespace clashes between placeholder object and demand loaded
module are no longer possible.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Mar 2006 09:17:04 +0100] rev 1825
Make hgweb.staticfile() more secure and portable.
Without this, files in directories next to the static directory starting
with 'static' could be retrieved, e.g. with '../static.private/foo'.
Additionally staticfile now generates platform specific pathnames from
the /-separated paths given in the URL.
Illegal file names (e.g. containing %00) now yield a sane error message.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 01 Mar 2006 21:44:00 -0800] rev 1824
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 01 Mar 2006 21:27:23 -0800] rev 1823
merge with crew.
Robin Farine <robin.farine@terminus.org> [Tue, 28 Feb 2006 23:47:40 -0800] rev 1822
copy/rename to a removed destination file
When the destination of a copy or rename operation has been
marked for removal, we need to restore it before we overwrite
it with the new content. This also handles the case of
idempotent renames, i.e.
hg rename "a" "b"
hg rename "b" "a"
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 15:29:13 +0100] rev 1821
Catch urllib errors for old-http in a nicer way.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 01 Mar 2006 14:52:28 +0100] rev 1820
Really fix bash_completion on Solaris. Maybe. Hopefully.
Use substr instead of sub.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:19:27 +0100] rev 1819
Regenerate hg.1.gendoc.txt if commands.py changed.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:14:25 +0100] rev 1818
Make the deprecated rawcommit an alias of debugrawcommit.
This way it doesn't show up in the non-debug help.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:09:50 +0100] rev 1817
Ignore generated documentation
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:08:56 +0100] rev 1816
Updated help synopsises and reordered some options. Dropped [-n] from revert.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Mar 2006 01:45:05 +0100] rev 1815
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Feb 2006 00:48:49 +0100] rev 1814
generate hg manpage from commands.py docstring
gendoc.py is a script generating a part of the manpage (the commands
help and options) from the docstring in commands.py.
It avoids duplicating the doc between the doc/ directory and the docstrings.
To generate the manpage, 'make doc' will create all the necessary intermediate
files.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 28 Feb 2006 23:26:44 +0100] rev 1813
Merged automatic doc generation from tonfa.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Feb 2006 22:50:49 +0100] rev 1812
fix the synopsis of some commands, mark rawcommit as deprecated in short help
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Feb 2006 00:46:06 +0100] rev 1811
resync commands.py docstrings with hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 28 Feb 2006 23:25:34 +0100] rev 1810
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 28 Feb 2006 23:19:47 +0100] rev 1809
Updated test-commit to match changed output caused by nested transactions.
mason@suse.com [Tue, 28 Feb 2006 12:25:26 -0600] rev 1808
Add mq extension
mason@suse.com [Tue, 28 Feb 2006 12:25:10 -0600] rev 1807
Allow repo lock to be passed in to localrepo.commit for performance
mason@suse.com [Tue, 28 Feb 2006 12:24:54 -0600] rev 1806
Automatic nesting into running transactions in the same repository.
This associates a transaction handle with a given repository object, and
any additional calls to start new transactions reuse that transaction.
For the 2700 patch import run, this brings the system time down from
1m20s to 50s, mostly by skipping backups of the dirstate file.
(note, this patch does not change hg import to use the nested transaction,
mq is the only user right now)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 28 Feb 2006 11:49:35 -0600] rev 1805
Fix bash_completion on Solaris
TK Soh noticed that the awk that ships with Solaris doesn't allow you
to define new functions. According to
http://www.shelldorado.com/articles/awkcompat.html
it looks like it also doesn't have some other stuff that we were using,
like deletion of an array element and gsub.
Rewrite the parsing of hg --debug help to work around that. This
version doesn't filter aliases that are simple abbreviations for debug
commands (not a big problem, since there are none right now).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 26 Feb 2006 16:23:14 +0100] rev 1804
refactor the dodiff optimization
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 26 Feb 2006 02:26:17 +0100] rev 1803
speed up hg log --patch
Changing dodiff to read the manifest/changelog for node1 before calling
repo.update allows us to take advantage of the revlog revision cache.
Before this patch and my previous "speed up hg log --debug" patch, when
using hg log -p to display three revisions (A, B and C), dodiff and
repo.changes would end up reading the manifests in this order:
B A B A C B C B
With both patches, this order becomes:
A A B B B B C C
(This considers only dodiff and repo.changes. I'm not sure how other
parts of hg log enter the picture.)
The speed up will depend on the revisions being displayed. (All
"before" times already have my previous "speed up hg log --debug" patch
applied.)
hg repo (tip = 414e81ae971f). hg log -p
before after
real 0m50.981s 0m45.279s
user 0m47.930s 0m42.560s
sys 0m2.526s 0m2.523s
output size: 6917897 bytes
kernel repo (tip = 9d4e135960ed). hg log -p -l64
before after
real 2m14.995s 1m45.025s
user 2m9.509s 1m33.900s
sys 0m3.663s 0m2.942s
output size: 31497621 bytes
same kernel repo. hg log -p -l64 -r c84c2069592f:0
before after
real 1m48.045s 1m0.076s
user 1m44.094s 0m58.492s
sys 0m2.603s 0m1.103s
output size: 197983 bytes
c84c2069592f was the tip of a 10 day old kernel repo that I had lying
around and was where I first tested this patch. For some weird
coincidence it's also a place where the patch makes a huge difference.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 25 Feb 2006 13:44:40 +0100] rev 1802
speed up hg log --debug
hg repo:
before:
real 0m6.998s
user 0m6.952s
sys 0m0.046s
after:
real 0m3.884s
user 0m3.839s
sys 0m0.042s
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Feb 2006 20:25:18 +0100] rev 1801
on revert, only undele files that are removed in the dirstate
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 22:47:40 +0100] rev 1800
Removed now obsolete min/max check in walkchangerevs().
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 22:37:29 +0100] rev 1799
Replaced fixed window size for walkchangerevs with an increasing one. Window
sizes starts at 8 (for good interactiveness) and doubles with each window
until it is 512, which seems to be the maximum efficient value.
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Thu, 23 Feb 2006 18:10:04 +0100] rev 1798
hgmerge: do not use file with markers in tools merging themselves
This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 14:42:47 +0100] rev 1797
Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 12:35:15 +0100] rev 1796
Fixed wrong (copy&paste) usage of tmpl instead of self.t in hgweb.
Lee Cantey <lcantey@gmail.com> [Thu, 23 Feb 2006 12:02:39 +0100] rev 1795
Fix 'hg serve' not using CSS.
hgweb.py (templatepath): Return normalized path [fixes later checks in staticfile()]
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 23 Feb 2006 02:17:08 +0100] rev 1794
only write the dirstate when something changed
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 09:14:46 +0100] rev 1793
Allow serving static files from hgwebdir to fix CSS and favicon.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 08:32:51 +0100] rev 1792
Cleanup of tabs and coding when sending content type.