largefiles: fix a traceback when archiving a subrepo in a subrepo This regression was introduced in 43fb170a23bd.

help: improve hgweb help The existing help only walked through an example. Now we first explain the basic rules and then show an example. The 'collections' example and description only cause confusion and is removed. Bikeshedded by Patrick Mezard <patrick@mezard.eu>

convert: keep branch switching merges with ancestors (issue3340) When running convert with a filemap, merge parents which are ancestors of other parents are ignored. This is hardly a problem when parents belong to the same branch, but the result could be confusing when named branches are involved. With: -o-a1-a2-a3... <- A \ \ b1-b2-b3...-m- <- B If all b* revisions are discarded, it is useful to preserve 'm' even if it is empty after filtering to record the branch switch. This patch makes filemap preserve "ancestor parents" if there is no "non-ancestor parent" on the same branch than the merge revision. Remarks: - I am not completely convinced by the reasons given above and those detailed by Matt in this thread: http://selenic.com/pipermail/mercurial-devel/2012-May/040627.html The properties we try to preserve are not clearly defined. That said, I know this patch already helped someone on IRC and the tests output look reasonable. - This is a new version of the original "convert: filemap must preserve fast-forward merges" patch. It has exactly the same output for 2 parents merges, the additional complexity is here to handle more than two parents.

revset: add "diff" field to "matching" keyword The new "diff" field lets you use the matching revset keyword to find revisions that apply the same change as the selected revisions. The match must be exact (i.e. same additions, same deletions, same modified lines and same change context, same file renames and copies). Two revisions matching their diff must also match their files. Thus, to match the diff much faster we will always check that the 'files' match first, and only then check that the 'diff' matches as well.

mq: defer command wrapping to extsetup (API) mq wraps all commands that are not in commands.norepo, which is now performed in this second phase of the extensions setup process. This goes against the current best practices on the wiki [1] as far as where command wrapping is performed, but follows it regarding where global options are injected. mq needs to be the first layer called when command dispatching in order to consistently retarget to the patch repo, regardless of the load order of the extensions. This means being the last to wrap the command table. Previously, 'hg <extdiff> --mq' would diff the main repo unless mq was enabled after extdiff. [1] http://mercurial.selenic.com/wiki/WritingExtensions

revset: ensure we are reversing a list (issue3530)

test-keyword: adapt for Windows

tests: don't use dates before epoch in test-keyword.t Timezone offsets of less than a minute is not shown but can cause displayed dates to be before epoch start - and dates before epoch start is not shown correctly on Windows (see also 4d5b12a5517b). These 'negative' dates could be considered undefined behaviour so we don't care and swap the tests values for timestamp and timezone.

tests: make test-convert-bzr.t more stable The test would occasionally fail because datesort don't have sub-second granularity and thus can't sort commits made in the same second. The test is made more stable by adding 1 second of sleep to make sure the bzr commits are done with different timestamps.

casecollision: add tests Add more tests to exercise the case collion detection code

dirstate: add dir/file collision test Add a test exercising collisions in add between files and directories of the same name.

dirstate: factor common update code into _addpath Factor update code common to all callers of _addpath into _addpath. By centralizing the update code here, it provides one place to put updates to new data structures - in a future patch. It also removes a few lines of duplicate code.

test-subrepo-relative-path: partially adapt for Windows

tests: make rm of usercache in test-largefiles.t more robust Recursive removal of a different path could be fatal - better avoid recursive rm completely.

merge with stable

merge with crew

tests: enable test-largefiles.t on Windows MSYS The 'serve' requirement is moved to the sections that really need it. $USERCACHE needs quoting.

test-largefiles: partially adapt for Windows The adaption is partial, because "serve" is not yet officially supported in tests on Windows. The test passes on Windows with an experimental testbed that supports hg serve in tests on Windows - except for some USERCACHE issues. The added (glob)'s are needed because of backslash <-> shlash issues in paths.

