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.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 08:11:52 +0100] rev 1791
Merge with jeffpc's hg-static
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 22 Feb 2006 01:06:17 -0500] rev 1790
[hgweb] Added favicon to standard/gitweb templates
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 08:04:46 +0100] rev 1789
Merge with mercurial/tonfa
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 23:50:53 +0100] rev 1788
change the default timeout to 600 seconds
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 23:21:15 +0100] rev 1787
add a timeout when a lock is held (default 1024 sec)
- change the wait keyword from lock.lock to timeout,
a negative timeout of means "wait forever"
- refactor the two lock functions from localrepo.py
- make them use the timeout (default 1024, can be changed
with ui.timeout in the config file
- update the doc
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 07:51:32 +0100] rev 1786
Don't use mktemp in tests, we're already in a secure temp dir.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 07:45:14 +0100] rev 1785
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
(submitted by Alexis S. L. Carvalho <alexis@cecm.usp.br>)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Feb 2006 07:26:29 +0100] rev 1784
revalidate revlog data after locking the repo (issue132)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Feb 2006 05:21:09 +0100] rev 1783
merge with matt
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 16:46:38 +0100] rev 1782
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Feb 2006 21:11:57 +0100] rev 1781
add an optional argument to push only the specified revisions (push -r)
Matt Mackall <mpm@selenic.com> [Tue, 21 Feb 2006 17:36:27 -0600] rev 1780
Merge with jeffpc
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 22:24:42 -0500] rev 1779
Merge with mpm
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 22:01:09 -0500] rev 1778
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 21:53:41 -0500] rev 1777
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net> [Tue, 14 Feb 2006 21:55:05 -0500] rev 1776
Merge
Matt Mackall <mpm@selenic.com> [Tue, 21 Feb 2006 15:48:49 -0600] rev 1775
Merge with crew
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:22 -0600] rev 1774
hgmerge: add meld support
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:19 -0600] rev 1773
hgmerge: improve "apps not found" message
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:16 -0600] rev 1772
hgmerge: logic changes
Details:
- keep automatic merge conflicts in $LOCAL
- do not assume that $EDITOR returns proper error code
- fix a slight mistake in diff+patch merge success detection
(it could succeed if the $EDITOR failed to run)
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:12 -0600] rev 1771
hgmerge: add and use ask_if_merged function
This patch, unlike the earlier ones, doesn't use unportable select builtin.
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:09 -0600] rev 1770
hgmerge: fix diff+patch detection; cleanups
Details:
- actually show help message when no tools are found
- whitespace cleanup (stupid emacs)
- quote more variables
- simplify merge/diff3 error handling
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 16:04:47 +0100] rev 1769
Merged RSS feed for tags from Peter van Dijk
Peter van Dijk <peter@dataloss.nl> [Fri, 03 Feb 2006 11:23:34 +0100] rev 1768
add rss link to tags page
Peter van Dijk <peter@dataloss.nl> [Fri, 03 Feb 2006 02:21:28 +0100] rev 1767
implement entriesnotip for tags in hgweb.py ; change entries to entriesnotip in templates/tags-rss.tmpl
Peter van Dijk <peter@dataloss.nl> [Thu, 02 Feb 2006 12:00:45 +0100] rev 1766
tags-rss support; still shows tip
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 15:54:50 +0100] rev 1765
hg log --limit shouldn't count unprinted revisions (found by TK Soh)
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 15:37:23 +0100] rev 1764
Cleanup: Put initialization of br in front of --branches option handling.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 13:14:03 +0100] rev 1763
Make option --branch vs. --branches more consistent.
As you can abbreviate --branches to --branch, old scripts using the long
name will still work.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 12:59:16 +0100] rev 1762
Add option -b/--branch to hg tip (as done for hg parents).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 08:11:46 +0100] rev 1761
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 00:45:02 +0100] rev 1760
fix typo in debugrebuildstate
Fabian Otto <sigsegv@alchiba.ni.cs.tu-berlin.de> [Mon, 20 Feb 2006 15:58:04 -0600] rev 1759
Sunpro compiler patch
The compiling runs through without warning, but runnig the newly builded
hg emmits a message:
| ImportError: ld.so.1: python: fatal: relocation error:
| file /opt/local/lib/python2.3/site-packages/mercurial/bdiff.so:
| symbol cmp: referenced symbol not found
Removing the inline infront of cmp corrects this error message.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 20 Feb 2006 11:09:25 -0800] rev 1758
add options to log man page.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 20 Feb 2006 11:07:09 -0800] rev 1757
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 20 Feb 2006 11:06:41 -0800] rev 1756
add -l,--limit to log command.