demandimport: ignore pwd and grp. Both are unavailable under Windows and tarfile detects them via ImportError.

util: ignore invalid path errors in path_auditor.

merge with crew-stable

merge: fix a copy detection bug (issue672) When merging rev1 and rev2, we want to search for copies that happened in rev1 but not in rev2 and vice-versa. We were starting the search at rev1/rev2 and then going back, stopping as soon as we reached the revno of the ancestor, but that can miss some cases (see the new test-issue672). Now we calculate the revisions that are ancestors of rev1 or rev2 (but not both) and make sure the search doesn't stop too early. Simplified test provided by mpm, based on a test case provided by Edward Lee.

merge with crew-stable

Added test for commands.dispatch (especially 88803a69b24)

test-context.py: Don't create second repo instance (fixed since 7b5723c95a82)

fancyopts: Copy list arguments in command table before modifying. Before this, executing commands.dispatch(['log', '-r', '0']) commands.dispatch(['log', '-r', 'tip']) would look like: hg log -r 0 hg log -r 0 -r tip Reported by TK Soh, patch by Alexis S. L. Carvalho

Print less scary message if the system supports symlinks: "Skipping test-no-symlinks: system supports symbolic links" instead of "Skipping test-no-symlinks: unexpected feature: symbolic links"

Hide absolute path from test-no-symlinks output. And add missing eol and remove trailing space which where introduced by the patches adding this test.

Make a few portability improvements to path auditing code.

Make audit_path more stringent. The following properties of a path are now checked for: - under top-level .hg - starts at the root of a windows drive - contains ".." - traverses a symlink (e.g. a/symlink_here/b) - inside a nested repository If any of these is true, the path is rejected. The check for traversing a symlink is arguably stricter than necessary; perhaps we should be checking for symlinks that point outside the repository.

mq: teach qpop about symlinks

debugstate: print symlinks as 'lnk', not '777'

manifest: accept -r for rev specification

record: improve docs, improve prompts

Merge with crew-stable

hghave: prefix temporary files with "hg-hghave-"

test-no-symlinks: rename .bundle into .hg for consistency.

Merge with crew-stable

fix up previous commit for stable

Merge with crew-stable

Cache extension load failures. hg commands call extensions.loadall twice, once during dispatch and once when the repository is instantiated. Without this change, load caches successful loads, but not unsuccessful, causing errors to be displayed twice.

merge with -stable

unobfuscate part of f94dbc6c7eaf

Merge with crew-stable

Test symlink handling on platform not supporting them

hghave: feature absence can be checked by prefixing with 'no-'

merge with -stable

Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.

refactor options from cmdtable - add extracommitopts for user and date - factor stuff

merge with crew-stable

CVS import: Support new-style .cvspass-file format. Based on an email from Ralf.Leibold at nuance dot com

raise util.Abort again if specified revision is not an integer. This was changed to NoRepo in 462cc56d898f, because specifying non-integer revisions for e.g. the Mercurial backend caused Abort to be raised in the subversion importer. Now util.Abort is raised again, but the check is done after verifying if it really is a subversion repository.

debugsvnlog call had too many quotes (found by Edouard Gomez)

Remove trailing spaces, fix indentation

merge with crew-stable

Remove trailing spaces

Removed debug print from convert/subversion.py

Replace _ with inst for catching exceptions to not shadow gettext. And removed one _(...) because mercurial.i18n is not yet imported in convert/subversion.py.

Move debugsvnlog to subversion module.

convert: Use debugsvnlog instead of git-like debug-svn-log.

extdiff: do single file diffs from the wc with no copy Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.

extdiff: made it less chatty in non-verbose mode Made the status info only display in verbose mode since most hg commands aren't so chatty. This also makes it cleaner for other extensions to call extdiff.

extdiff: un-nested two functions The functions in extdiff that create temporary repo copies for are useful in other extensions, so the change moves them at the module level.

convert: remove accidental debug print

convert: use '.' as destination name if renaming subdir into root

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

convert: only get history for requested revs when converting hg repo

convert: raise correct type of exception if svn converter can't handle rev

record: raise an exception correctly if we can't create a backup directory

record: work properly if invoked in a subdirectory

convert: replace fork with subprocess call.

convert: support windows SVN simple auth provider

merge with crew-stable

Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.

gitweb: add notfound template

Add message to test output if a test is aborted due to a timeout. Without this an aborted test could produce an empty .err file so the diff looks like as if all lines of the .out files are just missing for some unknown reason.

Merge with crew-stable

Fix issue 653: symlinks checkout failure on non-supporting platforms

test-oldcgi: replace shebangs with explicit python calls to help pysh.

test-issue352: skip tests if platform does not support EOL in paths.

hghave: detect support for EOL in paths.

test-git-import: fake executable permissions.

hghave: detect executable permission availability.

test-clone-failure: fake output upon fifo unavailabity

hghave: detect FIFO availability

Skip test-archive-symlinks if symlinks are not available

posixfile_nt: '+' should allow read access. This fixes unexpected I/O error on committing many files due to cset:8a53b39cd402 (r4902 in crew).

posixfile_nt: '+' was understood as read mode instead of update.

merge with crew-stable

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