Wed, 06 Aug 2014 17:05:57 -0700 evolve: add a tr arguement to retractboundary
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 17:05:57 -0700] rev 1024
evolve: add a tr arguement to retractboundary Mercurial core is adding a transaction argument to its phase movement function. We do the same. If Mercurial appears to be an old version (without the extra args) we call it the old way.
Wed, 06 Aug 2014 18:10:00 -0700 relocate: add transaction around phase movement
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 18:10:00 -0700] rev 1023
relocate: add transaction around phase movement cheap way to acces access to the transaction object
Wed, 06 Aug 2014 17:14:00 -0700 uncommit tr
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 17:14:00 -0700] rev 1022
uncommit tr
Wed, 06 Aug 2014 18:06:17 -0700 evolve: saner locking an transaction in `hg evolve`
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 18:06:17 -0700] rev 1021
evolve: saner locking an transaction in `hg evolve` Each trouble solved used to handle locking and transaction on its own. We now have a top level locking and transaction. This will helps use making sure phase are moved within a transaction.
Wed, 06 Aug 2014 17:08:51 -0700 uncommit: saner locking scheme
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 17:08:51 -0700] rev 1020
uncommit: saner locking scheme (and do it in the right order in the process)
Wed, 06 Aug 2014 17:40:55 -0700 prune: lock inside the try
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 17:40:55 -0700] rev 1019
prune: lock inside the try tss…
Wed, 06 Aug 2014 17:39:32 -0700 debugrecordpruneparents: release tr the same way than the lock
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 17:39:32 -0700] rev 1018
debugrecordpruneparents: release tr the same way than the lock Nicer code is nicer.
Wed, 06 Aug 2014 17:37:28 -0700 evolve: drop useless wlock in rewrite
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 17:37:28 -0700] rev 1017
evolve: drop useless wlock in rewrite
Wed, 06 Aug 2014 16:55:41 -0700 divergence: actually use the hint that have been around for age
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 16:55:41 -0700] rev 1016
divergence: actually use the hint that have been around for age Having a hint in the code is good, having it displayed is usually seens as better.
Wed, 06 Aug 2014 16:07:53 -0700 evolve: rename `tr` variable (for troubled) to `tro`
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 16:07:53 -0700] rev 1015
evolve: rename `tr` variable (for troubled) to `tro` tro is usually dedicated to transaction.
Wed, 06 Aug 2014 16:04:07 -0700 evolve: add a custom layer around retractboundary
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 16:04:07 -0700] rev 1014
evolve: add a custom layer around retractboundary retract boundary is about to gain a new argument in core, we need somethign to handle this
Wed, 30 Jul 2014 13:40:40 -0700 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 30 Jul 2014 13:40:40 -0700] rev 1013
merge with stable
Wed, 30 Jul 2014 13:38:33 -0700 evolve: point to the core mercurial tracker for bugfix stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 30 Jul 2014 13:38:33 -0700] rev 1012
evolve: point to the core mercurial tracker for bugfix As per Matt Mackall request evolution related bug should be filled again the main tracker as at some point al lof evolve wil be in core.
Wed, 30 Jul 2014 13:37:46 -0700 evolve: drop reference to 2.3 in the extension help text stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 30 Jul 2014 13:37:46 -0700] rev 1011
evolve: drop reference to 2.3 in the extension help text We are far away from 2.3 now.
Wed, 30 Jul 2014 13:26:46 -0700 readme: update the work in progress repository location stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 30 Jul 2014 13:26:46 -0700] rev 1010
readme: update the work in progress repository location
Wed, 30 Jul 2014 13:24:19 -0700 readme: update the official documentation location stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 30 Jul 2014 13:24:19 -0700] rev 1009
readme: update the official documentation location
Wed, 30 Jul 2014 13:14:13 -0700 evolve: deprecated --obsolete and --old-obsolete option on commit and graft
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 30 Jul 2014 13:14:13 -0700] rev 1008
evolve: deprecated --obsolete and --old-obsolete option on commit and graft Such option are unlikely to make it into core, so we deprecate them to avoid uer discovery them and getting used to them.
Fri, 25 Jul 2014 17:13:54 +0200 push: put phase in the same bundle2 than changegroup and obsmarkers
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 25 Jul 2014 17:13:54 +0200] rev 1007
push: put phase in the same bundle2 than changegroup and obsmarkers Note that the usual phase push from core will be performed in all case. But the discovery should find already in sync phase at that time. The old ways sync will be properly skipped when this logic is introduced into core.
Fri, 25 Jul 2014 16:54:08 +0200 push: put obsmarkers in the same bundle2 than changeset
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 25 Jul 2014 16:54:08 +0200] rev 1006
push: put obsmarkers in the same bundle2 than changeset When client is Mercurial 3.1 and server have proper evolve version and both side have bundle2 enabled, we'll includes a part containing obsolescence markers. When obsmarkers are included to the main bundle2 push, they will failed to be pushed if the changeset failed to be pushed (and reciprocally).
Mon, 28 Jul 2014 00:08:06 +0200 push: extract obsmarkers discovery in a dedicated function
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 28 Jul 2014 00:08:06 +0200] rev 1005
push: extract obsmarkers discovery in a dedicated function The need to factorise the computation of the markers to send in a dedicated function. This prepare the inclusion of obsmarkers in an atomic bundle2 push. For now, when obsmarkers are pushed using bundle2, they are still doing it on their own, in a dedicated bundle2 push.
Tue, 29 Jul 2014 17:15:57 -0700 evolve: update the tested with statement
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 29 Jul 2014 17:15:57 -0700] rev 1004
evolve: update the tested with statement Tested with the soon to be release 3.1.
Tue, 29 Jul 2014 17:15:01 -0700 test: adapt to upstream message change
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 29 Jul 2014 17:15:01 -0700] rev 1003
test: adapt to upstream message change A message gained parenthesis in 3.1 we reflect than in the test.
Thu, 24 Jul 2014 12:02:53 -0700 uncommit: improve error message for use with no arguments
Nathan Goldbaum <ngoldbau@ucsc.edu> [Thu, 24 Jul 2014 12:02:53 -0700] rev 1002
uncommit: improve error message for use with no arguments
Fri, 25 Jul 2014 14:27:16 +0200 test: use `hg log` in the `getid` function
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 25 Jul 2014 14:27:16 +0200] rev 1001
test: use `hg log` in the `getid` function using `hg id` to retrieve full lenght node requires to use --debug. This may include debug output (regarding branch cache invalidation for example) that breaks the test. We now use `hg log` with a custom template. This is a simple, clean and robust solution.
Sun, 13 Jul 2014 21:54:03 +0530 readme: mention patchbomb usage and patch description guidelines on wiki
Faheem Mitha <faheem@faheem.info> [Sun, 13 Jul 2014 21:54:03 +0530] rev 1000
readme: mention patchbomb usage and patch description guidelines on wiki
Wed, 23 Jul 2014 12:08:48 +0200 debian: add line to clean target to delete error files caused by failing tests
Faheem Mitha <faheem@faheem.info> [Wed, 23 Jul 2014 12:08:48 +0200] rev 999
debian: add line to clean target to delete error files caused by failing tests
Mon, 30 Jun 2014 13:38:49 -0400 fold: improve error messages for multiple heads and roots
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Mon, 30 Jun 2014 13:38:49 -0400] rev 998
fold: improve error messages for multiple heads and roots This commit adds hints and i18n to the error messages about non-linear revisions, along with corresponding tests.
Mon, 30 Jun 2014 13:37:15 -0400 fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Mon, 30 Jun 2014 13:37:15 -0400] rev 997
fold: reword error message for public commits This rewords the error message when attempting to fold public csets. It is somewhat clearer to not use contractions in formal writing. It also uses i18n for it. This commit also adds a new test for this error message.
Mon, 30 Jun 2014 13:29:49 -0400 fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Mon, 30 Jun 2014 13:29:49 -0400] rev 996
fold: overhaul handling of revisions with --rev (BC) The fold command parsed the revision arguments in a very peculiar and idiosyncratic fashion: if revisions were passed without a --rev argument, then they would all be extended to ".", but if they were passed with --rev, then no extension would happen. Passing revisions both with and without --rev would abort. This is inconsistent with the way all other hg commands parse revision arguments. We have several examples of command where several revisions are passed, and the --rev option is optional for specifying those revisions (update, strip, export). This patch alters the way in which fold parses its revision arguments. No distinction is made between revisions passed with or without the --rev argument. Regardless if a single or multiple revision is specified, all will be folded together into the parent of the working directory. If the --exact argument is passed, then the parent of the working directory is ignored and the specified revisions must be a single contiguous line. The docstring and tests are modified accordingly.
Mon, 30 Jun 2014 10:25:08 -0400 fold: emit error message when folding a single revision
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Mon, 30 Jun 2014 10:25:08 -0400] rev 995
fold: emit error message when folding a single revision Previously, a confusing error state would happen if the revision set to fold was a singleton.
(0) -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 tip