revert: add some inline comments I spend some time understanding how this part of the revert code is working. I'm adding some comments to help the code readability. I expect most of them to disappear in a coming refactoring. But the refactoring should be easier to follow with the comment.

revert: cosmetic align of the dispatch table This changeset make a minimal cosmetic change to help readability of the value in this table.

revert: add a test case to reverting "add" during merges This kind of revert is specifically trickier since the file is reported as "modified" by status. This case was only tested by some largefiles test. We introduce proper testing of all aspects of this case in the revert tests themselves.

alias: change return code of bad definition to 255 We use 255 for general command error. It can't raise util.Abort because help module executes badalias command to get error message.

bookmarks: properly align multi-byte characters

tests: fix cut and paste error on encoding alignment test

alias: handle shlex error in command aliases No command should fail with ValueError just because there is unparseable alias definition. It returns 1 like other badalias handlers, but should be changed to 255 in a later version because we use 255 for general command error.

subrepo: normalize path in the specific way for problematic encodings Before this patch, "reporelpath()" uses "rstrip(os.sep)" to trim "os.sep" at the end of "parent.root" path. But it doesn't work correctly with some problematic encodings on Windows, because some multi-byte characters in such encodings contain '\\' (0x5c) as the tail byte of them. In such cases, "reporelpath()" leaves unexpected '\\' at the beginning of the path returned to callers. "lcalrepository.root" seems not to have tail "os.sep", because it is always normalized by "os.path.realpath()" in "vfs.__init__()", but in fact it has tail "os.sep", if it is a root (of the drive): path normalization trims tail "os.sep" off "/foo/bar/", but doesn't trim one off "/". So, just avoiding "rstrip(os.sep)" in "reporelpath()" causes regression around issue3033 fixed by fccd350acf79. This patch introduces "pathutil.normasprefix" to normalize specified path in the specific way for problematic encodings without regression around issue3033.

subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos Before this patch, sanitizing ".hg/hgrc" scans directories and files also in meta data area for non-hg subrepos: under ".svn" for Subversion subrepo, for example. This may cause not only performance impact (especially in large scale subrepos) but also unexpected removing meta data files. This patch avoids sanitizing ".hg/hgrc" in meta data area for non-hg subrepos. This patch stops checking "ignore" target at the first (case-insensitive) appearance of it, because continuation of scanning is meaningless in almost all cases.

subrepo: make "_sanitize()" take absolute path to the root of subrepo Before this patch, "hg update" doesn't sanitize ".hg/hgrc" in non-hg subrepos correctly, if "hg update" is executed not at the root of the parent repository. "_sanitize()" takes relative path to subrepo from the root of the parent repository, and passes it to "os.walk()". In this case, "os.walk()" expects CWD to be equal to the root of the parent repository. So, "os.walk()" can't find specified path (or may scan unexpected path), if CWD isn't equal to the root of the parent repository. Non-hg subrepo under nested hg-subrepos may cause same problem, too: CWD may be equal to the root of the outer most repository, or so. This patch makes "_sanitize()" take absolute path to the root of subrepo to sanitize correctly in such cases. This patch doesn't normalize the path to hostile files as the one relative to CWD (or the root of the outer most repository), to fix the problem in the simple way suitable for "stable". Normalizing should be done in the future: maybe as a part of the migration to vfs.

subrepo: invoke "_sanitize()" also after "git merge --ff" Before this patch, sanitizing ".hg/hgrc" in git subrepo doesn't work, when the working directory is updated by "git merge --ff". "_sanitize()" is not invoked after checking target revision out into the working directory in this case, even though it is invoked indirectly via "checkout" (or "rawcheckout") in other cases. This patch invokes "_sanitize()" explicitly also after "git merge --ff" execution.

subrepo: make "_sanitize()" work "_sanitize()" was introduced by 224e96078708 on "stable" branch, but it has done nothing for sanitizing since 224e96078708. "_sanitize()" assumes "Visitor" design pattern: "os.walk()" should invoke specified function ("v" in this case) for each directory elements under specified path but "os.walk()" assumes "Iterator" design pattern: callers of it should drive loop to scan each directory elements under specified path by themselves with the returned generator object Because of this mismatching, "_sanitize()" just discards the generator object returned by "os.walk()" and does nothing for sanitizing. This patch makes "_sanitize()" work. This patch also changes the format of warning message to show each unlinked files, for multiple appearances of "potentially hostile .hg/hgrc".

vfs: add lexists() in current api lexists is added in current API of vfs.

bundlerepo: update unlink in getremotechanges to use vfs As per WindowsUTF8 plan, unlink from getremotechanges is updated to use vfs in this change.

