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'