Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 13:32:05 -0700] rev 21523
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.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 13:25:17 -0700] rev 21522
run-tests: raise WarnTest outside of Test.fail()
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 13:16:34 -0700] rev 21521
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__.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 12:35:18 -0700] rev 21520
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.
Durham Goode <durham@fb.com> [Thu, 08 May 2014 16:50:22 -0700] rev 21519
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
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 12:20:10 -0700] rev 21518
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.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 12:17:23 -0700] rev 21517
run-tests: move shell to Test.__init__
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 12:15:55 -0700] rev 21516
run-tests: move py3kwarnings to Test.__init__
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 12:13:40 -0700] rev 21515
run-tests: move extra config options to Test.__init__
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 12:10:25 -0700] rev 21514
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.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 12:04:15 -0700] rev 21513
run-tests: move timeout into Test.__init__
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 12:01:31 -0700] rev 21512
run-tests: move interactive to Test.__init__
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 11:58:32 -0700] rev 21511
run-tests: move diff options into arguments of Test.__init__
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 11:44:34 -0700] rev 21510
run-tests: move debug into an argument to Test.__init__
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 11:41:10 -0700] rev 21509
run-tests: factor options.keep_tmpdir into an argument to Test.__init__
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 12:29:33 -0700] rev 21508
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.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 11:38:14 -0700] rev 21507
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.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 10:13:41 -0700] rev 21506
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.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 10:12:19 -0700] rev 21505
run-tests: pass abort into Test.__init__
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 10:05:32 -0700] rev 21504
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.
Stephen Lee <sphen.lee@gmail.com> [Thu, 07 Mar 2013 14:17:56 +1100] rev 21503
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.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 10:01:22 -0700] rev 21502
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.
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 21 Apr 2014 16:43:36 -0700] rev 21501
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.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 18:23:48 -0700] rev 21500
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.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 18:20:24 -0700] rev 21499
run-tests: factor options out of run()
We were only utilizing 2 parts of options. These have been converted to
named arguments.
Mads Kiilerich <madski@unity3d.com> [Fri, 16 May 2014 02:30:27 +0200] rev 21498
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.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 18:15:38 -0700] rev 21497
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()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 17:42:31 -0700] rev 21496
run-tests: move _executetests into TestSuite
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 17:39:26 -0700] rev 21495
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).
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 17:28:24 -0700] rev 21494
run-tests: move outputtimes() into unittest runner class
The unittest runner now does all the printing. Move outputtimes() there.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 17:21:24 -0700] rev 21493
run-tests: refactor how times are recorded
We now record times in Test.run(), which is a more appropriate place for
it.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 17:13:10 -0700] rev 21492
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.