Merge with TAH

Addes test for error messages when operating on non-existing files.

Fix tests for new init command

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.

Update synopsis for 'hg update', too.

Update online help of hg heads for new --branches option.

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

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.

Add optional stop revision to revlog.heads

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

Add force option to repo.commit, allowing commits where no files change

Add '-' support to the commit logfile option to read message from stdin.

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

Fix bug with empty inc and exc This fixes an exception that showed up when importing patches

Merge with BOS

Merge walk changes with Matt's tip.

Merge with TAH.

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.

Fix bug involving "hg debugwalk -Ipattern" from repository root.

Fix clone when target directory is relative.

Merge walk fixes.

Add unit tests for walk code.

Fix up handling of regexp paths.

Merge Windows path fixes.

Fix walk path handling on Windows

Merge latest round of walk fixes.

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.

Update to tip.

Merge IPv6 fix.

Fix problem with "hg serve" on systems not providing IPv6.

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 ===================================================================

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 ===================================================================

Merge patchbomb script.

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.

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.

Add patchbomb script.

Merge Chris's changes with mine.

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 ===================================================================

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 ===================================================================

Merge with mpm.

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.

Kill dead function.

Fix debugwalk when there's nothing to walk.

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.

Merge with TAH

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.

Extended test case to test dirstate length bug fixed in a7e95e3606c7.

Use length of file instead of length of change for the dirstate entry.

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.

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.

Use correct term "closed interval" for ranges.

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.

[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.

[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.)

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.

Added Tristan Wibberley to contributors.

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.

Update TODO

Allow HG patch to appear late in the input stream

Added Samuel Tardieu to contributors list.