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__

run-tests: move diff options into arguments of Test.__init__

run-tests: move debug into an argument to Test.__init__

run-tests: factor options.keep_tmpdir into an argument to Test.__init__

run-tests: remove redundant test name filter TestSuite.run() doesn't need to filter tests by name because that already happens elsewhere. Garbage in garbage out applies.

run-tests: move test filtering into TestSuite.run() Upcoming patches will move the execution of tests to separate processes. To facilitate this, it makes sense to move logic out of Test. Furthermore, test filtering is logically the domain of the test runner, not the test itself. This patch interrupts our mini series of factoring options into named arguments because filtering consults many options and it is easier to move this logic out of Test sooner so we don't have to introduce arguments at all.

run-tests: no longer pass a TestRunner into Test.__init__ We no longer access any attributes on TestRunner besides options, so we stop passing a TestRunner to Test.__init__ and now pass the options data structure instead. Subsequent patches will move accessed options attributes into named arguments.

run-tests: pass abort into Test.__init__

run-tests: pass temp dir into Test.__init__ This patch starts a mini series of moving arguments to Test.__init__ from semi-complex data structures (such as the command options) to named arguments. This will allow Test instances to be more easily instantiated from other contexts. This improves the ability to run Mercurial tests in new and different environments.

update: show message when a bookmark is activated by update When updating to a bookmark, mention that the bookmark is now active. This is a reminder that update does not move the current bookmark if an explicit target is given - instead it activates that target.

run-tests: pass a full test path into Test.__init__ Previously, a Test's path came from the base directory of all tests and a filename leaf. There is not a strong reason why an absolute test path can not be specified. This change isn't strictly necessary. But it does enable scenarios such as more easily running tests from multiple, non-sibling directories.

run-tests: factor refpath into Test classes refpath is a side-effect of the test type. We therefore move it to the Test class implementations.

run-tests: don't trap exceptions in Test.runTest() Exceptions are all handled in Test.run(). This code was redundant since the unittest test wrapper class was merged into Test.

run-tests: factor options out of run() We were only utilizing 2 parts of options. These have been converted to named arguments.

convert: mercurial source: convert global tags only - not local tags Mercurial tags can be local (tag -l, stored in .hg/localtags) or global (normal tags, tracked in .hgtags) ... or extensions can add other kind of tags. Convert would take all tags (except "tip"), not just the ones from .hgtags, and put them into .hgtags. Instead, convert only the global tags that come from .hgtags.

run-tests: refactor temporary directories in Test We no longer need cleanup() because setUp() and tearDown() cover it. We move tempdir creation into setUp() and always delete in tearDown()

run-tests: move _executetests into TestSuite

run-tests: capture execution times in TestResult TestResult has facilities for recording when tests start and stop. It makes sense to move execution time recording into TestResult. In addition, output generation is being moved into TestResult, a class that has a concept of an output buffer (and a lock).

run-tests: move outputtimes() into unittest runner class The unittest runner now does all the printing. Move outputtimes() there.

run-tests: refactor how times are recorded We now record times in Test.run(), which is a more appropriate place for it.

run-tests: eliminate Test._result The result of test execution is now reported on a TestResult. We no longer need to store a tuple of the result.

run-tests: replace Test.ignore() with raise IgnoreTest

run-tests: replace Test.skip() with raise SkipTest All the result functions now raise an Exception. We no longer need these functions and we can inline the raise.