fix bundlerepo broken by 4205f626dc05 since we now use struct in case of lazy parser, this have to be an integer instead of None see issue681

Merge with crew-stable

imerge: simplify 1d5ebb0d366f

imerge: fix status file lookups

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 with crew-stable

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

Merge with crew-stable

Merge with crew-stable

merge with -stable

Merge with crew-stable

merge with -stable

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

merge with crew-stable

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

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

Merge with crew-stable

merge with crew-stable

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

convert: drop duplicated assignments.