tests: make histedit pass on Windows MSYS The command file will now be named with $TESTTMP (with '\') instead of `pwd` (with '/') to avoid wrong path conversions.

tests: make histedit tests more resilient to filesystem variation Better quoting of odd filesystem paths and no dependency to execute bit.

tests: convert histedit tests to .t Mostly a trivial conversion.

histedit: use stable iteration order for processing bookmarks Random dict iteration order caused test failure in test-histedit-bookmark-motion.t.

Added signature for changeset b013baa3898e

Added tag 2.2.3 for changeset b013baa3898e

record: fix display of non-ASCII names spotted by Nikolaj Sjujskij

i18n-pt_BR: synchronized with d63fb1fce977

merge with i18n

i18n-ja: fix some rst syntax problems

i18n-ja: synchronized with 86a3bb9c5f5c

obsolete: function and method to access some obsolete data An `obsolete` boolean property is added to changeset context. Function to get obsolete marker object from a changeset context are added to the obsolete module.

obsolete: exchange obsolete marker over pushkey For a version of the exchange, all markers are exchange. This won't scale and we will need a better protocol later.

debugobsolete: list all obsolete marker if no argument are specified

obsolete: add easy way to iterate over obsolete marker object

obsolete: helper class to access obsolete marker data

command: creation of obsolete marker * add metadata encoding/decoding ability * add a method to obsstore to help creating marker * add a debug command to create marker

obsolete: introduction of obsolete markers Markers are stored as binary records in a log structured file in .hg/store/obsstore.

histedit: mark as a first party extension

histedit: remove use of reduce() builtin spotted by check-code

test-histedit-edit: improve coverage of histedit code

histedit: fix most check-code violations

histedit tests: fix check-code problems

histedit: new extension for interactive history editing

exewrapper: use generic term script The exewrapper doesn't know anything so far about what the script is or does.

Makefile: add build_hgexe -i for local

setup: compile hg.exe This implements a new command $ python setup.py build_hgexe -i which places the hg.exe in the root of the source tree.

test-commit-amend: adapt for Windows after fba17a64fa49

merge with stable

exewrapper: adding new exewrapper.c

keyword: use ui.formatter for kwfiles output

discovery: simplify branchmap construction against legacy server All necessary data to fire a simple revset query are already known. No call to ancestors are needed. Such ancestors calculation was already done to compute outgoing.missing.

copies: re-include root directory in directory rename detection (issue3511)

store: sort filenames in place

convert: check for failed svn import in debugsvnlog and abort cleanly 'hg debugsvnlog' failed with a crash when using the uninitialized transport in get_log_child if the import of the svn libraries had failed. 'convert' should never get as far as launching 'hg debugsvnlog' if the svn libraries are missing, but by launching a subprocess there is risk that the environment is mangled so the second import fails. It is in principle also possible to launch the command manually.

convert: accept Subversion 'file:///c%3A/svnrepo' syntax on Windows Subversion can handle ':' quoted as '%3A' but urllib.url2pathname can't and Mercurial thus rejected some valid subversions URLs. This particular case will now be handled by some preprocessing before handing it over to urllib.url2pathname. This is tested by 0413f68da85c when test-convert-svn-source.t and test-convert-svn-move.t can be run on Windows.

win32: remove uneeded usage of _STARTF_USESHOWWINDOW spawndetached() was the only user of _STARTF_USESHOWWINDOW and it creates the process with _CREATE_NO_WINDOW anyway. If the process has no window, then there is nothing to hide.

win32: specify _CREATE_NO_WINDOW on spawndetached() Before this change, a console window briefly popped up on "hg serve -d" and disappeared again, stealing the focus window (which was very annyoing when running tests). Specifying _CREATE_NO_WINDOW instead of _DETACHED_PROCESS fixes this (as tested on Windows 7 x64).

amend: disable hooks when creating intermediate commit (issue3501)

ui: add a variable to control whether hooks should be called So hooks can be temporarily disabled.

strip: update help to state than you can strip public changeset Multiple people have been confused by it.

bookmarks: correctly update current bookmarks on rebase (issue2277) When you rebased with a currently active bookmark, that bookmark would always point at the new tip, regardless of what revision it pointed at before the rebase. All bookmarks will now point at the equivalent post-rebase commit. However, the currently active bookmark will cease to be active unless it points at the new tip post-rebase. Rebase will always leave the new tip as the working copy parent, which is incompatible with having an active bookmark that points at some other revision. The common case should be that the active bookmark will point at the new tip post-rebase.

graft: don't drop the second parent on unsuccessful merge (issue3498) This replicates the strategy of rebase, which postpones setparents and duplicatecopies after checking the merge stats. Without the second parent, resolve cannot redo merge.

tests: add missing path globbing for Windows in svn tests

fix push of moved bookmark when creating new branch heads The problem occured when pushing a changeset that at the same time creates a new named branch head and moves a bookmark. The code invoked methods that only exist on localrepo instances, so it failed for any other type of remote. The test suite only tested against local remotes.

merge with stable

merge with i18n

i18n-pt_BR: synchronized with f8af57c00a29

merge with i18n

i18n-de: Move policies from header of de.po to http://mercurial.selenic.com/wiki/GermanTranslation

scmutil: speed up new-style range extension This improves perfrevset performance by 10% for 2222::33333 on a kernel repo.

merge with crew-stable

subrepo/svn: make rev number retrieval compatible with svn 1.5 (issue2968) ae2664ee0223 introduced "svn info TARGET@REV" to determine if a certain path exists in the specified revision, but in svn 1.5 the error message "Not a valid URL" yields exit code 0 so the error is not caught. Use "svn list TARGET@REV" instead which works with svn 1.5 and is even faster in some situations.

convert/bzr: make tests work with bzr 2.0 again bzr ci --commit-time was introduced in 2.1 bzr add without -q prints "adding" in 2.1, "added" in 2.0

tests: cleanup of svn url handling The subversion tests used different tricks to create properly encoded URLs, partly due to partial support for different ways of running the tests on windows. Now we only need/support one way of running the tests on windows. Windows URLs should look like 'file:///c:/foo%20bar' and on Unix platforms like 'file:///tmp/baz'. 'pwd' in the test framework will on Windows emit paths like 'c:/foo bar'. Explicit handling of backslashes in paths is thus no longer needed and is removed. Paths on windows do however need an extra '/' compared to other platforms. This change makes test-subrepo-svn.t pass on windows with msys. Other tests might need more work.

test-subrepo-svn.t: partially 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.

convert: ignore svn:executable for subversion targets without exec bit support Calling propset/propdel with subversion 1.6 on FAT gave abort: svn exited with status 256 and made test-convert-hg-svn.t and test-convert-svn-sink.t fail. 1.7 worked. This is a rework of fdee5d614fcc but ignores the executable bit when it isn't supported instead of using an approximation.

tests: add missing 'backup bundle' path glob in test-rebase-collapse.t Introduced by c8eda7bbdcab.

tests: add missing 'backup bundle' path glob in test-rebase-scenario-global.t Introduced by 50f434510da6.

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