Matt Mackall <mpm@selenic.com> [Thu, 29 May 2014 15:41:16 -0700] rev 21631
merge with stable
David Schleimer <dschleimer@fb.com> [Tue, 27 May 2014 21:12:24 -0700] rev 21630
convert: drastically speed up git conversions
We would formerly exec git cat-file once for every commit, plus once for
every tree and file we wnated to read. This switches to using git
cat-file's batch mode, which is much, much, much faster.
Using this new code, converting the git git repo to hg ran in 106
minutes on my machine. Using the stock mercurial, it required 1239
minutes. I believe this to be typical of the speedups we will see
form this patch.
Ali Vakilzade <ali.vakilzade@gmail.com> [Sat, 03 May 2014 19:11:51 +0430] rev 21629
vim: use try catch in vim plugin to avoid conflicts
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 28 May 2014 15:37:47 -0700] rev 21628
bundle2: raise BundleValueError error for stream level unsupported params
This ensures both consistency and smooth propagation over the wire.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 28 May 2014 16:46:58 -0700] rev 21627
bundle2: support None parttype in BundleValueError
This will be used for errors at the stream level.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 12:16:45 -0700] rev 21626
bundle2: ignore advisory part with unknown parameters
Advisory parts are advisory. If a handler exists but does not support the
proper parameters, we can safely ignore it.
Test has been updated to include this case.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 12:01:00 -0700] rev 21625
bundle2: enforce all parameters in a part to be handled
Once we picked a handler, we check that all mandatory parameter keys are
properly supported. If not we raise an exception.
We added a test for this case.
The code now fails for any part with unknown mandatory parameters. We will
ignore such errors for advisory parts in a later changeset.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 28 May 2014 11:40:07 -0700] rev 21624
bundle2: declare supported parameters for all handlers
We now update all existing handlers with the supported parameters information.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 11:49:48 -0700] rev 21623
bundle2: make it possible to declare params handled by a part handler
If we are to enforce the mandatory aspect of parameter, we need a way to
discover what a handler supports. The best option we end up with is this a simple
declaration of known parameters at registration time.
We simply plug the list of parameters on the function object because Python lets
us do that and there is no benefit for a more complicated way.
One of the handlers is updated for example and testing.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 28 May 2014 15:57:23 -0700] rev 21622
bundle2: support transmission of params error over the wire
We picked a null character to split each parameter during the transfer. This is
fragile if the same character is used in parameter name. However other
codes will already behave in a strange way in that case, so we are not
introducing any regression. A better format may be picked for the final
version of the protocol.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 28 May 2014 15:53:34 -0700] rev 21621
bundle2: introduce a ``params`` attribute to BundleValueError
We'll first use it for unsupported mandatory parameters on parts.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 28 May 2014 15:51:19 -0700] rev 21620
bundle2: introduce a parttype attribute to BundleValueError
We will use the Exception for more that just unknown part type.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 10:32:07 -0700] rev 21619
bundle2: rename b2x:error:unknownpart to b2x:error:unsupportedcontent
This is a backward compatibility breakage per se. But bundle2 was explicitly
flagged as experimental, and this is one an error path anyway. So the worse
possible outcome from this change is to still have a crash but with a different
message.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 28 May 2014 15:31:05 -0700] rev 21618
bundle2: move exception classes into the error module
Exceptions should have known their place.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 28 May 2014 14:22:24 -0700] rev 21617
bundle2: rename UnknownPartError to BundleValueError
We are going to raise exceptions for a wider range of cases: unsupported
mandatory stream and part parameters. We rename the exception with a wider
name.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 27 May 2014 17:04:48 -0500] rev 21616
context: explicitly return a tuple
In the refactoring of removing localrepo.status, 2edb8648c500, we accidentally
changed the return type from a tuple to a list. Philosophically, this is
incorrect so we explicitly return a tuple again.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 01:49:12 -0700] rev 21615
wireproto: expose the list of getbundle arguments to extensions
For now, getbundle accepts a fixed number of arguments: ``heads``, ``common``
and ``bundlecaps``. We make this list exposed at the module level to let
extensions add content there. This is important for extensions that wish to use
bundle2 for other contents than changegroup.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 27 May 2014 19:21:12 -0700] rev 21614
run-tests: write .err files earlier
Earlier refactoring of run-tests.py accidentally broke --interactive
and external diff generation by not having .err files written before
they are consulted. This patch fixes that.
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 27 May 2014 19:10:22 -0700] rev 21613
run-tests: exit with non-0 exit code when tests fail or warn
As part of the run-tests.py refactor, run-tests.py accidentally started
exiting with 0 for most test runs. This patch restores the expected
behavior.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 23 May 2014 20:23:54 -0700] rev 21612
bundle2: expose mandatory params in a mandatorykeys attribute
We expose all keys that MUST be processed in ``part.mandatorykeys``. This makes
it much easier to access the information. Enforcement of the mandatory
parameters is coming in later changesets.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 26 May 2014 18:45:43 -0700] rev 21611
bundle2: use the new ``part.params`` dictionary
We use the new ``part.params`` dictionary to access the value of parameters instead of
creating one from the part's attributes.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 23 May 2014 17:26:57 -0700] rev 21610
bundle2: introduce a ``params`` dictionary on unbundled parts
This exposes all parameters the part received into a ``part.params`` dictionary.
This should be much easier to use.
This dictionary itself does not expose the mandatory or advisory aspect of
parameters, but no current users of bundle2 actually enforce any of this logic.
Coming changesets will improve this aspect.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 23 May 2014 17:17:39 -0700] rev 21609
bundle2: make sure unbundled part param are read-only
My old uncle Robert once trusted an API user. We never saw him again.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 28 May 2014 10:04:02 -0700] rev 21608
bundle2: introduce an ``_initparams`` method
The handling of parameters will become much more sophisticated in the coming
changesets. So we extract the logic in a function to not pollute the generic
logic.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 12:52:09 -0700] rev 21607
bundle2: forbid duplicate parameter keys
No rules were specified about parameter key uniqueness. We document that keys
should be unique and document it. This opens the way to a more friendly (read
dictionary like) way to access value of parameters in the code.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 23 May 2014 16:46:30 -0700] rev 21606
bundle2: update part creators to ``addparam`` when relevant
In some cases, the use of ``addparam`` makes code much clearer.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 11:38:40 -0700] rev 21605
bundle2: introduce a ``addparam`` method on part
We make it easier to add new parameters after the part creation. As for the
``data`` attribute we make sure the part generation has not begun yet.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 11:21:26 -0700] rev 21604
bundle2: the ability to set ``data`` attribute of the part is now official
We make it safe to set the data attribute after part creation. It is an allowed
operation as long as the part has not started to be generated.
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 24 May 2014 16:08:05 -0700] rev 21603
bundle2: introduce a ReadOnlyPartError exception
As we will introduce functions to alter already created parts, we need a proper
exception to raise when code tries to alter a part that cannot be altered anymore.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 23 May 2014 16:20:30 -0700] rev 21602
bundle2: warn about error during initialization in ``newpart`` docstring
As we are moving toward being able to alter a part after its creation, we need
to make the implication of the part being already part of the bundle2 clear.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 11:14:02 -0700] rev 21601
bundle2: track life cycle of parts
We introduce a ``_generated`` attribute on parts. Coming changesets will
make it easier to update a part's contents after its creation. We need a way to track
if the part is still open to modification or if it is currently being generated
and should not be touched anymore.
As a bonus, we can now detect and crash if someone manages to write bogus code
to get a part generated twice.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 23 May 2014 15:59:19 -0700] rev 21600
bundle2: update all ``addpart`` callers to ``newpart``
The new method is what we want in all current cases.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 23 May 2014 15:54:18 -0700] rev 21599
bundle2: have ``newpart`` automatically add the part to the bundle
The created part is automatically added to the bundle as this is most certainly
the intent of the user code.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 23 May 2014 15:45:46 -0700] rev 21598
bundle2: add a ``newpart`` method to ``bundle20``
Creating new parts is the most common operation people do when exposed to a
bundler. We create a dedicated method on the bundler object for it. This will
simplify the code and also avoid having to import the ``mercurial.bundle2``
module in multiple places.
One part creators have been updated for testing purpose.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 10:48:37 -0700] rev 21597
bundle2: small doc update on the bundler
The `bundle20` class contains methods to help define the content and methods
to generate the actual stream. We add small doc headers to help distinguish
between the two.
Sean Farley <sean.michael.farley@gmail.com> [Fri, 25 Apr 2014 15:44:55 -0500] rev 21596
localrepo: replace status method with a shim
The path of the righteous man is beset on all sides by the inequities of the
selfish and the tyranny of evil men. Blessed is he, who in the name of charity
and good will, shepherds the weak through the valley of darkness, for he is
truly Mercurial's keeper and the finder of robust methods. And I will strike
down upon thee with great vengeance and furious anger those who would attempt
to poison and destroy Mercurial's codebase. And you will know my name is the
Lord when I lay my vengeance upon thee.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 27 May 2014 15:55:35 -0700] rev 21595
workingctx: have status method call super instead of customized code.
The old code is unneeded now that basectx has the ability to calculate the
status between two context objects.
Now, we use the objected oriented pattern called 'super'.
Sean Farley <sean.michael.farley@gmail.com> [Thu, 24 Apr 2014 18:07:42 -0500] rev 21594
basectx: copy localrepo.status method
Now that all the pieces are in place, we copy the status method from
localrepo. In the next few patches, we will remove the old implementation.
Sean Farley <sean.michael.farley@gmail.com> [Thu, 24 Apr 2014 17:42:53 -0500] rev 21593
committablectx: cache _status in _poststatus
A future patch will remove the old workingctx.status which caches the status of
the working directory, therefore we now cache this status in the poststatus
hook of committablectx.
Sean Farley <sean.michael.farley@gmail.com> [Thu, 24 Apr 2014 17:31:20 -0500] rev 21592
committablectx: simplify caching the status
Previously, workingctx had custom variables for the unknown, ignored, and clean
list of files of status. These then got moved to committablectx and, after the
refactoring of localrepo.status, are no longer needed. We, therefore, simplify
the whole mess.
As a bonus, we are able to remove the need for having 'assert'.
Sean Farley <sean.michael.farley@gmail.com> [Wed, 23 Apr 2014 16:08:20 -0500] rev 21591
localrepo: remove cache code now handled by _prestatus
This patch removes the last of the 'working' variable that was sprinkled
throughout localrepo.status which paves the way for future patches to use the
object oriented design of contexts to handle calculating the status.
Sean Farley <sean.michael.farley@gmail.com> [Wed, 23 Apr 2014 16:06:42 -0500] rev 21590
workingctx: add note about super._prestatus calling manifest
Sean Farley <sean.michael.farley@gmail.com> [Wed, 23 Apr 2014 16:06:23 -0500] rev 21589
basectx: preserve loading the cached manifest in _prestatus
This is just a copy from localrepo.status and is a small step to removing that
method entirely. The prestatus hook is only called for changectx's, thereby
ensuring that the same behavior is guaranteed.
Sean Farley <sean.michael.farley@gmail.com> [Fri, 20 Sep 2013 21:59:34 -0500] rev 21588
localrepo: use new subrev method of context.py
With the machinery in place, we use context.subrev instead of testing for a
workingctx directly. This allows more flexibility for later patches that will
add memctx to the mix.
Sean Farley <sean.michael.farley@gmail.com> [Fri, 20 Sep 2013 22:07:58 -0500] rev 21587
committablectx: add subrev method to return None
This allows a future patch to use object oriented style to remove an if
statement in the status method.
Sean Farley <sean.michael.farley@gmail.com> [Fri, 20 Sep 2013 21:55:42 -0500] rev 21586
basectx: add subrev method to return the rev of a subrepo given a subpath
This will be used in an upcoming patch to simplify the status method by
eliminating an if block.
Matt Mackall <mpm@selenic.com> [Tue, 27 May 2014 17:41:20 -0700] rev 21585
merge with stable
Durham Goode <durham@fb.com> [Wed, 07 May 2014 17:24:19 -0700] rev 21584
bundle2: fix bundle2 pulling all revs on empty pulls
When bundle2 was enabled, if hg pull had no commits to pull, it would print
'no changes found' and then download the entire repository from the server. This
was caused by heads and common being set to None, which gets treated as
heads=cl.heads() and common=[nullid], which means download the entire repo.
Pulling bundles without a changegroup is a valid use case (like if we're just
updating bookmarks), so this modifes the bundle code to allow not adding
changegroups.
This is backport of ab5040cd5749.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 07 May 2014 19:26:15 -0700] rev 21583
exchange: fix bad indentation
Those two lines where double indented for no good reasons.
This is backport of 71931b789424.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 07 May 2014 19:28:17 -0700] rev 21582
exchange: propagate arguments to the _getbundleextrapart function
The arguments was wrongly propagated (again).
This a backport of 0055b5b3eb9c
Durham Goode <durham@fb.com> [Wed, 07 May 2014 17:20:38 -0700] rev 21581
bundle2: fix configuration name mismatch
During pulls bundle2 was checking server.bundle2, but during pushes it was
checking experimental.bundle2. This makes them both experimental.bundle2.
This is a backport of 750c7c14a637
Stephen Lee <sphen.lee@gmail.com> [Sat, 08 Mar 2014 19:02:39 +1100] rev 21580
discovery: if a push would create a new head, mention the bookmark name if any
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 10:38:05 -0700] rev 21579
revert: use p2 as parent when reverting against it
revert was always using p1 as parent. This created some minor misbehavior when
reverting against p2. See test change for an example of that.
This is also a useful cleanup for coming refactoring to revert.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 10:37:25 -0700] rev 21578
revert: explicitly get status against the parent
This makes absolutely no functional changes. The default value for
node1 is already the same as the current value of parent. But to be
able to properly use the second parent in merge context, we have to
start to be a bit more explicit about what we compute the status
against.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 13 May 2014 17:28:19 -0700] rev 21577
revert: group related data in tuple in the dispatch table
The dispatch table used to be:
- action if in target manifest
- action if not in target manifest
- make backup if in target manifest
- make backup if not in target manifest
We turn this into two (action, make backup) tuples.
This helps both readability of the dispatch table and handling of each case.
This also prepares a refactoring where the different actions we performs, whether
"file is in target manifest" or not, are determined before reaching this loop.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 13 May 2014 16:42:31 -0700] rev 21576
revert: group action into a single dictionary
We had 4 different variables to hold the list of the 4 possibles
actions. I'm grouping them in a single dictionary for a few reasons.
First, it makes it clearer they are all related and meant to be the
final actions performed by revert. Second this simplifies the parameter
of the _performrevert function. Finally the two elements in each entry
(list and message) have a different consumers in different functions,
this change will make it easier to split them in a later commit.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 13 May 2014 16:29:42 -0700] rev 21575
revert: add some inline comments
I spend some time understanding how this part of the revert code is
working. I'm adding some comments to help the code readability. I
expect most of them to disappear in a coming refactoring. But the
refactoring should be easier to follow with the comment.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 13 May 2014 16:29:20 -0700] rev 21574
revert: cosmetic align of the dispatch table
This changeset make a minimal cosmetic change to help readability of the value
in this table.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 13 May 2014 17:28:19 -0700] rev 21573
revert: add a test case to reverting "add" during merges
This kind of revert is specifically trickier since the file is
reported as "modified" by status. This case was only tested by some
largefiles test. We introduce proper testing of all aspects of this
case in the revert tests themselves.
Yuya Nishihara <yuya@tcha.org> [Sat, 17 May 2014 15:14:18 +0900] rev 21572
alias: change return code of bad definition to 255
We use 255 for general command error.
It can't raise util.Abort because help module executes badalias command to get
error message.
Matt Mackall <mpm@selenic.com> [Tue, 27 May 2014 15:16:52 -0700] rev 21571
bookmarks: properly align multi-byte characters
Matt Mackall <mpm@selenic.com> [Tue, 27 May 2014 15:13:13 -0700] rev 21570
tests: fix cut and paste error on encoding alignment test
Yuya Nishihara <yuya@tcha.org> [Sat, 17 May 2014 13:06:16 +0900] rev 21569
alias: handle shlex error in command aliases
No command should fail with ValueError just because there is unparseable
alias definition.
It returns 1 like other badalias handlers, but should be changed to 255 in
a later version because we use 255 for general command error.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 08 May 2014 19:03:00 +0900] rev 21568
subrepo: normalize path in the specific way for problematic encodings
Before this patch, "reporelpath()" uses "rstrip(os.sep)" to trim
"os.sep" at the end of "parent.root" path.
But it doesn't work correctly with some problematic encodings on
Windows, because some multi-byte characters in such encodings contain
'\\' (0x5c) as the tail byte of them.
In such cases, "reporelpath()" leaves unexpected '\\' at the beginning
of the path returned to callers.
"lcalrepository.root" seems not to have tail "os.sep", because it is
always normalized by "os.path.realpath()" in "vfs.__init__()", but in
fact it has tail "os.sep", if it is a root (of the drive): path
normalization trims tail "os.sep" off "/foo/bar/", but doesn't trim
one off "/".
So, just avoiding "rstrip(os.sep)" in "reporelpath()" causes
regression around issue3033 fixed by fccd350acf79.
This patch introduces "pathutil.normasprefix" to normalize specified
path in the specific way for problematic encodings without regression
around issue3033.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 08 May 2014 19:03:00 +0900] rev 21567
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
Before this patch, sanitizing ".hg/hgrc" scans directories and files
also in meta data area for non-hg subrepos: under ".svn" for
Subversion subrepo, for example.
This may cause not only performance impact (especially in large scale
subrepos) but also unexpected removing meta data files.
This patch avoids sanitizing ".hg/hgrc" in meta data area for non-hg
subrepos.
This patch stops checking "ignore" target at the first
(case-insensitive) appearance of it, because continuation of scanning
is meaningless in almost all cases.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 08 May 2014 19:03:00 +0900] rev 21566
subrepo: make "_sanitize()" take absolute path to the root of subrepo
Before this patch, "hg update" doesn't sanitize ".hg/hgrc" in non-hg
subrepos correctly, if "hg update" is executed not at the root of the
parent repository.
"_sanitize()" takes relative path to subrepo from the root of the
parent repository, and passes it to "os.walk()". In this case,
"os.walk()" expects CWD to be equal to the root of the parent
repository.
So, "os.walk()" can't find specified path (or may scan unexpected
path), if CWD isn't equal to the root of the parent repository.
Non-hg subrepo under nested hg-subrepos may cause same problem, too:
CWD may be equal to the root of the outer most repository, or so.
This patch makes "_sanitize()" take absolute path to the root of
subrepo to sanitize correctly in such cases.
This patch doesn't normalize the path to hostile files as the one
relative to CWD (or the root of the outer most repository), to fix the
problem in the simple way suitable for "stable".
Normalizing should be done in the future: maybe as a part of the
migration to vfs.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 08 May 2014 19:03:00 +0900] rev 21565
subrepo: invoke "_sanitize()" also after "git merge --ff"
Before this patch, sanitizing ".hg/hgrc" in git subrepo doesn't work,
when the working directory is updated by "git merge --ff".
"_sanitize()" is not invoked after checking target revision out into
the working directory in this case, even though it is invoked
indirectly via "checkout" (or "rawcheckout") in other cases.
This patch invokes "_sanitize()" explicitly also after "git merge
--ff" execution.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 08 May 2014 19:03:00 +0900] rev 21564
subrepo: make "_sanitize()" work
"_sanitize()" was introduced by 224e96078708 on "stable" branch, but
it has done nothing for sanitizing since 224e96078708.
"_sanitize()" assumes "Visitor" design pattern:
"os.walk()" should invoke specified function ("v" in this case)
for each directory elements under specified path
but "os.walk()" assumes "Iterator" design pattern:
callers of it should drive loop to scan each directory elements
under specified path by themselves with the returned generator
object
Because of this mismatching, "_sanitize()" just discards the generator
object returned by "os.walk()" and does nothing for sanitizing.
This patch makes "_sanitize()" work.
This patch also changes the format of warning message to show each
unlinked files, for multiple appearances of "potentially hostile
.hg/hgrc".
Chinmay Joshi <c@chinmayjoshi.com> [Tue, 27 May 2014 23:02:05 +0530] rev 21563
vfs: add lexists() in current api
lexists is added in current API of vfs.
Chinmay Joshi <c@chinmayjoshi.com> [Tue, 27 May 2014 21:56:03 +0530] rev 21562
bundlerepo: update unlink in getremotechanges to use vfs
As per WindowsUTF8 plan, unlink from getremotechanges is updated to use vfs in this change.
Matt Mackall <mpm@selenic.com> [Tue, 27 May 2014 12:09:34 -0700] rev 21561
docker: update package target to packages/
Matt Mackall <mpm@selenic.com> [Tue, 27 May 2014 11:52:39 -0700] rev 21560
packaging: move output directory from build/ to packages/
setuptools owns build/ and dist/ and we want to have our own scheme
Matt Mackall <mpm@selenic.com> [Tue, 27 May 2014 11:39:22 -0700] rev 21559
make: add a basic osx mpkg target
Matt Mackall <mpm@selenic.com> [Tue, 27 May 2014 10:31:59 -0700] rev 21558
setup: make Xcode 5.1 check less specific
Was failing on "5.1\n".
Matt Mackall <mpm@selenic.com> [Mon, 26 May 2014 18:16:23 -0700] rev 21557
merge with stable
Yuya Nishihara <yuya@tcha.org> [Sat, 17 May 2014 14:43:06 +0900] rev 21556
alias: fix loss of non-zero return code in command aliases
This also includes test for shell aliases. It avoid using "false" command
because "man false" does not say "exit with 1" but "exit with a status code
indicating failure."
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 16:27:16 -0700] rev 21555
exchange: drop dead code
This code have been factorised and moved in its own function by 7d0bbb6dd730. We
actually read the result of this other computation in the very line before the
deleted block. I somehow forgot to remove the original code, but it is now
dead. Good bye duplicated computation.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 13:39:55 -0700] rev 21554
exchange: fix indentation level
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 08 May 2014 17:08:17 -0700] rev 21553
import: add --partial flag to create a changeset despite failed hunks
The `hg import` command gains a `--partial` flag. When specified, a commit will
always be created from a patch import. Any hunk that fails to apply will
create .rej file, same as what `hg qimport` would do. This change is mainly
aimed at preserving changeset metadata when applying a patch, something very
important for reviewers.
In case of failure with `--partial`, `hg import` returns 1 and the following
message is displayed:
patch applied partially
(fix the .rej files and run `hg commit --amend`)
When multiple patches are imported, we stop at the first one with failed hunks.
In the future, someone may feel brave enough to tackle a --continue flag to
import.
Mads Kiilerich <madski@unity3d.com> [Mon, 19 May 2014 01:53:34 +0200] rev 21552
update: introduce --tool for controlling the merge tool
Update is a kind of merge and may also need a merge tool and should have the
options described in the merge-tools help.
Mads Kiilerich <madski@unity3d.com> [Fri, 02 May 2014 01:09:14 +0200] rev 21551
merge: fix stupid indentation left over from previous refactorings
Augie Fackler <raf@durin42.com> [Mon, 26 May 2014 12:39:31 -0400] rev 21550
Merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 29 Apr 2014 14:12:32 -0700] rev 21549
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 29 Apr 2014 13:18:22 -0700] rev 21548
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)
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__