Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Aug 2005 20:53:50 -0800] rev 876
Get patchbomb script to not use MIME attachments.
Adding patches as attachments makes it difficult or impossible for some
mail clients to quote them effectively.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Aug 2005 20:18:58 -0800] rev 875
Add patchbomb script.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 09:58:35 -0800] rev 874
Merge Chris's changes with mine.
mason@suse.com [Fri, 12 Aug 2005 09:57:59 -0800] rev 873
addremove was not correctly finding removed files when given
a list of files to look at. These end up with a src of 'f' from
walk() but no longer exist on the filesystem.
Index: mine/mercurial/commands.py
===================================================================
mason@suse.com [Fri, 12 Aug 2005 09:57:56 -0800] rev 872
dirstate walking optimizations
The repo walking code introduces a number of calls to dirstate.map.copy(),
significantly slowing down the walk on large trees. When a list of
files is passed to the walking code, we should only look at map entries
relevant to the file list passed in.
dirstate.filterfiles() is added to return a subset of the dirstate map.
The subset includes in files passed in, and if one of the files requested
is actually a directory, it includes any files inside that directory tree.
This brings the time for hg diff Makefile down from 1.7s to .3s on
a linux kernel repo.
Also, the diff command was unconditionally calling makewalk, leading
to an extra pass through repo.changes. This patch avoids the call
to makewalk when commands.diff isn't given a list of patterns, cutting
the time for hg diff (with no args) in half.
Index: mine/mercurial/hg.py
===================================================================
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Aug 2005 17:24:38 -0800] rev 871
Merge with mpm.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 07 Aug 2005 12:43:11 -0800] rev 870
Teach walk code about absolute paths.
The first consequence of this is that absolute and relative paths now
all work in the same way. The second is that paths that lie outside
the repository now cause an error to be reported, instead of something
arbitrary and expensive being done.
Internally, all of the serious work is in the util package. The new
canonpath function takes an arbitrary path and either returns a
canonical path or raises an error. Because it needs to know where the
repository root is, it must be fed a repository or dirstate object, which
has given commands.matchpats and friends a new parameter to pass along.
The util.matcher function uses this to canonicalise globs and relative
path names.
Meanwhile, I've moved the Abort exception from commands to util, and
killed off the redundant util.CommandError exception.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 07 Aug 2005 11:09:21 -0800] rev 869
Kill dead function.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 07 Aug 2005 11:04:58 -0800] rev 868
Fix debugwalk when there's nothing to walk.
tksoh@users.sourceforge.net [Sat, 13 Aug 2005 12:41:00 -0800] rev 867
Allow Mercurial to build on HP-UX 11
Temporary fix to allow Mercurial to build on HP-UX 11, as the C
compiler on HP-UX 11 doesn't support 'inline' qualifier. The
'__inline' qualifier seemed to be supported, but not without
first resolving other associated issues.
mpm@selenic.com [Fri, 12 Aug 2005 23:54:09 -0800] rev 866
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 08:41:23 +0100] rev 865
Cleanup after previous changes:
- there are only two states for the exec bit, so no need to override it.
- file_ variable is only once now, so it self.file(f) can be used directly.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 08:23:42 +0100] rev 864
Extended test case to test dirstate length bug fixed in
a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 07:51:37 +0100] rev 863
Use length of file instead of length of change for the dirstate entry.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 06:47:46 +0100] rev 862
Fix 3-way-merge of original parent, workdir and new parent.
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 09 Aug 2005 11:32:30 +0100] rev 861
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Interface is not yet changed.
Non-regular files are considered to be removed or deleted.
Removed the unneeded match(fn) call for adding to the unknown list.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 09 Aug 2005 11:15:57 +0100] rev 860
Use correct term "closed interval" for ranges.
Edouard Gomez <ed.gomez@free.fr> [Tue, 09 Aug 2005 09:36:34 -0800] rev 859
Trap OSError when deleting env vars
On the other OS, it seems that case insensitivity for
environment vars can bite users when using some unknown
combination of python 2.4.1 and win2kSP4+minsys (and
probably other vversions of these softwares).
The best way to avoid problems in those weird cases is to
ignore OSError exception during env var deletion.
Jeff Sipek <jeffpc@optonline.net> [Mon, 08 Aug 2005 19:49:48 -0800] rev 858
[PATCH] Move default page name into map file
Move default page name from code into the map file. This way, different
hgweb styles/themes are free to select their default (no cmd in args)
page.
Jeff Sipek <jeffpc@optonline.net> [Mon, 08 Aug 2005 19:49:34 -0800] rev 857
[PATCH] Propagate the template map though recursively
This patch allows propagates the template map though recursively
though all the templates.
This allows for some hgweb template cleanup patches as well as it makes
writing new skins/themes for hgweb much much easier. (I'm planing to
write several basic ones.)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 07 Aug 2005 17:41:13 +0100] rev 856
Fixed encoding of directories ending in .d or .i:
One .d and .i was mixed up, and string replace method doesn't work in-place.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 21:59:22 +0100] rev 855
Added Tristan Wibberley to contributors.
Tristan Wibberley <tristan@wibberley.org> [Sat, 06 Aug 2005 21:58:28 +0100] rev 854
Fixed revlog.children.
It was comparing a node to a rev, then appending a rev onto the list
of children being constructed instead of a node.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 21:41:53 +0100] rev 853
Update TODO
Samuel Tardieu <sam@rfc1149.net> [Sat, 06 Aug 2005 21:23:38 +0100] rev 852
Allow HG patch to appear late in the input stream
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 21:19:32 +0100] rev 851
Added Samuel Tardieu to contributors list.
Samuel Tardieu <sam@rfc1149.net> [Sat, 06 Aug 2005 21:18:21 +0100] rev 850
Add temporary documentation files and profiling output to .hgignore
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 15:43:12 +0100] rev 849
Further help improvements:
Show command aliases in 'hg help something', unless in quiet mode.
Show short command description with 'hg help -q something'.
Show global options in verbose mode of command help.
State that Mercurial is a Distributed SCM.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 14:04:59 +0100] rev 848
Always show short help when an unknown command is given.
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:33:14 +0100] rev 847
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 846
When hg is invoked without parameters, the short list help is displayed.
When hg is executed without parameters ( or hg is executed with the
'help shortlist' command ) the short help list is displayed.
If the 'help' command is passed on the commandline the full help list
is displayed.
In both the cases if the switch '-v' is passed, the help contains also
the aliases of the short/full commands list and the global switches.
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 845
More verbose information on the global options
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 844
'hg help -v' mentions the alias of the commands
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 843
'hg help -v' shows global options
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 12:05:09 +0100] rev 842
Rewritten change type selection for hg status.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 07:16:37 +0100] rev 841
Realigned command table again.
tksoh@users.sourceforge.net [Sat, 06 Aug 2005 07:09:10 +0100] rev 840
hg status: added options to select files by status.
Added options -m, -a, -r and u to select files corresponding
to status M, A, R and ? respectively. If none of these
options are specified, files of all status will be shown.
mpm@selenic.com [Thu, 04 Aug 2005 13:31:25 -0800] rev 839
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Thu, 04 Aug 2005 05:14:59 -0800] rev 838
Merge with Matt.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 03 Aug 2005 09:10:48 -0800] rev 837
Fix performance of hg diff.
commands.walk has been refactored. commands.walk's behaviour remains as
it was, but there is a new function, commands.makewalk. This returns
results that can be passed along to other internal code, in our case
dodiff.
mpm@selenic.com [Thu, 04 Aug 2005 13:27:41 -0800] rev 836
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:23:07 +0100] rev 835
Cleaned up trap handling in run-tests, too.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:20:40 +0100] rev 834
Use sh instead of bash in tests.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:13:17 +0100] rev 833
Removed special FIXME handling in run-tests, added bug info to .out files.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:06:49 +0100] rev 832
Handle broken pipe on pressing Ctrl-C with e.g. 'hg log|grep something'.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 17:43:05 +0100] rev 831
Cleaned up trap handling:
- Use numbers instead of signal names
- No need to explicitly call "cleanup_exit RC" to exit with return code RC.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 17:23:31 +0100] rev 830
If rejects are empty after using the editor, merge with diff+patch was ok.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 17:16:41 +0100] rev 829
Shortened hgmerge a little bit.