merge with crew

merge with stable

rebase: improve error message on improper phases The previous error message had two issues: The first issue was that it wasn't, in fact, an error but a warning, even though it described a fatal error condition preventing the successful completion of the command. The second was that it didn't mention the immutable changesets, leaving the user guessing at the true cause of the error. The main downside to this change is that we now get an 'abort: can't abort...' message which technically contradicts itself. In this case, I blame that on the two uses we have for the word; if it weren't for backwards compatibility, we could make util.Abort print out 'error: <whatever>'.

subrepo: support Git being named "git.cmd" on Windows (issue3173) Popen does not consider "foo.cmd" equivalent to "foo" on Windows. Unfortunately, the default MSYS Git installation installs only "git.cmd" into the path by default. This patch probes for both possible names on Windows.

subrepo: warn user if Git is not version 1.6.0 or higher

test-http and test-https: partially adapt for Windows

test-subrepo-git.t: adapt for Windows hg forget 'notafile*' is changed to use a name that is valid on Windows so we still get the same error ... but the error message is disabled because it varies with the Windows version.

test-bookmarks-pushpull: partially adapt for Windows The kill call at the end is redundant, as we already have 199: $ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log 200: $ cat ../hg.pid >> $DAEMON_PIDS So there is nothing left that would not already be killed by the $DAEMON_PIDS mechanism.

test-static-http: partially adapt for Windows

test-bad-pull: partially adjust for Windows On a English Windows 7, the testcase fails with $ hg clone http://localhost:$HGPORT/ copy abort: error: No connection could be made because the target machine actively refused it Since the error message on non-English Windows installs are most likely different, we have to glob the entire error message away for Windows.

tests: consistently use printenv.py the same MSYS/Windows-compatible way This will remove some reasons some tests are disabled on Windows.

tests: prepare get-with-headers.py for MSYS get-with-headers.py took the http GET parameter as a command line parameter that had to start with '/'. MSYS on windows will mangle such paths. Instead of applying a workaround everywhere (such as an extra '/') we let get-with-headers.py add the mandatory '/'. That is consistent with the url path handling in the Mercurial url class. A few tests sent 'GET ?cmd=...' which is invalid. They will now send 'GET /?cmd=...'. This will not enable any tests for being run on windows - only remove one reason they were disabled.

tests: hghave outer-repo should be true even if a bad repo is found Only the abort message 'no repository found' is a reliable indication that there is no outer repo.

tests: add missing no-outer-repo requirements Outer repos (if any) will now never be touched by the tests. But it is better to run without any repos around the tmp directory.

tests: convert some 'hghave no-outer-repo' to #if In some places we instead use 'hg init' to create a well-known outer repo without any special extensions or other config settings.

strip: incrementally update the branchheads cache after a strip This function augments strip to incrementally update the branchheads cache rather than recompute it from scratch. This speeds up the performance of strip and rebase on repos with long history. The performance optimization only happens if the revisions stripped are all on the same branch and the parents of the stripped revisions are also on that same branch. This adds a few test cases, particularly one that reproduces the extra heads that mpm observed.

localrepo: convert _updatebranchcache from nodespace to revspace _updatebranchcache used to use revlog.reachable. After the switch to revlog.ancestors, we can now clean it up a bit and switch the algorithm from nodes to revs.

discovery: convert legacy part of checkheads to revs from nodes After a recent switch from revlog.reachable to revlog.ancestors, clean up this old call site, switching it from nodes to revs.

transplant: convert applied() algorithm from nodes to revs After a recent switch from revlog.reachable to revlog.ancestors, clean up the code a bit to use revs rather than nodes.

revlog: remove reachable and switch call sites to ancestors This change does a trivial conversion of callsites to ancestors. Followon diffs will switch the callsites over to revs.

revlog: add incancestors, a version of ancestors that includes revs listed ancestors() returns the ancestors of revs provided. This func is like that except it also includes the revs themselves in the total set of revs generated.

