Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 29 May 2014 15:23:25 -0700] rev 21659
pushkey: add a ``decode`` function
This function is just a shorthand for ``decoding.fromlocal``. It will help
hiding the encoding business from other code exchanging pushkey data over the
wire.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 15:44:46 -0700] rev 21658
pull: when remote supports it, pull phase data alongside changesets
We use bundle2 to retrieve the remote phase data at the same time as
changesets. This reduces the amount of requestis and should improve consistency
as the server can ensure nothing changed between the retrieval of those parts.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 15:43:09 -0700] rev 21657
getbundle: support of listkeys argument when bundle2 is used
A new ``listkeys`` is supported by getbundle. It is a list of namespaces whose
content should be included in the bundle.
An appropriate entry has been added to the wireproto map of getbundle arguments
and a new bundle2 capability is advertised.
There are still no codes that request such parts in core mercurial.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 29 May 2014 14:59:22 -0700] rev 21656
getbundle: raise error if extra arguments are provided for bundle10
New arguments are most likely to be supported by bundle20 (and above) only.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 15:42:03 -0700] rev 21655
bundle: introduce a listkey handler
This makes it possible to handle listkeys-related data stored in a bundle2.
There are no producers yet.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 15:29:08 -0700] rev 21654
pull: split remote phases retrieval from actual application
We want to be able to retrieve phases information through bundle2. The logic to
apply remote phases will not change.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 15:02:51 -0700] rev 21653
wireproto: use pushkey.decodekey
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 15:00:20 -0700] rev 21652
pushkey: introduce an ``decodekeys`` function
This function provides a standardized way to exchange pushkey content over
the wire.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 15:00:08 -0700] rev 21651
wireproto: use pushkey.encodekey
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 14:57:28 -0700] rev 21650
pushkey: introduce an ``encodekeys`` function
This function provides a standardized way to exchange pushkey content over
the wire.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 13:44:16 -0700] rev 21649
bundle2: add more phase movement in the test
To test phase exchange with bundle2 we need some phase movement to happen.
Appropriate logging is added to track those changes.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 13:40:12 -0700] rev 21648
bundle2: use non-publishing repo in test
If we are going to test usage of bundle for phases exchange, we need some phase movements
to be exchanged.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 27 May 2014 13:30:38 -0700] rev 21647
bundle2: use a smarter template for test
We use a more compact template that includes phase information.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 09:53:52 -0700] rev 21646
getbundle: declare type of parameters
In addition to listing the expected options for ``getbundle``, we also list their
types and handle the encoding/decoding automatically. This should make it easier
for extensions to transmit additional information to getbundle.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 13:31:33 -0700] rev 21645
bundle2: introduce a ``caps20to10`` function
This function factors the creation of appropriate entries to use in
``bundlecaps`` argument of ``getbundle``. This cleans up code calling
``getbundle`` and helps its usage in more part of the code.
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 24 May 2014 16:20:09 -0700] rev 21644
bundle2: introduce a bundle2caps function
The process of decoding remote bundle2caps blob into a dictionary is cumbersome.
We move it into a small helper function. This will clarify code that reads
bundle2 capabilities of peers and helps using it in new places.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 12:58:07 -0700] rev 21643
exchange: reinsert comment in the right place
Unrelated new code was inserted between the original comment and the related
code block.
Matt Mackall <mpm@selenic.com> [Thu, 29 May 2014 16:01:39 -0700] rev 21642
docker: check for docker.io first
Mads Kiilerich <madski@unity3d.com> [Tue, 20 May 2014 04:07:58 +0200] rev 21641
buildrpm: include release version in .tar.gz name
Official releases are fully indentified by the version number, these builds are
not.
Specs are however traditionally not versioned.
Mads Kiilerich <madski@unity3d.com> [Thu, 15 May 2014 01:48:37 +0200] rev 21640
buildrpm: remove prompt for uncommitted changes - it was a bad idea
We want a command that is useful in scripts, not an interactive command.
Mads Kiilerich <madski@unity3d.com> [Thu, 15 May 2014 01:48:37 +0200] rev 21639
buildrpm: collect code for building local hg and using it in one place
Mads Kiilerich <madski@unity3d.com> [Tue, 20 May 2014 03:57:21 +0200] rev 21638
buildrpm: various minor cleanup
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 10 May 2014 14:54:39 -0700] rev 21637
fix_bytes: loosen blacklist matching requirements
On my Linux machine, paths seen by 2to3 include the build directory. We
switch from an exact to substring match to allow 2to3 to work in more
environments.
Mads Kiilerich <madski@unity3d.com> [Mon, 19 May 2014 22:12:31 +0200] rev 21636
convert: only consider shamap revisions converted if they still exists
Rollback or strip could leave a Mercurial repo with a shamap with revisions no
longer in the repository.
To ensure reliable conversions we now check that the commit actually exists and
consider it non-existing if it doesn't exist.
Mads Kiilerich <madski@unity3d.com> [Mon, 19 May 2014 22:12:30 +0200] rev 21635
convert: introduce hascommitfrommap sink method
Mercurial has stable revision identifiers and rollback and strip. Revisions
referenced in the shamap are thus not necessarily still present but we can
easily check for it.
Subversion do not have stable identifiers and no rollback or strip(?). We must
thus assume that all revisions referenced from a shamap still must be present.
This method is similar to hascommitforsplicemap but different ...
Mads Kiilerich <madski@unity3d.com> [Mon, 19 May 2014 22:11:14 +0200] rev 21634
convert: rename sink hascommit to hascommitforsplicemap
The name 'hascommit' sounds like something generic ... but it might
also throw exceptions in specific cases and it is thus (apparently)
only useful for splicemap.
Mads Kiilerich <madski@unity3d.com> [Mon, 19 May 2014 22:10:50 +0200] rev 21633
tests: better tests for two-way convert
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 29 May 2014 12:25:25 -0700] rev 21632
mergetools.hgrc: add minimal configuration for editmerge
The ``editmerge`` script is shipped in contrib and opens an editor on
every conflicting file. It needs minimal configuration to inject the
config marker in the file before opening. Otherwise it behaves the
same as ``internal:local`` and bad things happen.
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.