Merge with TAH

hgweb: fix traceback by skipping invalid repo paths

Fix line wrapping

Added --date option to annotate.

copy the mode of the file when breaking hardlinks

Allow ambiguous command shortcut if only an alias for the same command. Currently the only example for this is 'hg o' or 'hg ou' as a shortcut for 'hg out' and 'hg outgoing'.

Merge with TAH

Improved error message for ambiguous command shortcuts.

Canonicalize command when using aliases or prefix matching. This makes the norepo check and the help and version command work when not using the canonical name.

Automatically run "verify" whenever we run "recover"

Fix up test-help, mark test-rename +x

avoid to copy more than one file to the same destination file

copy & rename don't overwrite unless --force is specified

generalize copy/rename to handle more than one source directory

hgweb: remove redundant rstrip filter

use self.{w,}join when possible

Add safety check for addgroup

fix a warning when py2exe is not used

Add explicit 'st' alias for status

if unambigious command name are passed, use them

Add support for -r option in hg tag

fix file opening for some commands on Windows Using file as opener in debug commands won't work on Windows, as the index and data files needs to be opened in binary mode.

Merge with TAH

Fixed test-static-http with http_proxy variable set again.

Merge from Hidetaka Iwai

Fixed to convert to man properly.

Fixed wrong encoding of files.

hgweb: Added archive download buttons to manifest page.

Add permissions handling test

remove the deprecated --text (t) option to rawcommit and tag

Deal with merge abort more gracefully We save parent info last rather than first.

Handle empty logs in repo.checksize

verify: add check for mismatch of index and data length

Allow interrupting all parts of verify

fix a bug in dirstate.changes when cwd != repo.root - use lstat instead of stat - add a testcase (thanks to Johannes Hofmann)

minor doc fix

Added Japanese translations of manpages.

only files in normal state should be marked as deleted fix a traceback when you removed an added file

fix handling of files of unsupported type in the walk code if a file was of unsupported type, it was considered as 'seen' while walking. this way it was possible to have file in the dirstate not yielded by the walk function.

zsh: allow 'hg clone' to complete paths listed in ~/.hgrc

mention running multiple hooks in the doc

zsh completion improvements. File completers now correctly deal with filenames that contain spaces. The completers also use 'hg status .' so they'll work correctly when the default behaviour changes.

Fix traceback on bad system hgrc files

fix handling of daylight saving time

Change test-hook to test multiple hooks

allow multiples hook suggested by Vadim Gelfer This patch allows to have multiple hooks of the same kind: for example commit.email = /my/email/hook commit.autobuild = /my/build/hook

fix a bug where hg could remove file ending with .tmp util.opener used a fixed filename for writing tempfile instead of using the tempfile module.

add a test for hgignore

util.opener already create the base directory if it doesn't exist

fix dirstate.change: it should walk ignored files

Elevate parents to a "common" command in help

Add missing test output

make readconfig take a filename instead of a file pointer as argument catch parse error while reading a config file add a testcase for parse error

make revert use standard matcher

rewrote changes function in dirstate to use generic walk code now, file with unsupported type will not show up in status anymore

minor fix on command help docstrings

Merge bundle -r work from Eric Hopper

Added a test for clone -r.

Stupid spelling mistake in a variable name.

Added a lot of comments to changegroupsubset.

Implementing pull -r and changing clone -r. Both now support multiple 'target' revisions.

Fixed silly bug involving a non-existent variable.

Fix to handle case of empty list for roots or heads in nodesbetween.

Optimizing manifest reads in changegroupsubset by using deltas.

Implementing clone -r, which clones all changesets needed to reach a particular revision.

Bug fixing in localrepository.changegroupsubset. Bugs found in testing.

Fix small bug in nodesbetween if heads is [nullid].

This changes the revlog.group and re-implements the localrepo.changeroup function in terms of it. revlog.group now takes a list of nodes, and some callback functions instead of a linkmap.

This implements the nodesbetween method, and it removes the newer method and replaces it with calls to nodesbetween. nodesbetween calculates all the changesets needed to have a complete revision graph between a given set of base nodes and a given set of head nodes.

