Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 15 May 2014 23:53:21 -0700] rev 21547
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 May 2014 14:39:19 -0700] rev 21546
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.
Mads Kiilerich <madski@unity3d.com> [Fri, 28 Feb 2014 02:25:58 +0100] rev 21545
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 13:55:08 -0700] rev 21544
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.
Yuya Nishihara <yuya@tcha.org> [Thu, 22 May 2014 22:05:26 +0900] rev 21543
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
Jim Hague <jim.hague@acm.org> [Fri, 23 May 2014 17:29:04 +0100] rev 21542
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.
Siddharth Agarwal <sid0@fb.com> [Fri, 23 May 2014 13:10:31 -0700] rev 21541
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.
Durham Goode <durham@fb.com> [Fri, 23 May 2014 16:25:55 -0700] rev 21540
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.
Mads Kiilerich <madski@unity3d.com> [Sun, 25 May 2014 13:47:42 +0200] rev 21539
run-tests: assign value to ESCAPEMAP - dict.update do not return self
a36cc85a5b7b did more than what the description said and introduced a bug.
Mads Kiilerich <madski@unity3d.com> [Sun, 25 May 2014 13:47:19 +0200] rev 21538
run-tests: fix invalid reference to stringescape after a36cc85a5b7b
Durham Goode <durham@fb.com> [Fri, 09 May 2014 18:09:11 -0700] rev 21537
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.
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 09 May 2014 16:13:14 -0700] rev 21536
run-tests: add docstrings
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 09 May 2014 15:55:58 -0700] rev 21535
run-tests: avoid duplicate code in vlog()
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 25 Apr 2014 15:34:28 -0700] rev 21534
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.
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 25 Apr 2014 15:11:38 -0700] rev 21533
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.
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 25 Apr 2014 15:08:03 -0700] rev 21532
run-tests: move loop to a named argument of TestSuite.__init__
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 25 Apr 2014 15:06:23 -0700] rev 21531
run-tests: make keywords a named argument to TestSuite.__init__
This was the last usage of option in ``TextTestRunner.run``.
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 25 Apr 2014 15:03:06 -0700] rev 21530
run-tests: make retest a named argument of TestSuite.__init__
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.
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.