fix-up references to repo.RepoError

remove unneeded imports of mdiff

Merge with stable

merge with -stable

clone: do not delete the target if only the update fails

Merge with crew-stable

Merge with hg-stable

test-grep: use lowercase hg command

Merge with crew-stable

mq: truncate patch just before rewriting header

convert: raise Abort instead of NoRepo when CVS pserver auth fails. At this point we know the source is CVS, so we should not go through the rest of the converters.

convert: hg: optionally create branches as clones If convert.hg.clonebranches is set, branches will be created as clones of their parent revisions. All clones will be subdirectories of the destination path.

Use smerge minor mode in emacs to resolve conflicts. The condition-case is used to suppress errors with emacs versions before 21.

Merge with crew-stable

test-grep: test issue 685

Fix issue 685: trackback in grep -r after rename

merge with crew-stable

The >| redirection does not exist in plain sh.

Merge with crew-stable

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

Merge with crew-stable

test-profile: fix grep, check hotshot availability

merge with -stable

Return 0 as 'hg bisect reset' is successful

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

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.

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: 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