Greg Ward <greg@gerg.ca> [Fri, 06 Jun 2014 17:19:17 -0400] rev 979
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca> [Thu, 05 Jun 2014 22:11:04 -0400] rev 978
docs: add new user guide
This has also been reviewed to death on evolve-testers. There are
still a couple of short sections to write (clearly marked "TODO"), and
one example to add. But (if I may be so bold) this is a gigantic
improvement over the current docs, so it really should get merged.
Incidentally, the figures are all SVG files created with Inkscape.
They're not perfect, but they're pretty nice. Anyone who knows a
better way to create technical diagrams is welcome to contribute.
One wart: there's a test script that accompanies the document and
largely duplicates it, but I haven't unified them. I've been
concentrating on writing the best possible content, not on fiddling
with tools. I suspect that unifying them will be non-trivial, but
definitely worth doing.
Greg Ward <greg@gerg.ca> [Thu, 05 Jun 2014 21:57:34 -0400] rev 977
docs: rewrite index page (including dangling links to future docs)
This has been reviewed to death on the evolve-testers mailing list.
I've made some minor tweaks since the last round of reviews, but the
main content is the same.
Greg Ward <greg@gerg.ca> [Fri, 06 Jun 2014 17:43:45 -0400] rev 976
amend: add -D/--current-date option, just like mq's qrefresh has
Carefully designed so we can easily add -D to other changeset-creating
commands (probably anything that takes -d), and so that we can add
-U/--current-user as well. When that's done, the date and user options
should be very similar to those in MQ.
Greg Ward <greg@gerg.ca> [Thu, 05 Jun 2014 21:27:28 -0400] rev 975
amend: explicitly test -d option
Greg Ward <greg@gerg.ca> [Thu, 05 Jun 2014 21:27:06 -0400] rev 974
amend: in tests, do not rely on defaults -- always use explicit -d
Having a default -d option will make it hard to test
-D/--current-date, which is coming shortly: presence of -d overrides
-D, just like with mq's qrefresh.
Greg Ward <greg@gerg.ca> [Thu, 05 Jun 2014 18:07:39 -0400] rev 973
evolve: fix createmarkers() wrapper to accept an iterable
Docstring in mercurial.obsolete says "<relations> must be an iterable
of ...", and hgsubversion takes it at its word and passes a generator.
Until around Mercurial 3.0, this did not cause any problems, but now
it does: in a repo with both evolve and hgsubversion enabled, pushing
to Subversion when obsolete changesets are present causes a crash:
[...]
File "/home/gward/src/hgsubversion/hgsubversion/wrappers.py", line 346, in push
obsolete.createmarkers(repo, relations)
File "/home/gward/src/hg-stable/mercurial/extensions.py", line 196, in wrap
return wrapper(origfn, *args, **kwargs)
File "/home/gward/src/hg-evolve/hgext/evolve.py", line 332, in _createmarkers
relations[idx] = (prec, sucs, meta)
TypeError: 'generator' object does not support item assignment
Since hgsubersion is playing by the documented rules, evolve must be
the guilty party here.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 16:45:02 -0700] rev 972
merge with 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 16:44:24 -0700] rev 971
Added tag 4.0.0 for changeset 0304fc2bab15
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 15:38:16 -0700] rev 970
pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 15:36:58 -0700] rev 969
pkg: drop pushexperiment from the install list
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 14:31:15 -0700] rev 968
merge stable into default
default is meant to be a superset of stable
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 14:30:23 -0700] rev 967
merge default in to stable
evolve 4.0.0 is coming.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 14:29:24 -0700] rev 966
merge back into stable
The 2,7 is meant to be a subset of stable.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 14:28:31 -0700] rev 965
prepare a branch for compatibility with mercurial 2.7 to 3.0(.0)
Evolve 4.0.0 is coming
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 02 Jun 2014 15:22:23 -0700] rev 964
test: update to output change introduced by future 3.1
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 21 May 2014 12:01:28 -0700] rev 963
simple4server: backport the bundle2 exchange
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 22:36:47 -0700] rev 962
evolve: install progress support for the bundle2 pull path
The custom wireprotocol command had a trick to display progress while pulling.
We reinstall such logic for the new path using bundle2.
Its notable that we are using the bundle2 advisory parameter for this purpose.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 17:21:36 -0700] rev 961
evolve: install progress support for the bundle2 push path
The custom wireprotocol command had a trick to display progress while pushing.
We reinstall such logic for the new path using bundle2.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 14:39:13 -0700] rev 960
evolve: add a pull path using bundle2
Instead of using a dedicated wireprotocol commands, we use bundle2 to transmit
an obs marker parts. This aims at both testing bundle2 more and to limit the
amount of special code we needs to put in simple for server to fit our needs.
The massive test changes comes from the fact we can use this fast path for both
remote and local push.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 02:13:02 -0700] rev 959
evolve: advertise obsmarker creation in the transation hook
This will let extensions hooks on marker exchange.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 15:01:33 -0700] rev 958
evolve: add bytes and new marker data when processing part
This will helps use to keep printing useful message when pulling through
bundle2.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 13:41:27 -0700] rev 957
evolve: add a push pass using bundle2
Instead of using a dedicated wireprotocol commands, we use bundle2 to transmit
an obs marker parts. This aims at both testing bundle2 more and to limit the
amount of special code we needs to put in simple for server to fit our needs.
The massive test changes comes from the fact we can use this fast path for both
remote and local push.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 02 Jun 2014 14:44:13 -0700] rev 956
evolve: make exchange output compact in the old pushkey case too.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 01:37:08 -0700] rev 955
evolve: compatibility with memfilectx change
The future 3.1 have have more sophisticated memfilectx object. We add a
compatibility layer for them.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 01:22:31 -0700] rev 954
evolve: abstract access to context.memfilectx
This class is getting altered in the future Mercurial 3.1.0. This changeset
prepare a compatibility layer.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 02 Jun 2014 14:18:29 -0700] rev 953
import: drop version check for ``import --obsolete``
This code base does not support anything below mercurial-3.0 anyway.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 01:16:39 -0700] rev 952
evolve: bump requirement to 3.0.1
Use of bundle2 for pulling will require this version or above.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 02 Jun 2014 14:58:45 -0700] rev 951
test: fix test-import condition
The help text is ``"only(`` not `` only(``
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 31 May 2014 00:23:25 -0700] rev 950
merge with stable
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 29 Apr 2014 22:25:57 +0200] rev 949
evolve: make most line lenghts 80 characters or less
There are still a few lines that are above 80 characters in length. Those have
not been changed because doing so would make the code a bit less clear.
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 29 Apr 2014 22:25:48 +0200] rev 948
evolve: start all util.Abort messages with lower case
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 29 Apr 2014 22:25:35 +0200] rev 947
evolve: improve wording of a few of messages
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 29 Apr 2014 22:25:21 +0200] rev 946
evolve: fix a couple of typos
Greg Ward <greg@gerg.ca> [Sun, 25 May 2014 17:37:13 -0400] rev 945
evolve: fix spelling error
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 13:45:52 -0700] rev 944
evolve: more compact output in the wire protocol case
We made the wording more similar and use less line. The writing operation is
usually fast so we do not needs a specific line for it.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 23:57:48 -0700] rev 943
evolve: test exchange through wireprotocol
The wireprotocol version of the exchange was only tested in the
`simple4server.py` case.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 13:30:12 -0700] rev 942
evolve: align working during obsmarker push using pushkey
lets use the same wording everywhere to prevent user confusion.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 May 2014 17:43:31 -0700] rev 941
evolve: drop some pre-3.0 compatibility code
This extension already requires Mercurial 3.0
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 May 2014 17:45:28 -0700] rev 940
evolve: update the errors message to request mercurial 3.0 and above
And update the checking code too. This extension already requires 3.0 for some
time.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 May 2014 12:44:30 -0700] rev 939
readme: remove some duplicated entries
Those changes where backported to 3.3.2.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 May 2014 12:43:03 -0700] rev 938
readme: remove embarrassment
There were… conflict marker in this file. Its over, they are gone now.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 16:42:41 -0700] rev 937
merge with 3.3.2
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 16:40:50 -0700] rev 936
Added tag 3.3.2 for changeset a03ea39aca2a
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 16:36:37 -0700] rev 935
prepare release 3.3.2
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Thu, 10 Apr 2014 16:02:02 -0400] rev 934
fold: add squash as a possible alias
In order to respect the habituation of the majority of DVCS users and
to make this feature more easily discoverable, the very common
"squash" terminology should be added as a synonym to "fold". Since git
does not have a squash command, this should be safe.
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Mon, 14 Apr 2014 15:46:27 -0400] rev 933
fold: add --message and --logfile options
Like other commit-creating commands, this add two options for
specifying the resulting commit message, with tests. If either of
these options is specified, no editor is popped up asking for a commit
message.
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 11 May 2014 01:29:11 -0700] rev 932
merge with stable
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Thu, 09 Jan 2014 11:33:15 +0100] rev 931
prune: update to successor rather than parent when prune '.'
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 09 May 2014 03:06:36 -0700] rev 930
import: --obsolete flag for automatic obsolescence marker creation
A new `--obsolete` flag is added to import. When present, the new node will be
marked as a successors of the one specified in the `Node` field of the imported
patch. No marker are created when revision have the node expected in the patch.
This improves email based work flow where implicit rebase are likely to happen
and extra information are lost, changing the hash.
This new behavior requires a flags, otherwise the `hg export x | hg import -`
idiom would change, turning the source obsolete.
(Changing from `hg graft x` to `hg rebase --dest . --rev x`)
This change only takes effect when using Mercurial 3.0 and above
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 11 May 2014 01:17:02 -0700] rev 929
merge with all other change to 3.3
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 11 May 2014 01:14:34 -0700] rev 928
update 3.3.0 readme to include minimal mercurial requirement
This clarify the situation.
Greg Ward <greg@gerg.ca> [Tue, 15 Apr 2014 14:06:47 -0400] rev 927
evolve: fix grammar in a comment
Greg Ward <greg@gerg.ca> [Tue, 15 Apr 2014 14:06:20 -0400] rev 926
README: document how to run the tests
Faheem Mitha <faheem@faheem.info> [Sat, 03 May 2014 03:46:21 +0530] rev 925
uncommit: change 'kill' to 'prune' in error message
'kill' was renamed to 'prune' Long time ago.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 29 Apr 2014 16:31:21 -0700] rev 924
readme: the forgotten update strike again
Sean Farley <sean.michael.farley@gmail.com> [Fri, 25 Apr 2014 19:58:33 -0500] rev 923
evolve: protect call to rebase within a wlock (#42, #35, #16)
Without a wlock, repo.commit would blow away the dirstate's parents on OSes
that have no 'os.symlink' support in python, leading evolve to produce a merge
instead of a rebase. If a user ran the rebase command instead of evolve, then
things would work because rebase is wrapped in a giant wlock.
Unfortunately, we can't use the same idea of wrapping the evolve command in one
giant wlock because that's too early in the process. If the lock did wrap the
entire evolve command, then the working directory would save its current
parents which, since rebase hasn't been called yet, would be just
p1.
Therefore, we need to obtain the lock *after* the dirstate's parents are
changed but *before* the call to rebase. This way ensures that when a conflict
happens the working directory correctly shows both parent changeset.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 15:58:55 -0700] rev 922
readme: update the readme with all missing entry
One days one will stop forgetting to update it.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 15:32:52 -0700] rev 921
readme: rephrase the changelog entry regarding the new exchange
Lets try to have it readable by human being.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 15:08:28 -0700] rev 920
readme: drop the reference to fastobs
Its dead Jim.