httprepo: quote the path part of the URL This should fix a 'hg clone "http://hg.example.org/path with spaces/"' The code tries to do the right thing when the user passes a path that's already escaped in part (e.g. "http://hg.example.org/path%20with spaces/"). If we're redirected, urllib2 will happily follow the URL it's given without escaping anything. I'm not sure what we would have to hook to work around that.

dirstate: fix rebuild; add a test If rebuild calls invalidate, it will just queue a (re)read of the dirstate file, while what we really want is to empty the current state.

hgweb: don't use os.path.join to build URL parts

hgwebdir: change os.sep in the name of repos to "/"

convert: svn: remove debugging message

convert: look up copies in getchanges instead of getcommit svn: defer path expansion until getchanges to reduce latency, as well as memory usage when converting incrementally.

convert: svn: pull up path to file expansion code into separate function. This is part of the process for deferring path expansion until getchanges. Copy detection also needs to be moved out of the commit object.

convert: svn: hoist up branch creation check

convert: svn: remove dead code

convert: svn: add helper function for optrevs

patch: add git symlink support

Merge with crew

convert: svn: ensure leading / is removed from paths in _find_children (broken in 2bd996d0aaf8)

merge with crew-stable

Simplify/correct finding the hg executable (fixes issue644) Simply use find_exe('hg') as the default value for $HG and require to manually set it if you have special requirements. While the default will not always be 100% correct (i.e. the identical hg version) for many users it is and for the others the hg executable found in the PATH should do most things correctly. Developers or other users with multiple installs can set $HG or run something like util.set_hgexecutable in their shell or python scripts. Additionally util.hgexecutable() is now available so extensions can access the value with a public interface, too.

convert: drop duplicated assignments.

imerge: gussy up dispatcher to support subcommand opts. Add -n, --resolved, --unresolved to status.

Merge with crew

imerge: handle renames

merge with crew-stable

archive: abort on empty repository. Fixes #624.

Merge with -stable

merge: avoid double deletion mentioned in issue636

merge with hg-stable

The >| redirection does not exist in plain sh.

imerge: sorted() is only available in python2.4 and above

imerge: tarfile.extractall is only available in python2.5

Update imerge for new filemerge interface

del transaction before lock before wlock This way rollbacks happen while the repo is still locked. Deleting lock before wlock is not strictly necessary, but is more consistent with the locking order.

convert: fix locking order

update tests output

convert: (svn) simplify _find_children

Merge with stable

Update asciidoc instructions to suggest html4 for newer versions

Merge with mpm

Merge with stable

merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test

Automated merge with http://hg.intevation.org/mercurial/crew

dirstate: improve error message on file/directory clash

imerge extension and test

localrepository: allow rawcommit to commit with an empty message

Update style of record's cmdtable to match mercurial/commands.py

os.isatty isn't available on Windows, so use sys.stdin.isatty()

convert: add config option to turn off use of branch names

Add record extension, giving darcs-like interactive hunk picking

ui: get readline and prompt to behave better depending on interactivity

patch: make internal code a bit friendlier to use

commands: move commit to cmdutil as wrapper for commit-like functions

patch: remove unused parameter from b85diff

Update expected test output It's no longer a "problem" to have the same name listed with no prefix and a "hgext." prefix.

extensions: don't get confused by aliasing between "foo" and "hgext.foo"

merge with crew-stable

Fix re: and glob: patterns in .hgignore (reported by Brad Schick) relglob: and relre: were already detected for a long time, so I kept this undocumented functionality, especially as it was already tested in test-hgignore.

test-convert: Hide warning about missing subversion bindings.

Fix bashism and remove useless use of cat.

Test qnew --git

mq: add qnew --git option

convert: empty log messages are OK as of 7f5c3fb0a37d

localrepo.commit: only munge comment text if committing via dirstate

convert: make test-convert executable