docker: update package target to packages/

packaging: move output directory from build/ to packages/ setuptools owns build/ and dist/ and we want to have our own scheme

make: add a basic osx mpkg target

setup: make Xcode 5.1 check less specific Was failing on "5.1\n".

merge with stable

alias: fix loss of non-zero return code in command aliases This also includes test for shell aliases. It avoid using "false" command because "man false" does not say "exit with 1" but "exit with a status code indicating failure."

exchange: drop dead code This code have been factorised and moved in its own function by 7d0bbb6dd730. We actually read the result of this other computation in the very line before the deleted block. I somehow forgot to remove the original code, but it is now dead. Good bye duplicated computation.

exchange: fix indentation level

import: add --partial flag to create a changeset despite failed hunks The `hg import` command gains a `--partial` flag. When specified, a commit will always be created from a patch import. Any hunk that fails to apply will create .rej file, same as what `hg qimport` would do. This change is mainly aimed at preserving changeset metadata when applying a patch, something very important for reviewers. In case of failure with `--partial`, `hg import` returns 1 and the following message is displayed: patch applied partially (fix the .rej files and run `hg commit --amend`) When multiple patches are imported, we stop at the first one with failed hunks. In the future, someone may feel brave enough to tackle a --continue flag to import.

update: introduce --tool for controlling the merge tool Update is a kind of merge and may also need a merge tool and should have the options described in the merge-tools help.

merge: fix stupid indentation left over from previous refactorings

Merge with stable

revsetbenchmark: support for running on other repo We add a -R/--repo option to run the benchmarks on another repository. This is very useful as some repository are bigger/more interesting than the mercurial one.

revsetbenchmark: automatically finds the perf extension Before this changeset, you had to stand in the root of the mercurial repo to run the `revsetbenchmark.py` script. Otherwise, the perf extension would not be found a `./contrib/perf.py` and the script would crash in panic. We now figure out the contrib directory from the location of this script. This makes it possible to run the script from other location that the mercurial repo root (but you still need to be in the core mercurial repository)

bundle2: make sure standard stream are binary Python on Windows apparently use encoded stream by default. We use the same trick than elsewhere in the code to make them binary. This should fix the current buildbot failure on windows.

revset-benchmark: add max(::(tip~20) - obsolete()) This revset is used in evolve. The new revset lazyness should make it all faster but in practice it is significantly slower. Below is a timing for this entry on my Mercurial repo. 2.9.2) ! wall 0.034598 comb 0.040000 user 0.040000 sys 0.000000 (best of 100) 3.0+@) ! wall 0.062268 comb 0.060000 user 0.060000 sys 0.000000 (best of 100) The ~20 have been taken arbitrary.

merge: use separate lists for each action type This replaces the grand unified action list that had multiple action types as tuples in one big list. That list was iterated multiple times just to find actions of a specific type. This data model also made some code more convoluted than necessary. Instead we now store actions as a tuple of lists. Using multiple lists gives a bit of cut'n'pasted code but also enables other optimizations. This patch uses 'if True:' to preserve indentations and help reviewing. It also limits the number of conflicts with other pending patches. It can trivially be cleaned up later.

changelog: ensure changelog._delaybuf is initialized The ``localrepo.writepending`` method is using the ``changelog._delaybuff`` attribute to know if it has anything to do. However the ``changelog._delaybuff`` is never initialised at ``__init__`` time. This can lead to crash when using bundle2 for part that never touch the changelog. We simply initialize it to its base value. This is scheduled for stable as it both trivial and blocking for experimenting with bundle2.

proxy: remove unneeded _set_hostport for compatibility with Python 2.7.7rc1 With Python 2.7.7rc1, "hg pull" through HTTP CONNECT tunnel fails due to the removal of _set_hostport [1]. ... File "mercurial/url.py", line 372, in https_open return self.do_open(self._makeconnection, req) ... File "mercurial/url.py", line 342, in connect _generic_proxytunnel(self) File "mercurial/url.py", line 228, in _generic_proxytunnel self._set_hostport(self.host, self.port) AttributeError: httpsconnection instance has no attribute '_set_hostport' self._set_hostport(self.host, self.port) should be noop and can be removed because: - _set_hostport() [2] was the function to parse "host:port" string and set them to self.host and self.port, - and (self.host, self.port) pair should be valid since connect() is called prior to _generic_proxytunnel(). [1]: http://hg.python.org/cpython/rev/568041fd8090 [2]: http://hg.python.org/cpython/file/3a1db0d2747e/Lib/httplib.py#l721

