Gregory Szorc <gregory.szorc@gmail.com> [Fri, 25 Apr 2014 15:00:54 -0700] rev 21529
run-tests: move whitelist and blacklist to named arguments of TestSuite
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 25 Apr 2014 14:51:53 -0700] rev 21528
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.
Durham Goode <durham@fb.com> [Fri, 16 May 2014 13:15:07 -0700] rev 21527
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.
Durham Goode <durham@fb.com> [Thu, 08 May 2014 16:55:56 -0700] rev 21526
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
Durham Goode <durham@fb.com> [Fri, 09 May 2014 18:15:02 -0700] rev 21525
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.
Durham Goode <durham@fb.com> [Thu, 08 May 2014 16:54:23 -0700] rev 21524
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.
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.