scmutil: change canonpath to use util.samefile (issue2167) Fixes (on Windows in cmd.exe): $ hg -R v:\x\a status V:\x\a\bar abort: V:\x\a\bar not under root where v:\x\a is a valid repository with a checked-out file "bar" (Note the difference in casing: "v:\" versus "V:\")

win32.py: let samefile and samedevice work on directories too

rebase: do not add second parent to rebased changeset (drop detach option) (BC) Rebase now behaves as if --detach was always passed. Non-merges are rebased as non-merges, regardless of their parent being an ancestor of the destination. Merges will usually be rebased as merges unless both of their parents are ancestors of the destination, or one of their parents is pruned when rebased. This only alters the behavior of rebase when using the --source/--rev options. --detach option is deprecated. All test changes were carefully validated.

zsh completion: catch up with 2.2 commands and options * add completion for phase and graft core commands * add completion for rebase extension * add new options for already defined commands: * commit --amend * import --bypass * manifest --all * merge --tool * revert -C (short for --no-backup) * qpush --exact [mq] * email --body [patchbomb]

revset: add a utility for obtaining the source of a given rev graft, transplant and rebase all embed a different type of source marker in extra, and each with a different name. The current implementation of each is such that there will never be more than one of these markers on a node. Note that the rebase marker can only be resolved if the source is still present, which excludes the typical rebase usage (without --keep) from consideration (unless the resulting bundle in strip-backup is overlayed). There probably isn't any reason to use rebase --keep as a substitute for transplant or graft at this point, but maybe there was at one point and there are even a few rebases in the hg repo, so it may be of historical interest.

revset: add a predicate for finding converted changesets This selects changesets added because of repo conversions. For example hg log -r "converted()" # all csets created by a convertion hg log -r "converted(rev)" # the cset converted from rev in the src repo The converted(rev) form is analogous to remote(id), where the remote repo is the source of the conversion. This can be useful for cross referencing an old repository into the current one. The source revision may be the short changeset hash or the full hash from the source repository. The local identifier isn't useful. An interesting ramification of this is if a short revision is specified, it may cause more than one changeset to be selected. (e.g. converted(6) matches changesets with a convert_revision field of 6e..e and 67..0) The convert.hg.saverev option must have been specified when converting the hg source repository for this to work. The other sources automatically embed the converted marker.

merge with stable

merge with i18n

i18n-de: More corrections for translation of default, and other translations

i18n-de: translate default as Vorgabe

i18n-de: Update strings, translated many fuzzy strings

i18n-pt_BR: synchronized with 0fdd8193c8b5

merge with i18n

i18n-de: More corrections for translation of default, and other translations

tests: remove execute permission from two unified test files

graft: allow -r to specify revisions

consistency: use REV instead of REVISION

export: add optional -r to synopsis It is not already covered by [OPTION]..., because in this case REV... would need to be marked optional.

strip: add optional -r to synopsis

qimport: use [FILE]... because if -r is used no file is needed

mq: abort if no files or revisions are specified for qimport

tests: convert some hghave unix-permissions to #if

tests: run test-walk.t on windows A couple of detours and changed paths are used to work around msys path conversion.

tests: better testing of 'glob:glob' in test-walk.t

tests: move tests in test-walk.t using ':' in filenames to conditional section eol-in-paths will also protect against testing ':' in filenames on FAT.

tests/printenv.py: eliminate trailing spaces on output

tests: fix test-i18n.t after translation update

merge with i18n

Corrected hyphenation, translated subrepo help and other strings

i18n-de: translate default as Vorgabe

i18n-de: Update strings, translated many fuzzy strings

i18n-ru: synchronized with 2255950e1f76

tests: remove hghave system-sh from test-pending.t The alternative would have been to add a unix-permissions requirement.

tests: use hghave eol-in-paths to test for support for ':' in filenames and " " It is an approximation but seems to work ok ... and testing that 'foo:bar' creates a real file and not just a resource fork is not completely trivial.

tests: use a different evil name in test-hgweb-raw.t The test used a filename with ':' which prevented the test from running on Windows and FAT. It now uses a filename with space and '%' and will thus still exercise proper url escaping.

tests: add some missing #if's / hghave requirements Seen on Linux with FAT.

tests: introduce hghave hardlinks Some tests can't be run on FAT filesystems because it doesn't support hardlinks.

tests/hghave: test that the inotify unix socket actually can be created Inotify do not work on FAT filesystems.

tests/hghave: test that a fifo actually can be created on the filesystem Some tests were failing on FAT filesystems.