Catch IOErrors and RepoErrors when serving repositories via hgweb.

Merge with mercurial/crew

Added version information to "report bug" message for unknown exceptions.

Fixes to "hg heads -r FOO": Make it actually work (undefined variable 'rev'; allow to pass a rev parameter). repo.branchlookup() doesn't need a copy of heads because it doesn't modify it. Use None as default argument to heads() instead of nullid. Doc string PEPification.

add a -r/--rev option to heads to show only heads descendant from rev

Always escape repository name in hgweb, very important in notfound.tmpl.

fix bug in setup.py introduced in r1508. The 'console' argument is expected to be a list of strings, but was changed to just a string.

close .hg/hgrc after writing the default values on clone this fix a bug where Dircleanup did not work because the file was still open

close file before renaming it (since it doesn't work the other way on windows)

fix errors found by pychecker

added st as alias for status in zsh_completition

Merge with Thomas Waldmann

made C src formatting more consistent

fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX

minor optimization: save some string trash

use posix compliant option for head head -N is not posix compliant, head -n N should be used instead

Merge with upstream

Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos To be used in ~/.ssh/authorized_keys with the "command" option, see sshd(8): command="hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" ssh-dss ... (probably together with these other useful options: no-port-forwarding,no-X11-forwarding,no-agent-forwarding) This allows pull/push over ssh to to the repositories given as arguments. If all your repositories are subdirectories of a common directory, you can allow shorter paths with: command="cd path/to/my/repositories && hg-ssh repo1 subdir/repo2"

Catch the exception raised with 'hg help <somethingambiguous>'. Example: 'hg help a'

Add revlog.strip to truncate away revisions. This updates the revlog data structures for index and nodemap in place so the .d and .i files don't need to be reread after stripping away a revision.

Optimize manifest.add Testing shows that manifest.add is spending a significant percentage of its time running calcoffsets and doing text = "".join(addlist). This patch removes the need for both of these by storying the manifest in a character array, and using a modified bisect search to find lines without the help of a separate index of line offsets. manifest.add was also reworked to push delta construction/combination into the main loop. Time to apply 2751 patches (without psyco, ext3 noatime,data=writeback): Stock hg: 4m45s real 3m32s user 55s sys patched: 2m48s real 1m53s user 43s sys quilt: 2m30s real 45s user 50s sys (quilt does much more io...)

Reduce string duplication in compression code This cuts down on string copies and allows buffers (instead of strings) to be passed into the compression code

reset mtime when two files are equal

add localrepo.wlock for protecting the dirstate - add localrepo.wlock - nest it in localrepo.lock - protect the code that change the dirstate

add a releasefn keyword to lock.lock releasefn is a function that will be executed when the lock is released

add dirstate.lazyread, write atomically the dirstate - add a dirstate.lazyread function that read only if it wasn't read before and update all callers - use the atomic keyword from util.opener to atomically write the dirstate mercurial/dirstate.py

add an atomic argument to util.opener when atomic is used, the file while be renamed on close

don't print anything about file of unsupported type unless the file was specified on the command line

fix a bug where command defaults suppress global options

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