Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 17:49:43 -0800] rev 946
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 12:32:15 -0800] rev 945
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 12:27:57 -0800] rev 944
Initial skeleton for mercurial.el.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 14:58:14 -0800] rev 943
Add --cwd global option, to change directory before doing anything.
Useful for interacting with a program presenting a UI, such as Emacs.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 13:58:32 -0800] rev 942
Modify commands.walk to yield a 4-tuple.
The new element of the tuple indicates whether a name is an exact match
for one passed in on the command line.
mpm@selenic.com [Fri, 19 Aug 2005 16:38:25 -0800] rev 941
Add a multi-repository server
This merges a bunch of the ideas for a multi-repository CGI script and
simplifies things a bit.
It uses PATH_INFO so it generally wants paths of the form:
http://host/hg.cgi/virtualpath
This gets mapped via a simple config file to the real path. All info
about the repo is read from the repo's hgrc.
mpm@selenic.com [Wed, 17 Aug 2005 18:52:27 -0800] rev 940
Add in and out aliases
mpm@selenic.com [Wed, 17 Aug 2005 18:41:04 -0800] rev 939
Fix stray debug statement
mpm@selenic.com [Wed, 17 Aug 2005 17:57:37 -0800] rev 938
hgweb: add [web] section to hgrc
This makes almost all of the hgweb settings available in hgrc.
mpm@selenic.com [Wed, 17 Aug 2005 16:37:04 -0800] rev 937
Whitespace
mpm@selenic.com [Wed, 17 Aug 2005 12:26:06 -0800] rev 936
Add a simple remove test
mpm@selenic.com [Wed, 17 Aug 2005 12:22:12 -0800] rev 935
bash: Add smarter completion of add/commit/remove/forget/diff/revert
Use hg status to determine which files are interesting for various commands.
Thus, hg add [tab] finds unknown files, and hg commit [tab] finds added, modified, or removed files.
mpm@selenic.com [Wed, 17 Aug 2005 00:36:36 -0800] rev 934
Fix path handling for deleting files on merge
tksoh@users.sf.net [Wed, 17 Aug 2005 00:33:53 -0800] rev 933
Fixed --repository option when handling relative path
When specifying relative path to --repository option, 'log' and
'diff' were unable to find the files specified. Here's the fix.
mpm@selenic.com [Tue, 16 Aug 2005 23:49:53 -0800] rev 932
The TODO and the FAQ now live on the Wiki
mpm@selenic.com [Tue, 16 Aug 2005 22:47:49 -0800] rev 931
Fix incoming for empty set
mpm@selenic.com [Tue, 16 Aug 2005 21:33:50 -0800] rev 930
Fix incoming help test again
mpm@selenic.com [Tue, 16 Aug 2005 19:31:30 -0800] rev 929
Add incoming to completions
mpm@selenic.com [Tue, 16 Aug 2005 19:27:46 -0800] rev 928
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com [Tue, 16 Aug 2005 19:17:16 -0800] rev 927
Add hg incoming command for local repositories
mpm@selenic.com [Tue, 16 Aug 2005 19:17:01 -0800] rev 926
Add a local() method to repository classes
mpm@selenic.com [Tue, 16 Aug 2005 19:03:01 -0800] rev 925
run-tests: remove '+ hg' trick
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
TK Soh <teekaysoh@yahoo.com> [Tue, 16 Aug 2005 17:30:41 -0800] rev 924
updated help text and added manpage section for hg paths
Index: hg/doc/hg.1.txt
===================================================================
mpm@selenic.com [Tue, 16 Aug 2005 17:12:25 -0800] rev 923
Add basic https support for pull
mpm@selenic.com [Tue, 16 Aug 2005 15:55:33 -0800] rev 922
Teach bash_completion about outgoing
mpm@selenic.com [Tue, 16 Aug 2005 15:50:42 -0800] rev 921
show_changeset: -q shows short hash
mpm@selenic.com [Tue, 16 Aug 2005 15:49:26 -0800] rev 920
Add hg outgoing command
mpm@selenic.com [Tue, 16 Aug 2005 15:30:26 -0800] rev 919
whitespace cleanup
mpm@selenic.com [Tue, 16 Aug 2005 15:22:44 -0800] rev 918
hg cat: accept changeset hashes
mpm@selenic.com [Tue, 16 Aug 2005 14:53:47 -0800] rev 917
Fix hg clone race with writer
Most read operations in hg don't need locks because we order reads and
writes for consistency. Clone is an exception to this as we're copying
entire file histories and could end up with more file history copied
than we have commits.
For now, make clone take a lock on the source repo. Non-hardlinked
clone should eventually be changed to use lockless pull.
mpm@selenic.com [Tue, 16 Aug 2005 14:17:27 -0800] rev 916
Add bash_completion to contrib
Contributed by "Alexis S. L. Carvalho" <alexis@cecm.usp.br>
Attached is a file that implements bash completion for hg. Just
reading it from your .bashrc should be enough to use it - I think: I'm
using the /etc/bash_completion from debian and I'm not sure whether it
sets some important option.
It gets the list of commands, aliases and options from the output of hg
help and then adds some specific stuff - e.g. completing update with
tags; pull and push with path aliases and directories, etc.
mpm@selenic.com [Tue, 16 Aug 2005 13:52:28 -0800] rev 915
Let hg paths work outside of repositories
mpm@selenic.com [Tue, 16 Aug 2005 10:44:04 -0800] rev 914
Fix up help test
TK Soh <teekaysoh@yahoo.com> [Tue, 16 Aug 2005 10:42:30 -0800] rev 913
typo fix in command help text
This patch fixes a few typo errors on the command help output
(I am not sure if the change on 'diff' is the best though).
mark.williamson@cl.cam.ac.uk [Mon, 15 Aug 2005 11:46:41 -0800] rev 912
Minor tweak: os.STOPSIG -> os.WSTOPSIG. Pychecker spotted this one.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 08:08:11 +0100] rev 911
Fix .hgignore parsing if last line has no EOL, ignore trailing white space.
(and don't use tabs in python code)
mpm@selenic.com [Sun, 14 Aug 2005 22:00:16 -0800] rev 910
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 06:58:25 +0100] rev 909
Addes test for error messages when operating on non-existing files.
mpm@selenic.com [Sun, 14 Aug 2005 21:36:08 -0800] rev 908
Fix tests for new init command
Bryan O'Sullivan <bos@serpentine.com> [Sun, 14 Aug 2005 21:33:09 -0800] rev 907
Modify init command to take an optional directory to set up.
If the directory does not exist, it is created.
If no directory is given, the current directory is used.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 06:18:49 +0100] rev 906
Update synopsis for 'hg update', too.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 05:22:40 +0100] rev 905
Update online help of hg heads for new --branches option.
mason@suse.com [Sun, 14 Aug 2005 20:09:32 -0800] rev 904
Add optional parameter for changed/added/del/unknown files to commands.dodiff
This makes it possible to avoid a call into repo.changes if the details
of what has changed is already known
mason@suse.com [Sun, 14 Aug 2005 20:09:21 -0800] rev 903
Allow the changegroup generator to completely load the buffer.
This makes is possible to delete or truncate away revisions and still
use the changegroup later.
mason@suse.com [Sun, 14 Aug 2005 20:09:09 -0800] rev 902
Add optional stop revision to revlog.heads
mason@suse.com [Sun, 14 Aug 2005 20:09:01 -0800] rev 901
Change repo.comit to return None on error or the new revision number on
success
This allows the caller to correctly record the new revision number
mason@suse.com [Sun, 14 Aug 2005 20:08:35 -0800] rev 900
Add force option to repo.commit, allowing commits where no files change
mark.williamson@cl.cam.ac.uk [Sun, 14 Aug 2005 12:30:01 -0800] rev 899
Add '-' support to the commit logfile option to read message from stdin.
mason@suse.com [Sun, 14 Aug 2005 12:23:45 -0800] rev 898
Add searching for named branches
named branching is when you identify a head by a tag on an earlier revision.
This patch adds repo.branchlookup for searching through the tree to
find branch tags for heads.
hg update -b tag is added to checkout based on branch tags
hg heads -b is added to print the tag associated with each head
mpm@selenic.com [Sun, 14 Aug 2005 12:23:36 -0800] rev 897
Fix bug with empty inc and exc
This fixes an exception that showed up when importing patches
mpm@selenic.com [Sat, 13 Aug 2005 19:43:42 -0800] rev 896
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:26:32 -0800] rev 895
Merge walk changes with Matt's tip.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:23:06 -0800] rev 894
Merge with TAH.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:13:37 -0800] rev 893
Turn off testing of absolute paths for now.
I don't know how to stop this from always reporting false errors, and am
too lazy to worry about it right now.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:09:37 -0800] rev 892
Fix bug involving "hg debugwalk -Ipattern" from repository root.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 14:41:51 -0800] rev 891
Fix clone when target directory is relative.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:12:09 -0800] rev 890
Merge walk fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:10:09 -0800] rev 889
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:09:17 -0800] rev 888
Fix up handling of regexp paths.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 15:10:09 -0800] rev 887
Merge Windows path fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 15:06:52 -0800] rev 886
Fix walk path handling on Windows
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 11:18:41 -0800] rev 885
Merge latest round of walk fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 11:16:58 -0800] rev 884
Fix walk code for files that do not exist anywhere, and unhandled types.
Prior to this, a file that did not exist was reported as showing up in
the filesystem, as were files of unsupported types (such as fifos).
Now, an error message is printed and nothing is returned in such cases.
This change also moves the commands.pathto function to the util module,
as the walk code needs it to print non-confusing error messages.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 07:42:32 -0800] rev 883
Update to tip.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Aug 2005 12:36:34 -0800] rev 882
Merge IPv6 fix.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Aug 2005 12:35:25 -0800] rev 881
Fix problem with "hg serve" on systems not providing IPv6.
mason@suse.com [Fri, 12 Aug 2005 07:12:08 -0800] rev 880
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 07:10:21 -0800] rev 879
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> [Fri, 12 Aug 2005 10:17:12 -0800] rev 878
Merge patchbomb script.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 08:04:31 -0800] rev 877
Polish patchbomb script.
diffstat output is now a non-default option.
The hgrc file can now contain default information for the patchbomb
script.
Date generation is fixed.
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.