Remove copy/rename --parents option This is no longer needed now that we have more standard UNIX-like copy semantics.

[PATCH] copy/rename a directory This patch adds support for 'hg copy dir1 dir2' or 'hg rename dir1 dir2'. When "dir2" exists, "dir1" is recursively copied (or moved) to "dir2/dir1". When "dir2" does not exists, "dir1" is copied to (renamed as) "dir2".

further fix traceback on invalid .hgignore patterns Please apply this little fix (matchfn return None if no patterns are specified).

get command defaults from hgrc

Remove now unused sortdiff and diff from mdiff

Remove old manifest diff code, it's now buggy

Add Benoit to CONTRIBUTORS

Add test-confused-revert, fix permissions on test-revert

Allow reverting a deleted file with two parents As elsewhere, we choose the first parent by default

revert added and removed files to their normal state before reverting add a test for revert

abort on invalid pattern in matcher

hgweb: add strip and rstrip filters to handle summary

fix for cloning empty repo (.hg is still empty)

Remove deprecated commit -t option

zsh completion: Added '--newest-first' to incoming, outgoing

hgweb: a couple of fixes on search page - show search string in the bottom search box - wrap search boxes within paragraphs, this also puts some space between last changeset and bottom search box in firefox.

Fix relative pull in a subdir

allow 'hg out' / 'hg in' to show newest commit first

zsh completions: new -M, -m arguments for log, etc.

import docstring from doc/hg.1.txt

add --only-merges (-m) log

add --no-merges (-M) for log, outgoing, incoming

Fix use of diff(1) triggered by set -e. Search harder for a decent diff/patch to use.

hgweb: fix broken filelog->changelog link

hgweb: fix broken search->changelog link

Calling flush is unnecessary with bz2 decompressors and may not even exist.

hgk: add horizontal scrollbar to patch window

Add control-w key binding to quit hgk.

Change asciidoc backend to more recent name. The latest asciidoc doesn't have an 'html' backend. 'html' was last valid with version 6 ( 2005-1-28). Current options are xhtml11, or html4, with xhtml11 by default.

Fixed problem with invoking hgmerge on paths with spaces.

add a target for running only one test

hgweb: improve look-n-feel of changelog nagivation

[issue21] cannot debug extension The following patch should work.

Use $(MAKE) not make

py2exe is not able to handle win32com.shell Changes: - setup.py: help py2exe finding the shell module in win32com.shell

Option -i broken in py2exe_for_demandload Using the includes option -i on modified py2exe is not working. Change: - setup.py: convert self.includes to a list.

Avoid insertion/deletion of CRs on stdio during hg serve

hgweb: fix broken tags->changelog link

Make hgweb work when the repository is empty (no 00changelog.i)

hgweb: add a mercurial link to the footer

hgweb: hide trivial parent (like in show_changeset)

refactor some unlink/remove code and make sure we prune empty dir

New vim script; provides key mappings and menus for GVIM

Do not use 'glob' expansion by default on OS != 'nt'

hgweb: fix too short manifest link

hgweb: make viewing of non-text work in hgweb We use mimetypes.guess_type to guess file types and util.binary to determine whether a file is displayable as text. This lets us display displayable text files in our normal source view. Files that appear to be binary will be displayed as something like "(binary:image/gif)". Clicking on raw view will send the raw file with an appropriate MIME type. Thus things like GIFs will now be viewable inside hgweb without making a mess. Further, things like postscript files that are text should show source in the normal view and a browser can launch a postscript viewer for the raw view.

hgweb: shorten all the URLs in the standard templates A URL like this: http://www.selenic.com/hg/?cmd=changeset;node=5010207c35273ac1331cae44c253dd41fa07cb7f is now presented as: http://www.selenic.com/hg/?cs=5010207c352 (though the old style still works, of course)

hgweb: add shortcuts for all the web commands / fix empty arg bug

symlink unit test

allow empty values for url so we can have /?tip

hgweb: allow urls to be shorter by using shortcuts for example cs=xxx will be expanded to cmd=changeset;node=xxx