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.

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

Merge with crew

imerge: handle renames

merge with crew-stable

test-grep: use lowercase hg command

test-grep: test issue 685

Fix issue 685: trackback in grep -r after rename

The >| redirection does not exist in plain sh.

hghave: test hotshot dependencies (debian does not provide profile)

test-profile: fix grep, check hotshot availability

merge with -stable

Return 0 as 'hg bisect reset' is successful

Test --time, --profile and --lsprof

demandimport: ignore resource module, not available under Windows.

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

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.

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.

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

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

fix up previous commit for 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.

unobfuscate part of f94dbc6c7eaf

Test symlink handling on platform not supporting them