bugzilla: support Bugzilla 4.4.3+ API login token authentication (issue4257) Bugzilla 4.4.3 and later remove the old cookie based session authentication from the Web Services API and replace it with a login token. The session can now also be restricted to the originating IP. Add the necessary to the extension so it works with 4.4.3 and later.

resolve: don't abort resolve -l even when no merge is in progress This broke some internal automation that was quite reasonably checking for unresolved files as a way to determine whether a merge happened cleanly. We still abort for resolve --mark etc.

templates: fix ifcontains against sets with length > 1 (issue4259) Previously the ifcontains revset was checking against the set using a pure __contains__ check. It turns out the set was actually a list of formatted strings meant for ui output, which meant the contains check failed if the formatted string wasn't significantly different from the raw value. This change makes it check against the raw data, prior to it being formatted.

run-tests: assign value to ESCAPEMAP - dict.update do not return self a36cc85a5b7b did more than what the description said and introduced a bug.

run-tests: fix invalid reference to stringescape after a36cc85a5b7b

update: specify custom conflict markers for update (BC) Add custom conflict markers 'working copy' and 'destination' for doing hg update when there are conflicts between your working copy and the destination.

run-tests: add docstrings

run-tests: avoid duplicate code in vlog()

run-tests: make attributes of TestRunner internal There is little reason for the data members of TestRunner to be public, as they are implementation details. Enforce it through naming.

run-tests: make testdir an argument of TestSuite.__init__ With this change, TestSuite no longer accesses anything on TestRunner and the TestRunner is no longer passed to TestSuite.

run-tests: move loop to a named argument of TestSuite.__init__

run-tests: make keywords a named argument to TestSuite.__init__ This was the last usage of option in ``TextTestRunner.run``.

run-tests: make retest a named argument of TestSuite.__init__

run-tests: move whitelist and blacklist to named arguments of TestSuite

run-tests: pass jobs into TestSuite constructor This starts a series of patches that will lessen the importance of TestRunner. It will remove the TestRunner instance stored inside the TestSuite.

help: add local/other description to merge tool description Adds a more detailed description of what 'local' and 'other' mean to the merge tool documentation.

rebase: specify custom conflict marker labels for rebase (BC) Changes rebase conflict markers to say 'source' and 'dest' instead of 'local' and 'other'. This ends up looking like: one <<<<<<< dest: a3e5c7fd master - bob: "A commit to master" master ======= mine >>>>>>> source: c7fda3e5 - durham: "A commit to my feature branch" three

graft: customize graft conflict markers (BC) Changes the graft conflict markers to be 'graft' and 'local' to make it more intuitive which side is which.

merge: add labels parameter from merge.update to filemerge Adds a labels function parameter to all the functions between merge.update and filemerge.filemerge. This will allow commands like rebase to specify custom marker labels.

run-tests: move interactive test acceptance into TestResult We shouldn't be performing interactive prompting during test execution. The first step of this is to move the functionality into TestResult.

run-tests: raise WarnTest outside of Test.fail()

run-tests: move diff generation into TestResult TestResult is the thing that captures all our test results. It's logical for diff viewing to be handled there and not inside Test. While writing this patch, it was discovered that Test.fail() was printing redundant test result output. This has been removed. Arguments controlling diffs have been removed from Test.__init__.

run-tests: remove global abort flag The global abort flag has been moved into each Test instance. A Test.abort() accomplishing the same thing has been added.

merge: add conflict marker formatter (BC) Adds a conflict marker formatter that can produce custom conflict marker descriptions. It can be set via ui.mergemarkertemplate. The old behavior can be used still by setting ui.mergemarkers=basic. The default format is similar to: {node|short} {tag} {branch} {bookmarks} - {author}: "{desc|firstline}" And renders as: contextblahblah <<<<<<< local: c7fdd7ce4652 - durham: "Fix broken stuff in my feature branch" line from my changes ======= line from the other changes >>>>>>> other: a3e55d7f4d38 master - sid0: "This is a commit to master th... morecontextblahblah

run-tests: remove options from Test.__init__ All options are now passed as arguments and we no longer need options. This enables us to instantiate Test from "plain old data" types. Since options must be given as arguments, it also makes people think harder about adding things that may not belong in Test. This will help ensure a proper separation of responsibility going forward.

run-tests: move shell to Test.__init__

run-tests: move py3kwarnings to Test.__init__

run-tests: move extra config options to Test.__init__

run-tests: refactor port number declaration Instead of making port numbers derived from count and a global initial port, we now pass a start port to Test.__init__ and do the calculation at a higher level.

run-tests: move timeout into Test.__init__

run-tests: move interactive to Test.__init__