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.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 17:10:49 -0700] rev 21491
run-tests: replace Test.ignore() with raise IgnoreTest
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 17:09:52 -0700] rev 21490
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.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 17:06:57 -0700] rev 21489
run-tests: remove some legacy code around result handling
unittest handles all results now. We no longer need to manually keep
track of results.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 17:04:42 -0700] rev 21488
run-tests: merge MercurialTest into Test
Now that we execute all tests via unittest, the MercurialTest wrapper is
not necessary. This patches moves the logic from MercurialTest into Test
and makes Test a child of unittest.TestCase.
Steven Brown <StevenGBrown@gmail.com> [Sat, 17 May 2014 17:11:06 +0800] rev 21487
check-code: check for consistent usage of the websub filter in hgweb templates
The check-code tool now expects the "desc" keyword to be followed by the
"websub" filter, with the following exceptions:
a) It has no filters at all, e.g. a changeset description in the raw style
templates or the repository description in the summary page.
b) It is followed by the "firstline" filter, e.g. the first line of the
changeset description is displayed as a summary or title.
Steven Brown <StevenGBrown@gmail.com> [Sat, 17 May 2014 17:10:23 +0800] rev 21486
hgweb: apply websub filter to the changeset description in rss and atom feeds
For example, this is useful for linking from the feed reader to a bug tracker.
This follows the existing pattern used within the hgweb templates. With the
exception of the raw style, all usages of the changeset "desc" keyword are now
followed by either the "firstline" filter or the "websub" filter. When "websub"
is used, it always follows the "escape" filter.
Steven Brown <StevenGBrown@gmail.com> [Sat, 17 May 2014 17:09:46 +0800] rev 21485
tests: write the hgrc file for test-hgweb-commands.t with cat instead of echo
To improve the readability.
Steven Brown <StevenGBrown@gmail.com> [Sat, 17 May 2014 17:09:10 +0800] rev 21484
tests: tests for the rss feeds
This matches the existing tests for the atom feeds.
Sean Farley <sean.michael.farley@gmail.com> [Wed, 23 Apr 2014 15:54:26 -0500] rev 21483
localrepo: use _matchstatus of context objects
Now that we have the machinery in place, we call the context method for
changing the match object in the case of comparing the working directory with
its parent.
This removes the last of the hard-coded workingctx knowledge in localrepo
paving the way for us to remove localrepo.status completely.
Sean Farley <sean.michael.farley@gmail.com> [Thu, 24 Apr 2014 08:32:28 -0500] rev 21482
workingctx: override _matchstatus for parentworking case
This patch encapsulate the logic for changing the match.bad function when
comparing against the working directory's parent. Future patches will remove
more of the 'if ... else' blocks in localrepo.status that test for this working
directory parent case.
Sean Farley <sean.michael.farley@gmail.com> [Wed, 23 Apr 2014 15:39:30 -0500] rev 21481
basectx: add _matchstatus method for factoring out last of parentworking logic
This patch paves the way to allow a workingctx to override the match object
with a custom 'bad' method for cases where status is sent a directory pattern.
Sean Farley <sean.michael.farley@gmail.com> [Thu, 24 Apr 2014 08:34:44 -0500] rev 21480
workingctx: use inheritance for _buildstatus while keeping the fastpath
This patch maintains the fast path for workingctx which is to not build a
manifest if the working directory is being compared to its parent since, in
this case, we can just copy the parent manifest.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 22 Apr 2014 19:06:37 -0500] rev 21479
localrepo: remove unneeded unpacking of r
This unpacking is unneeded now because previous patches have removed the need
for this method to modify each of these variables in favor of passing the whole
set around to pre/post hook methods of the corresponding context object.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 22 Apr 2014 13:02:38 -0500] rev 21478
localrepo: call _poststatus hook instead of hardcoding symlink knowledge
Sean Farley <sean.michael.farley@gmail.com> [Tue, 22 Apr 2014 12:59:22 -0500] rev 21477
workingctx: add _poststatus method to call _filtersuspectsymlink
With this patch, we are one step closer to removing 'if ... else' logic in
localrepo.status for testing if the context is the working directory or
not. Future patches will replace those blocks of code with a call to the
context's _poststatus hook so that each context object will do the right thing
depending on the situation.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 22 Apr 2014 12:51:58 -0500] rev 21476
context: add a no-op _poststatus method
This patch adds a private _poststatus method so that certain contexts, such as
workingctx, can add custom post-processing to status.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 22 Apr 2014 12:43:20 -0500] rev 21475
localrepo: call _prestatus hook instead of hardcoding dirstate knowledge
Sean Farley <sean.michael.farley@gmail.com> [Mon, 21 Apr 2014 22:12:59 -0500] rev 21474
workingctx: add _prestatus method to call _dirstatestatus
With this patch, we are one step closer to removing 'if ... else' logic in
localrepo.status for testing if the context is the working directory or
not. Future patches will replace those blocks of code with a call to the
context's _prestatus hook so that each context object will do the right thing
depending on the situation.
Sean Farley <sean.michael.farley@gmail.com> [Mon, 21 Apr 2014 21:39:10 -0500] rev 21473
context: add a no-op _prestatus method
This patch adds a private _prestatus method so that certain contexts, such as
workingctx, can add custom pre-processing to status.
Sean Farley <sean.michael.farley@gmail.com> [Mon, 21 Apr 2014 21:36:14 -0500] rev 21472
localrepo: use _buildstatus from context
Sean Farley <sean.michael.farley@gmail.com> [Mon, 21 Apr 2014 21:35:36 -0500] rev 21471
context: add _buildstatus method
This method is a copy of localstatus.status's core logic. Later patches will
clean up some of the dense coditionals in the for loop.
Sean Farley <sean.michael.farley@gmail.com> [Mon, 21 Apr 2014 20:42:42 -0500] rev 21470
localrepo: remove workingctx logic already moved to context
Sean Farley <sean.michael.farley@gmail.com> [Mon, 21 Apr 2014 20:23:47 -0500] rev 21469
localrepo: move the order of local variables
This movement is a small step in getting rid of the 'if ... else' logic for
testing the current working directory with its parent. Previously, the deleted,
unknown, and ignored variables were set in a combination of before an 'if
... else' block and within the block. This moves the variables to be set
outside the loop in one common place.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 15 Apr 2014 15:43:30 -0500] rev 21468
localrepo: factor out _manifestmatch logic for workingctx
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Mar 2014 18:38:44 -0500] rev 21467
localrepo: use _manifestmatches instead of duplicating logic
Sean Farley <sean.michael.farley@gmail.com> [Wed, 23 Apr 2014 20:52:10 -0500] rev 21466
basectx: add _manifestmatches method
This method is a duplicate of localrepo.mfmatches and sets the stage for
factoring localrepo.status into a context method that will be customizable
based on inheritance and object type.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Mar 2014 18:35:39 -0500] rev 21465
localrepo: always set the variable r in status method
This is a small patch to help streamline keeping tracking of the list of files
for status in a variable already called 'r' ('s' is for subrepos in this
method). We now move the setting of it out of an 'if' block so that we can
later refactor more code into the context objects.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 16:44:45 -0700] rev 21464
run-tests: execute tests via unittest
Now that unittest mode is functionally equivalent to the default mode,
we switch the default execution mode to unittest and remove the choice
of different execution modes.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 22 Apr 2014 13:37:27 -0700] rev 21463
run-tests: implement Test.__str__
unittest sometimes does a str(test) and the default implementation
doesn't do the right thing. So we override it.
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 21 Apr 2014 12:15:55 -0700] rev 21462
run-tests: make failure reporting in unittest mode equivalent to default
Unlike unittest's defaults, our result formatter does not print stack
traces. Here, we change TestResult.addFailure() to be compatible with
the existing/default execution mode.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 16:54:51 -0700] rev 21461
run-tests: ignore failures from rmtree
rmtree() may fail under certain conditions. We ignore failures at the
individual test level because they can interfere with test execution.
Furthermore, we'll reattempt deletion in the high-level test runner
after all tests have finished.
Note that this patch is not a code refactor like most of the patches
before it. This change logically makes sense given the execution
behavior of the tests.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 16:53:49 -0700] rev 21460
run-tests: abort tests after first failure in unittest mode
There is an execution mode on run-tests.py that stops after the first
failure. unittest mode was previously not obeying this option. This
patch fixes that.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 16:39:05 -0700] rev 21459
run-tests: print compatible output from TextTestRunner
Our unittest TextTestRunner now prints output similar to the output
from the default execution mode - the output people expect from
run-tests.py.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 16:17:18 -0700] rev 21458
run-tests: don't print results in unittest mode
A subsequent patch will have unittest print tests for us. Don't perform
old-style printing when in unittest mode.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 15:53:25 -0700] rev 21457
run-tests: move errpath deletion to setUp()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 15:46:34 -0700] rev 21456
run-tests: kill daemons during tearDown()
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 21 Apr 2014 09:30:11 -0700] rev 21455
run-tests: move err file writing to tearDown()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 15:40:22 -0700] rev 21454
run-tests: refactor testtmp
testtmp is now a member variable of our test class. It's value is
computed during instance creation and the directory is managed via the
lifetime of the test object.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 15:19:21 -0700] rev 21453
run-tests: store skipped state on Test
As code is being moved between functions, we need a member variable to
hold skipped state.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 15:16:29 -0700] rev 21452
run-tests: move some functionality to Test.tearDown()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 15:08:05 -0700] rev 21451
run-tests: store last result in Test._result
Subsequent patches move post-test actions into tearDown(). This requires
tearDown() to have access to the last result.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 15:00:13 -0700] rev 21450
run-tests: report test duration in Test.tearDown()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 14:58:36 -0700] rev 21449
run-tests: store test return code and output in Test instance
A subsequent patch that will introduce tearDown() requires test
execution state be stored in the instance.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 14:55:33 -0700] rev 21448
run-tests: keep track of test start and stop in MercurialTest.run()
This brings run() more compatible with unittest.TestCase.run()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 14:52:57 -0700] rev 21447
run-tests: keep track of test execution state in Test
This patch starts a mini series of moving functionality into the
newly-established setUp() and tearDown() methods.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 14:41:11 -0700] rev 21446
run-tests: support setUp() and tearDown() in TestCase wrapper
unittest.TestCase.run() calls setUp() and tearDown() during run(). We
emulate that implementation.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 14:34:03 -0700] rev 21445
run-tests: fail tests by raising an exception
When in unittest mode, Test.run() will now raise for all non-success
cases. This makes it behave like TestCase.run().
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 14:32:03 -0700] rev 21444
run-tests: record warnings by raising WarnTest
We continue the conversion of recording test results by raising
exceptions.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 14:28:29 -0700] rev 21443
run-tests: record ignored tests by raising IgnoreTest
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 14:23:50 -0700] rev 21442
run-tests: record skips by raising SkipTest
The unittest way of recording a skipped test is to raise an exception
(at least with modern unittest implementation). We change Test to raise
a SkipTest when operating in unittest mode.
This does prevent some "tear down" activities from running in unittest
mode. This will be fixed in subsequent patches. Since unittest mode
is experimental, this should be OK.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 14:19:59 -0700] rev 21441
run-tests: implement TestCase.run()
Simply wrapping TestCase.run() is not sufficient for robust results
reporting because unittest in Python 2.4 does not know about things
like skipped tests and reports them as success or failures instead of
skips.
We will reimplement TestCase.run() with knowledge and semantics present
in modern Python releases.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 14:04:37 -0700] rev 21440
run-tests: don't print progress from Test when in unittest mode
unittest does its own printing of progress indicators as part of
TestResult. So, there is no need to print them when running in unittest
mode.
This will fix the double output of progress indicators that had been
occurring in unittest mode.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 13:04:19 -0700] rev 21439
run-tests: define a custom TestSuite that uses _executetests()
We now have a custom unittest.TestSuite implementation that uses
_executetests() and thus knows how to execute tests concurrently.
Running tests in --unittest mode will use this TestSuite.
Since the TestSuite handles concurrency, the warnings around --jobs and
--loop have been removed.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 13:00:40 -0700] rev 21438
run-tests: pass an optional TestResult into _executetests()
If the result is passed, we execute tests in the unittest way. A
subsequent patch will actually do this.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 12:49:43 -0700] rev 21437
run-tests: pass Test instances into TestRunner._executetests()
Test instances (not paths) are passed into _executetests(). This means
the logic for instantiating Test instances has been moved outside of
_executetests(). This was done because an upcoming patch will reuse the
logic in _executetests().
As part of this change, test counts are no longer managed by
_executetests().
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 17 May 2014 12:35:44 -0700] rev 21436
run-tests: define cleanup() on unittest class
We need a cleanup() on our unittest TestCase class to conform with the
execution API. This will eventually be replaced by tearDown().
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 12:45:44 -0700] rev 21435
run-tests: rename Test._test to Test.name
A lot of the attributes in Test could probably be renamed. This one is
needed for an upcoming patch.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 12:19:48 -0700] rev 21434
run-tests: teach Test instances whether they are in unittest mode
Tests executing in unittest mode behave a little differently. For
example, they report their results to a TestResult rather than just
printing. This patch paves the way for better integration of Test into
the unittest framework.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 11:55:02 -0700] rev 21433
run-tests: teach unittest about warned results
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 11:52:41 -0700] rev 21432
run-tests: document how success code is handled
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 11:51:11 -0700] rev 21431
run-tests: teach unittest about ignored tests
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 11:48:19 -0700] rev 21430
run-tests: teach unittest about skipped tests
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 11:47:40 -0700] rev 21429
run-tests: define custom result and runner classes for unittest
We need to teach unittest about some custom result types. This will
require some custom classes. This patch creates a skeleton for them.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 11:29:39 -0700] rev 21428
run-tests: start to report test results against TestResult
Previously, our unittest wrapper didn't report results properly. We now
properly report failures.
We had to rename the local variable to prevent "t" from being
overwritten in the local scope.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 11:24:37 -0700] rev 21427
run-tests: give unittest wrapper a short description
This will make the output contain something useful rather than the
default repr() for the class.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 11:22:08 -0700] rev 21426
run-tests: initial support for running tests with unittest
The unittest package in Python's standard library provides an almost
universal mechanism for defining and running tests. This patch starts
the process of making run-tests.py talk to it.
The main benefit of speaking unittest is that this will enable
Mercurial's tests to be more easily consumed by other testing tools,
like nose. This is useful for 3rd party extensions having their own
test infrastructure, for example.
Running tests in unittest mode will not result in completely sane
behavior until the unittest mode is made the default execution mode.
Expect things like double printing of output until support stabilizes.
Sean Farley <sean.michael.farley@gmail.com> [Wed, 16 Apr 2014 16:34:48 -0500] rev 21425
localrepo: reverse contexts in status
This is a slight tweak to how localrepo.status calculates what files have
changed. By forcing a changectx to be first operator and anything not a
changectx to be the second operator, we can later exploit this to allow
refactoring the status operation as a method of a context object.
Furthermore, this change will speed up 'hg diff --reverse' when used with the
working directory because the code will now hit a fast path without needing to
calculate an unneeded second manifest.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 16 May 2014 13:18:57 -0700] rev 21424
test: split test-largefile.t in multiple file
The `test-largefiles.t` unified test is significantly longer (about 30%) than
any other tests in the mercurial test suite. As a result, its is alway the last
test my test runner is waiting for at the end of a run.
In practice, this means that `test-largefile.t` is wasting half a minute of my
life every times I'm running the mercurial test suites. This probably mean more
a few cumulated day by now.
I've finally decided to split it up in multiple smaller tests to bring it back in
reasonable length.
This changeset extracts independent test cases in two files. One dedicated to
wire protocole testing, and another one dedicated to all other tests that could
be independently extracted.
No test case were haltered in the making of this changeset.
Various timing available below. All timing have been done on a with 90 jobs on a
64 cores machine. Similar result are shown on firefly (20 jobs on 12 core).
General timing of the whole run
--------------------------------
We see a 25% real time improvement for no significant cpu time impact.
Before split:
real 2m1.149s
user 58m4.662s
sys 11m28.563s
After split:
real 1m31.977s
user 57m45.993s
sys 11m33.634s
Last test to finish (using run-test.py --time)
----------------------------------------------
test-largefile.t is now finishing at the same time than other slow tests.
Before split:
Time Test
119.280 test-largefiles.t
93.995 test-mq.t
89.897 test-subrepo.t
86.920 test-glog.t
85.508 test-rename-merge2.t
83.594 test-revset.t
79.824 test-keyword.t
78.077 test-mq-header-date.t
After split:
Time Test
90.414 test-mq.t
88.594 test-largefiles.t
85.363 test-subrepo.t
81.059 test-glog.t
78.927 test-rename-merge2.t
78.021 test-revset.t
77.777 test-command-template.t
Timing of largefile test themself
-----------------------------------
Running only tests prefixed with "test-largefiles".
No significant change in cumulated time.
Before:
Time Test
58.673 test-largefiles.t
2.931 test-largefiles-cache.t
0.583 test-largefiles-small-disk.t
After:
Time Test
31.754 test-largefiles.t
17.460 test-largefiles-misc.t
8.888 test-largefiles-wireproto.t
2.864 test-largefiles-cache.t
0.580 test-largefiles-small-disk.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21423
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold)
This patch also replaces "editor = False" by "editor =
cmdutil.getcommiteditor()", because:
- it allows to hook commit message determination easily, even in the
case without "--edit"
- it avoids regression (or additional care) around saving
"last-message.txt", even if MQ's "newcommit()" changes its
implementation logic from "localrepository.commit" to
"localrepository.commitctx" with "memctx" in the future
to save commit message into "last-messge.txt" with "memctx",
"editor" should be valid function.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21422
mq: fold the code paths to invoke editor into specific logic (qrefresh/qfold)
This factoring simplifies the succeeding patch to switch from
"ui.edit()" to "getcommiteditor()" for qrefresh/qfold.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21421
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
This patch also replaces "editor = False" by "editor =
cmdutil.getcommiteditor()", because:
- the latter allows to hook commit message determination easily,
even in the case without "--edit"
- the latter can avoid regression (or additional care) around saving
"last-message.txt", even if MQ's "newcommit()" changes its
implementation logic from "localrepository.commit" to
"localrepository.commitctx" with "memctx" in the future
to save commit message into "last-messge.txt" with "memctx",
"editor" should be valid function.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21420
mq: fold the code path to invoke editor into specific logic (qnew)
This factoring simplifies the succeeding patch to switch from
"ui.edit()" to "getcommiteditor()" for qnew.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21419
cmdutil: enhance "getcommiteditor()" for specific usages in MQ
This patch introduces "finishdesc" and "extramsg" arguments into
"getcommiteditor()" for specific usages in MQ.
"finishdesc" will be used to treat the commit message as "[mq];
patch-file-name" (default MQ commit message), if it is left as empty,
instead of aborting commit process.
"extramsg" will be used to show the line below:
HG: Leave message empty to use default message
instead of:
HG: Leave message empty to abort commit
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21418
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
This patch also enhances "test-tag.t", because "hg tag" hasn't been
explicitly tested around editor invocation and "--edit" option.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21417
import: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-import-bypass.t" and "test-import.t",
because "hg import" hasn't been explicitly tested around editor
invocation and "--edit" option.
This patch explicitly tests below:
- with "--bypass" (regardless of "--edit"):
- not invoked, if the patch contains the commit message
- not invoked, if the commit message is explicitly specified
- invoked, otherwise (just adding comment)
- without "--bypass":
- with "--edit":
- not invoked, if "--no-commit" is not specified
- invoked, otherwise
- without "--edit":
- not invoked, if the patch contains the commit message
- not invoked, if "--message" or "--logfile" is specified
(just adding comment)
- invoked, otherwise
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21416
graft: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-graft.t", because "hg graft" hasn't
been explicitly tested around editor invocation and "--edit" option.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21415
amend: use "getcommiteditor()" instead of explicit editor choice
This patch doesn't change any tests like as preceding patches, because
editor invocation is already tested in "test-commit-amend.t".
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21414
commit: use "getcommiteditor()" instead of explicit editor choice
This patch also eliminates "forceeditor" no more referred.
This patch doesn't change any tests like as preceding patches, because
editor invocation is already tested well.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21413
backout: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-backout.t", because "hg backout" hasn't
been explicitly tested around editor invocation and '--edit' option.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21412
backout: avoid redundant message examination
Before this patch, "hg backout" examines "--message" and "--logfile"
options explicitly.
But this examination is redundant, because "commitfunc()" can receive
the result of same examination by "cmdutil.logmessage()" in
"cmdutil.commit()" through "message" argument.
This patch avoids redundant message examination by "message"
examination in "commitfunc()".
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21411
transplant: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-transplant.t", because "hg transplant"
hasn't been explicitly tested around editor invocation and "--edit"
option.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21410
rebase: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-rebase-scenario-global.t", because "hg
rebase" hasn't been explicitly tested around editor invocation and
"--edit" option.
In the other hand, this patch doesn't enhance tests in "hg rebase
--collapse" case, because it is already tested in
"test-rebase-collapse.t".
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21409
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
This omits (redundant) adding "\n' to "message", because:
- empty line is inserted by "commitforceeditor", if editor is invoked
- tail white-spaces are stripped at storing into chaneglog, otherwise
This patch also enhances "test-histedit-edit.t", because "hg histedit"
hasn't been explicitly tested around editor invocation and
"--continue" option.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21408
histedit: use "getcommiteditor()" instead of explicit editor choice for "fold"
This patch doesn't change any tests like as preceding patches, because
editor invocation is already tested in "test-histedit-fold.t".
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21407
histedit: use the editor gotten by "getcommiteditor()" for "message"
Before this patch, "hg histedit" for "message" uses "ui.edit()" for
commit message editing.
It shows original commit message, but not detail about the target
revision: status of each modified/added/removed files, for example.
This patch uses the editor gotten by "getcommiteditor()" instead of
"ui.edit()" for "message"
In "test-histedit-edit.t", this patch omits "fixbundle" invocation,
because it prevents from confirming the "HG: added f" line in commit
message by filtering " added " lines.
Omiting "fixbundle" invocation causes that the exit code of "hg
histedit" appears as one of command line: in this case, "hg histedit"
is aborted by (expected) exception raising.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21406
fetch: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-fetch.t", because "hg fetch" hasn't
been explicitly tested around editor invocation and '--edit' option.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21405
cmdutil: introduce "getcommiteditor()" to simplify code paths to choose editor
"getcommiteditor()" can simplify code paths to choose commit editor
according to '--edit' option as below:
before:
editor = cmdutil.commiteditor # or editor = None/False
if opts.get('edit'):
editor = cmdutil.commitforceeditor
after:
editor = cmdutil.getcommiteditor(**opts)
"getcommiteditor()" accepts option arguments not in "opts" style but
in "**opts" style, because some code paths want to invoke it with just
explicit "edit=True" argument (building dictionary is redundant).
Siddharth Agarwal <sid0@fb.com> [Wed, 14 May 2014 12:49:55 -0700] rev 21404
update: when deactivating a bookmark, print a message
This helps prevent user confusion when innocent-seeming commands like
'hg update -C .' are run.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 02 Aug 2012 13:51:34 +0200] rev 21403
doc: improves merge-tools example with an overwrite of existing config
We highlight the fact that a user hgrc can overwrite the system wide
preconfiguration. As other benefit we show priority value other than 1 and shows
vimdiff configuration is usually directly available. This is valuable as vimdiff
is (surprisingly) a common request from user.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 12 May 2014 17:40:58 -0700] rev 21402
help: add additional information in the merge-tools section of config help
The merge tool configuration in general has always been a confusing topic for
user. We add mention of:
- possible pre-existing configuration,
- way to look at it,
- the more detailed help topic about how merge-tools configuration works.
This should help users find they way.
Angel Ezquerra <angel.ezquerra@gmail.com> [Wed, 07 May 2014 00:13:22 +0200] rev 21401
subrepo: use subrepo shortid method to generate subrepo diverged promptchoice
We were always using only the first 12 characters of the subrepo revision id
when generating the "subrepo diverged" promptchoice. This is not necessarily
correct for non mercurial subrepos.
Angel Ezquerra <angel.ezquerra@gmail.com> [Wed, 07 May 2014 00:08:20 +0200] rev 21400
subrepo: add shortid() method to subrepo classes
This method takes an "id" (e.g. a revision id) and returns a "short" version
(e.g. a short revision id).
This will be used on the next revision to fix a small bug in the way that the
text on the promptchoice shown when a subrepo diverges is generated.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Mar 2014 18:32:16 -0500] rev 21399
localrepo: call _dirstatestatus instead of duplicating logic
Sean Farley <sean.michael.farley@gmail.com> [Tue, 22 Apr 2014 13:20:30 -0500] rev 21398
workingctx: call _dirstatestatus in status
Rip out the call from workingctx.status to localrepo.status.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 22 Apr 2014 13:14:51 -0500] rev 21397
context: add private _dirstatestatus method
This patch is a step forward in getting rid of needing to check 'parentworking'
throughout the status method. Eventually, we will use the power of inheritance
to do the correct thing when comparing the working directory with its parent.
This method is mostly a copy from localrepo.status. The custom status method of
workingctx will eventually be absorbed by the refactoring of localrepo.status
to context.status but unfortunately we can't do it in one step.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Mar 2014 18:28:09 -0500] rev 21396
committablectx: move status to workingctx
This method was accidentally placed into the committablectx class. It contains
logic for querying the dirstate so we move it to the correct class.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Mar 2014 18:10:00 -0500] rev 21395
localrepo: factor out parentworking logic for comparing files
We will temporarily call a private method of the context class while we are in
the process of removing the need of having localrepo.status.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Mar 2014 17:44:09 -0500] rev 21394
localrepo: improve dirstate.normal lookup by cacheing the function
Sean Farley <sean.michael.farley@gmail.com> [Fri, 07 Mar 2014 13:32:37 -0800] rev 21393
localrepo: move symlink logic to workingctx
Mads Kiilerich <madski@unity3d.com> [Fri, 09 May 2014 12:01:56 +0200] rev 21392
merge: separate worker functions for batch remove and batch get
The old code had one function that could do 2 different things. First,
is was called a bunch of times to do one thing. Next, it was called a
bunch of times to do the other thing. That gave unnecessary complexity
and a dispatch overhead. Having separate functions is "obviously" better
than having a function that can do two things, depending on its parameters.
It also prepares the code for the next refactorings.