Fri, 29 Aug 2014 16:13:19 +0200 pull: use discovery to pull less obsmarkers through bundle2
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 29 Aug 2014 16:13:19 +0200] rev 1097
pull: use discovery to pull less obsmarkers through bundle2 This hooks in the official API for bundle2
Fri, 29 Aug 2014 16:13:01 +0200 pull: run obsmarker discovery only on the common set
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 29 Aug 2014 16:13:01 +0200] rev 1096
pull: run obsmarker discovery only on the common set If the discovery is run before the obsmarker push, pulled revs does not exist in the repository yet.
Fri, 29 Aug 2014 16:11:22 +0200 evolve: fix a typo in a long function name
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 29 Aug 2014 16:11:22 +0200] rev 1095
evolve: fix a typo in a long function name
Fri, 29 Aug 2014 15:19:19 +0200 bundle2: burn some more of the old code
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 29 Aug 2014 15:19:19 +0200] rev 1094
bundle2: burn some more of the old code Some of it survived.
Wed, 27 Aug 2014 18:59:11 +0200 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 18:59:11 +0200] rev 1093
obsexch: respect todosteps when using the old push
Wed, 27 Aug 2014 18:28:22 +0200 compat: update the tests after the jump
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 18:28:22 +0200] rev 1092
compat: update the tests after the jump
Wed, 27 Aug 2014 18:16:10 +0200 compat: use in-core encodemarkers
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 18:16:10 +0200] rev 1091
compat: use in-core encodemarkers Now exist in core witha slightly different format.
Wed, 27 Aug 2014 18:15:39 +0200 compat: rename encodeonemarkers to _fm0encodemarkers
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 18:15:39 +0200] rev 1090
compat: rename encodeonemarkers to _fm0encodemarkers This is getting renamed in core.
Sun, 27 Jul 2014 23:09:45 +0200 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 27 Jul 2014 23:09:45 +0200] rev 1089
enable bundle2
Fri, 29 Aug 2014 11:56:16 +0200 drop the debug output
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 29 Aug 2014 11:56:16 +0200] rev 1088
drop the debug output
Wed, 27 Aug 2014 18:28:09 +0200 test-simple4server: add error output for http
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 18:28:09 +0200] rev 1087
test-simple4server: add error output for http This is useful in case of failure.
Fri, 29 Aug 2014 10:44:40 +0200 compat: adapt to change to memctx
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 29 Aug 2014 10:44:40 +0200] rev 1086
compat: adapt to change to memctx Since core mercurial 650b5b6e75ed we must return None instead of raising IOError. Hooray for mads!!
Wed, 27 Aug 2014 17:49:08 +0200 evolve: use pushkeyescape from core
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 17:49:08 +0200] rev 1085
evolve: use pushkeyescape from core It exists for all version we are compatible with.
Wed, 27 Aug 2014 17:55:20 +0200 evolve: display more message
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 17:55:20 +0200] rev 1084
evolve: display more message
Wed, 27 Aug 2014 17:36:35 +0200 evolve: drop a very old safe guard about bad marker
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 17:36:35 +0200] rev 1083
evolve: drop a very old safe guard about bad marker The do not clean marker with nullrev successors. I assume none of them remains.
Wed, 27 Aug 2014 17:31:21 +0200 pull: drop the custom bundle2 part
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 17:31:21 +0200] rev 1082
pull: drop the custom bundle2 part
Wed, 27 Aug 2014 17:25:18 +0200 obsexc: add support for evoext_pushobsmarkers_0 on localpeer
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 17:25:18 +0200] rev 1081
obsexc: add support for evoext_pushobsmarkers_0 on localpeer This will unify the behavior of exchange in the tests.
Wed, 27 Aug 2014 17:24:40 +0200 evolve: allow read() from the magic StringIO
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 17:24:40 +0200] rev 1080
evolve: allow read() from the magic StringIO
Wed, 27 Aug 2014 17:12:01 +0200 evolve: drop old obsmarker discovery code
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 17:12:01 +0200] rev 1079
evolve: drop old obsmarker discovery code It as not caller anymore.
Wed, 27 Aug 2014 17:09:36 +0200 obsexc: use the common discovery
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 17:09:36 +0200] rev 1078
obsexc: use the common discovery We drop the hand made discovery and rely on the general one introduced some time ago.
Wed, 27 Aug 2014 12:29:40 +0200 obsexc: push nothing if push fail
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 12:29:40 +0200] rev 1077
obsexc: push nothing if push fail This is closer to the future behavior with bundle2.
Fri, 29 Aug 2014 10:13:44 +0200 discovery: hook on the official discovery for obsmarker
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 29 Aug 2014 10:13:44 +0200] rev 1076
discovery: hook on the official discovery for obsmarker This will let the discovery be done once and used by core.
Wed, 27 Aug 2014 12:05:49 +0200 discovery: use a different setup step for discovery
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 12:05:49 +0200] rev 1075
discovery: use a different setup step for discovery This will ease the dropping of the other part later.
Wed, 27 Aug 2014 12:04:57 +0200 evolve: remove unused drop random
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 12:04:57 +0200] rev 1074
evolve: remove unused drop random
Wed, 27 Aug 2014 12:02:53 +0200 obshash: resist to unknown revision during discovery
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 12:02:53 +0200] rev 1073
obshash: resist to unknown revision during discovery
Wed, 27 Aug 2014 10:49:58 +0200 code movement: gather discovery code together
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 10:49:58 +0200] rev 1072
code movement: gather discovery code together The discovery code is the one thing that will survive the great purge.
Wed, 27 Aug 2014 10:53:09 +0200 bundle2: drop custom compat
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 10:53:09 +0200] rev 1071
bundle2: drop custom compat We'll rely on the core implementation to use bundle2.
Wed, 27 Aug 2014 10:22:50 +0200 drop relevant marker compat
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 10:22:50 +0200] rev 1070
drop relevant marker compat
Wed, 27 Aug 2014 10:21:30 +0200 evolve: always use the transaction version of phase movement
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 10:21:30 +0200] rev 1069
evolve: always use the transaction version of phase movement This drop compat with all known released version of Mercurial.
Wed, 27 Aug 2014 10:29:31 +0200 evolve: drop debugobsoleterelevant
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 10:29:31 +0200] rev 1068
evolve: drop debugobsoleterelevant Core gained this capability usig `hg debugobsolete --rev REV`
Wed, 20 Aug 2014 20:49:48 -0700 evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 20 Aug 2014 20:49:48 -0700] rev 1067
evolve: yield to relevant markers handling in core The handling of obsolescence marker is now performed in core. If we detect a mercurial with such power we skip the wrapping from evolve. This changeset also suffer from massive diff from the change in display of obsolescence marker with parent information introduced at the same time in core.
Wed, 20 Aug 2014 21:14:49 -0700 test-wireproto: adapt to output change from core
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 20 Aug 2014 21:14:49 -0700] rev 1066
test-wireproto: adapt to output change from core
Fri, 15 Aug 2014 17:07:55 -0700 test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 15 Aug 2014 17:07:55 -0700] rev 1065
test: update test to new date formatting in debuobsolete output The date is now a first class citizen with proper formatting.
Fri, 15 Aug 2014 16:39:42 -0700 test: update help output to future 3.2
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 15 Aug 2014 16:39:42 -0700] rev 1064
test: update help output to future 3.2
Mon, 18 Aug 2014 15:57:44 -0700 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 18 Aug 2014 15:57:44 -0700] rev 1063
merge with stable
Sun, 17 Aug 2014 05:05:22 +0530 pkg: make tests pass using the generated tarball stable
Faheem Mitha <faheem@faheem.info> [Sun, 17 Aug 2014 05:05:22 +0530] rev 1062
pkg: make tests pass using the generated tarball Exclude tests/test-drop.t and include tests/_exc-util.sh, tests/dummyssh, and hgext/simple4server.py.
Fri, 15 Aug 2014 17:42:19 -0700 compat: always call metadata as a keyword argument stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 15 Aug 2014 17:42:19 -0700] rev 1061
compat: always call metadata as a keyword argument Those function are gaining more arguments. using keyword argument keep use safe in all version.
Fri, 15 Aug 2014 16:54:32 -0700 test: work around a bug in debugobsolete stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 15 Aug 2014 16:54:32 -0700] rev 1060
test: work around a bug in debugobsolete The defautl date was wrong all along. So we use a fixed date for all tests.
Fri, 15 Aug 2014 12:56:01 -0700 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 15 Aug 2014 12:56:01 -0700] rev 1059
merge with stable
Fri, 15 Aug 2014 00:46:23 -0700 uncommit: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 15 Aug 2014 00:46:23 -0700] rev 1058
uncommit: add a --rev argument The uncommit command now taks a --rev argument. This lets restore the file content in the current commit to another revision (instead of just is parent content). This still does not touch the working directory content.\ This allow the longly awaited: hg uncommit --hidden --rev 'precursors(.)'
Thu, 14 Aug 2014 15:30:04 -0700 readme: add missing changelog entry stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 14 Aug 2014 15:30:04 -0700] rev 1057
readme: add missing changelog entry My dear friends changelog.
Thu, 14 Aug 2014 15:26:55 -0700 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 14 Aug 2014 15:26:55 -0700] rev 1056
merge with stable
Thu, 14 Aug 2014 15:17:02 -0700 import: handle patch with no node information stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 14 Aug 2014 15:17:02 -0700] rev 1055
import: handle patch with no node information patch created by old Mercurial version or other tool have no node information. We cannot create marker in this case.
Thu, 14 Aug 2014 15:14:18 -0700 import: compare binary node with binary node when using --obsolete stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 14 Aug 2014 15:14:18 -0700] rev 1054
import: compare binary node with binary node when using --obsolete hex(N) != N
Sun, 10 Aug 2014 23:58:31 -0700 README: fix version number stable
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 10 Aug 2014 23:58:31 -0700] rev 1053
README: fix version number
Mon, 11 Aug 2014 01:57:09 +0530 relocate: fix typo stable
Faheem Mitha <faheem@faheem.info> [Mon, 11 Aug 2014 01:57:09 +0530] rev 1052
relocate: fix typo
Fri, 08 Aug 2014 23:16:24 -0700 merge back with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 23:16:24 -0700] rev 1051
merge back with stable
Fri, 08 Aug 2014 23:15:43 -0700 Added tag 4.1.0 for changeset 4d5d101e878f stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 23:15:43 -0700] rev 1050
Added tag 4.1.0 for changeset 4d5d101e878f
Fri, 08 Aug 2014 23:15:26 -0700 pkg: prepare release 4.1.0 stable 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 23:15:26 -0700] rev 1049
pkg: prepare release 4.1.0
Fri, 08 Aug 2014 23:14:00 -0700 merge default into stable stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 23:14:00 -0700] rev 1048
merge default into stable Release 4.1.0 is coming
Fri, 08 Aug 2014 23:02:26 -0700 evolve: adds a --confirm option
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 23:02:26 -0700] rev 1047
evolve: adds a --confirm option This option lets the use double check if it wants the evolve operation.
Fri, 08 Aug 2014 23:11:09 -0700 evolve: gather evolve output together
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 23:11:09 -0700] rev 1046
evolve: gather evolve output together We stop relying on ui.status being muted when --quiet is used. Instead we use plain write and hide this behind an explicite ui.quiet check. This will help use enforcing this output in the comming --confirm mode.
Fri, 08 Aug 2014 21:06:48 -0700 doc: forgotten amend
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 21:06:48 -0700] rev 1045
doc: forgotten amend
Thu, 12 Jun 2014 14:41:13 -0700 evolve: attempt to clarify the documentation around --all and --any
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 12 Jun 2014 14:41:13 -0700] rev 1044
evolve: attempt to clarify the documentation around --all and --any This have been confusing to people. We try to be a bit more verbose in the evolve help.
Fri, 08 Aug 2014 18:15:01 -0700 evolve: re enable progress for all
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 18:15:01 -0700] rev 1043
evolve: re enable progress for all Progress is an important information for user facing slow push.
Fri, 08 Aug 2014 18:06:08 -0700 evolve: stop pretending we are pulling markers when we don't
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 18:06:08 -0700] rev 1042
evolve: stop pretending we are pulling markers when we don't If discovery did not found any unknown marker, we should not display the "pulling marker" message.
Fri, 08 Aug 2014 18:01:02 -0700 evolve: do not even try to pull if all remote markers are known
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 18:01:02 -0700] rev 1041
evolve: do not even try to pull if all remote markers are known previously we were explicitly pulling an empty bundle.
Fri, 08 Aug 2014 17:49:22 -0700 evolve: add "obsolescence" in front of marked in the previous message
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 17:49:22 -0700] rev 1040
evolve: add "obsolescence" in front of marked in the previous message
Fri, 08 Aug 2014 17:46:20 -0700 evolve: make the "X markers added" message during pull important
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 17:46:20 -0700] rev 1039
evolve: make the "X markers added" message during pull important
Fri, 08 Aug 2014 17:40:01 -0700 evolve: make the "pulling obsolescence marker" message important
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 17:40:01 -0700] rev 1038
evolve: make the "pulling obsolescence marker" message important This is likely to take some time the user needs to know what is going on.
Fri, 08 Aug 2014 17:34:22 -0700 evolve: add "absolescence" in front of markers in the message
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 17:34:22 -0700] rev 1037
evolve: add "absolescence" in front of markers in the message
Fri, 08 Aug 2014 17:29:29 -0700 evolve: re-introduce the "pushing 42 markers…" message
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 17:29:29 -0700] rev 1036
evolve: re-introduce the "pushing 42 markers…" message Informing the user about marker behind pushed sounds a good idea.
Fri, 08 Aug 2014 17:16:29 -0700 evolve: hide the OBSEXC message behind a config option
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 17:16:29 -0700] rev 1035
evolve: hide the OBSEXC message behind a config option This will lets most people ignore them while keep evolve dev having a close look at them. Some of the most useful messages will be reintroduced for all in coming changeset.
Fri, 08 Aug 2014 17:10:31 -0700 evolve: move OBSEXC progress in a dedicated function
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 17:10:31 -0700] rev 1034
evolve: move OBSEXC progress in a dedicated function This will help use to rework them.
Fri, 08 Aug 2014 16:48:38 -0700 evolve: move OBSEXC message in a dedicated function
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 16:48:38 -0700] rev 1033
evolve: move OBSEXC message in a dedicated function This will help use to rework them.
Fri, 08 Aug 2014 15:55:04 -0700 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 15:55:04 -0700] rev 1032
merge with stable
Fri, 08 Aug 2014 15:50:26 -0700 Added tag 4.0.1 for changeset e914884fb721 stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 15:50:26 -0700] rev 1031
Added tag 4.0.1 for changeset e914884fb721
Fri, 08 Aug 2014 15:43:07 -0700 evolve: prepare release 4.0.1 stable 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 15:43:07 -0700] rev 1030
evolve: prepare release 4.0.1
Fri, 08 Aug 2014 15:48:42 -0700 evolve: fix distribution for 4.0.0 stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 15:48:42 -0700] rev 1029
evolve: fix distribution for 4.0.0
Fri, 08 Aug 2014 15:40:19 -0700 evolve: update readme stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 15:40:19 -0700] rev 1028
evolve: update readme
Fri, 08 Aug 2014 15:33:39 -0700 evolve: update tested with statement stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 15:33:39 -0700] rev 1027
evolve: update tested with statement
Fri, 08 Aug 2014 10:40:47 -0700 test: apply message changes introduced by mercurial 3.1 stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 10:40:47 -0700] rev 1026
test: apply message changes introduced by mercurial 3.1
Fri, 25 Jul 2014 14:27:16 +0200 test: use `hg log` in the `getid` function stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 25 Jul 2014 14:27:16 +0200] rev 1025
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.
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.
Mon, 30 Jun 2014 10:27:15 -0400 fold: clarify message for empty revision set and abort instead (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Mon, 30 Jun 2014 10:27:15 -0400] rev 994
fold: clarify message for empty revision set and abort instead (BC) I find it clearer that there are no revisions to fold because none were specified. Otherwise it seems ambiguous: maybe there are no revisions to fold because it's impossible to fold whatever was given? In analogy of other commands that are given no revisions (e.g. strip, graft), this is also now an abort instead of a mere error message, which is a BC.
Fri, 04 Jul 2014 09:29:13 -0400 evolve: do not use _ as an unused variable
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Fri, 04 Jul 2014 09:29:13 -0400] rev 993
evolve: do not use _ as an unused variable The _ variable is the i18n function from core Mercurial, so locally assigning to it can lead to name clashes.
Thu, 26 Jun 2014 15:31:49 +0100 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 26 Jun 2014 15:31:49 +0100] rev 992
merge with stable
Thu, 26 Jun 2014 15:27:25 +0100 merge with very old 2.2 branch stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 26 Jun 2014 15:27:25 +0100] rev 991
merge with very old 2.2 branch
Mon, 23 Jun 2014 22:04:32 -0400 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca> [Mon, 23 Jun 2014 22:04:32 -0400] rev 990
test-obsolete: make log templates more consistent: add {desc} to one This has the extra added benefit of making the divergence situation easier to understand.
Mon, 23 Jun 2014 21:03:57 -0400 test-obsolete: explicitly show which changesets are divergent
Greg Ward <greg@gerg.ca> [Mon, 23 Jun 2014 21:03:57 -0400] rev 989
test-obsolete: explicitly show which changesets are divergent
Mon, 23 Jun 2014 02:31:53 -0700 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 23 Jun 2014 02:31:53 -0700] rev 988
merge with stable
Mon, 23 Jun 2014 02:19:04 -0700 update readme
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 23 Jun 2014 02:19:04 -0700] rev 987
update readme (I should have a hook preventing me to push to public repo with uncommited changes)
Sun, 22 Jun 2014 20:10:07 -0400 evolve: add --tool option so we don't have to use HGMERGE
Greg Ward <greg@gerg.ca> [Sun, 22 Jun 2014 20:10:07 -0400] rev 986
evolve: add --tool option so we don't have to use HGMERGE
Sun, 22 Jun 2014 12:01:11 -0400 amend: add -U/--current-user option (inspired by mq)
Greg Ward <greg@gerg.ca> [Sun, 22 Jun 2014 12:01:11 -0400] rev 985
amend: add -U/--current-user option (inspired by mq)
Sat, 21 Jun 2014 18:31:21 -0400 tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca> [Sat, 21 Jun 2014 18:31:21 -0400] rev 984
tests: fix grammar, spelling, punctuation in comments
Fri, 13 Jun 2014 12:49:16 -0700 evolve: minor reorganisation of code responsible for evolve output
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 13 Jun 2014 12:49:16 -0700] rev 983
evolve: minor reorganisation of code responsible for evolve output This does not change any of the semantic as status is not printed when --quiet is provided. This juste make it more explicit that the output are related.
Thu, 12 Jun 2014 16:10:01 -0700 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 12 Jun 2014 16:10:01 -0700] rev 982
template: add a troubles keyword This keyword list all evolution troubles that affect a changeset. Evolution troubles can be "unstable", "divergent" and "bumped".
Fri, 06 Jun 2014 17:21:59 -0400 docs: update copyright statement used by sphinx
Greg Ward <greg@gerg.ca> [Fri, 06 Jun 2014 17:21:59 -0400] rev 981
docs: update copyright statement used by sphinx
Fri, 06 Jun 2014 17:20:30 -0400 docs: add concepts guide (the set theory behind obsolescence)
Greg Ward <greg@gerg.ca> [Fri, 06 Jun 2014 17:20:30 -0400] rev 980
docs: add concepts guide (the set theory behind obsolescence)
Fri, 06 Jun 2014 17:19:17 -0400 docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca> [Fri, 06 Jun 2014 17:19:17 -0400] rev 979
docs: add guide to sharing mutable history
Thu, 05 Jun 2014 22:11:04 -0400 docs: add new user guide
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.
Thu, 05 Jun 2014 21:57:34 -0400 docs: rewrite index page (including dangling links to future docs)
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.
Fri, 06 Jun 2014 17:43:45 -0400 amend: add -D/--current-date option, just like mq's qrefresh has
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.
Thu, 05 Jun 2014 21:27:28 -0400 amend: explicitly test -d option
Greg Ward <greg@gerg.ca> [Thu, 05 Jun 2014 21:27:28 -0400] rev 975
amend: explicitly test -d option
Thu, 05 Jun 2014 21:27:06 -0400 amend: in tests, do not rely on defaults -- always use explicit -d
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.
Thu, 05 Jun 2014 18:07:39 -0400 evolve: fix createmarkers() wrapper to accept an iterable stable
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.
Tue, 03 Jun 2014 16:45:02 -0700 merge with 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 16:45:02 -0700] rev 972
merge with 4.0.0
Tue, 03 Jun 2014 16:44:24 -0700 Added tag 4.0.0 for changeset 0304fc2bab15 stable
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
Tue, 03 Jun 2014 15:38:16 -0700 pkg: prepare release of version 4.0.0 stable 4.0.0
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
Tue, 03 Jun 2014 15:36:58 -0700 pkg: drop pushexperiment from the install list stable
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
Tue, 03 Jun 2014 14:31:15 -0700 merge stable into default
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
Tue, 03 Jun 2014 14:30:23 -0700 merge default in to stable 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.
Tue, 03 Jun 2014 14:29:24 -0700 merge back into stable stable
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.
Tue, 03 Jun 2014 14:28:31 -0700 prepare a branch for compatibility with mercurial 2.7 to 3.0(.0) mercurial-2.7
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
Mon, 02 Jun 2014 15:22:23 -0700 test: update to output change introduced by future 3.1
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
Wed, 21 May 2014 12:01:28 -0700 simple4server: backport the bundle2 exchange
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 21 May 2014 12:01:28 -0700] rev 963
simple4server: backport the bundle2 exchange
Tue, 20 May 2014 22:36:47 -0700 evolve: install progress support for the bundle2 pull path
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.
Tue, 20 May 2014 17:21:36 -0700 evolve: install progress support for the bundle2 push path
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.
Tue, 20 May 2014 14:39:13 -0700 evolve: add a pull 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.
Tue, 03 Jun 2014 02:13:02 -0700 evolve: advertise obsmarker creation in the transation hook
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.
Tue, 20 May 2014 15:01:33 -0700 evolve: add bytes and new marker data when processing part
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.
Tue, 20 May 2014 13:41:27 -0700 evolve: add a push pass using 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.
Mon, 02 Jun 2014 14:44:13 -0700 evolve: make exchange output compact in the old pushkey case too.
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.
Tue, 03 Jun 2014 01:37:08 -0700 evolve: compatibility with memfilectx change
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.
Tue, 03 Jun 2014 01:22:31 -0700 evolve: abstract access to context.memfilectx
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.
Mon, 02 Jun 2014 14:18:29 -0700 import: drop version check for ``import --obsolete``
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.
Tue, 03 Jun 2014 01:16:39 -0700 evolve: bump requirement to 3.0.1
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.
Mon, 02 Jun 2014 14:58:45 -0700 test: fix test-import condition
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(``
Sat, 31 May 2014 00:23:25 -0700 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 31 May 2014 00:23:25 -0700] rev 950
merge with stable
Tue, 29 Apr 2014 22:25:57 +0200 evolve: make most line lenghts 80 characters or less 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.
Tue, 29 Apr 2014 22:25:48 +0200 evolve: start all util.Abort messages with lower case stable
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
Tue, 29 Apr 2014 22:25:35 +0200 evolve: improve wording of a few of messages stable
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 29 Apr 2014 22:25:35 +0200] rev 947
evolve: improve wording of a few of messages
Tue, 29 Apr 2014 22:25:21 +0200 evolve: fix a couple of typos stable
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 29 Apr 2014 22:25:21 +0200] rev 946
evolve: fix a couple of typos
Sun, 25 May 2014 17:37:13 -0400 evolve: fix spelling error stable
Greg Ward <greg@gerg.ca> [Sun, 25 May 2014 17:37:13 -0400] rev 945
evolve: fix spelling error
Tue, 20 May 2014 13:45:52 -0700 evolve: more compact output in the wire protocol case
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.
Tue, 20 May 2014 23:57:48 -0700 evolve: test exchange through wireprotocol
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.
Tue, 20 May 2014 13:30:12 -0700 evolve: align working during obsmarker push using pushkey
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.
Mon, 19 May 2014 17:43:31 -0700 evolve: drop some pre-3.0 compatibility code
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
Mon, 19 May 2014 17:45:28 -0700 evolve: update the errors message to request mercurial 3.0 and above
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.
Mon, 19 May 2014 12:44:30 -0700 readme: remove some duplicated entries
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.
Mon, 19 May 2014 12:43:03 -0700 readme: remove embarrassment
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.
Wed, 14 May 2014 16:42:41 -0700 merge with 3.3.2
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 16:42:41 -0700] rev 937
merge with 3.3.2
Wed, 14 May 2014 16:40:50 -0700 Added tag 3.3.2 for changeset a03ea39aca2a stable
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
Wed, 14 May 2014 16:36:37 -0700 prepare release 3.3.2 stable 3.3.2
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 16:36:37 -0700] rev 935
prepare release 3.3.2
Thu, 10 Apr 2014 16:02:02 -0400 fold: add squash as a possible alias stable
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.
Mon, 14 Apr 2014 15:46:27 -0400 fold: add --message and --logfile options stable
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.
Sun, 11 May 2014 01:29:11 -0700 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 11 May 2014 01:29:11 -0700] rev 932
merge with stable
Thu, 09 Jan 2014 11:33:15 +0100 prune: update to successor rather than parent when prune '.' 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 '.'
Fri, 09 May 2014 03:06:36 -0700 import: --obsolete flag for automatic obsolescence marker creation stable
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
Sun, 11 May 2014 01:17:02 -0700 merge with all other change to 3.3 stable
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
Sun, 11 May 2014 01:14:34 -0700 update 3.3.0 readme to include minimal mercurial requirement stable
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.
Tue, 15 Apr 2014 14:06:47 -0400 evolve: fix grammar in a comment stable
Greg Ward <greg@gerg.ca> [Tue, 15 Apr 2014 14:06:47 -0400] rev 927
evolve: fix grammar in a comment
Tue, 15 Apr 2014 14:06:20 -0400 README: document how to run the tests stable
Greg Ward <greg@gerg.ca> [Tue, 15 Apr 2014 14:06:20 -0400] rev 926
README: document how to run the tests
Sat, 03 May 2014 03:46:21 +0530 uncommit: change 'kill' to 'prune' in error message stable
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.
Tue, 29 Apr 2014 16:31:21 -0700 readme: the forgotten update strike again stable
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 29 Apr 2014 16:31:21 -0700] rev 924
readme: the forgotten update strike again
Fri, 25 Apr 2014 19:58:33 -0500 evolve: protect call to rebase within a wlock (#42, #35, #16) stable
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.
Wed, 23 Apr 2014 15:58:55 -0700 readme: update the readme with all missing entry
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.
Wed, 23 Apr 2014 15:32:52 -0700 readme: rephrase the changelog entry regarding the new exchange
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.
Wed, 23 Apr 2014 15:08:28 -0700 readme: drop the reference to fastobs
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.
Wed, 23 Apr 2014 14:28:28 -0700 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 14:28:28 -0700] rev 919
merge with stable
Wed, 23 Apr 2014 14:24:02 -0700 Added tag 3.3.1 for changeset fc04758ea9f5 stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 14:24:02 -0700] rev 918
Added tag 3.3.1 for changeset fc04758ea9f5
Wed, 23 Apr 2014 14:23:23 -0700 prepare release 3.3.1 stable 3.3.1
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 14:23:23 -0700] rev 917
prepare release 3.3.1
Wed, 23 Apr 2014 14:22:06 -0700 fix maintainer email stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 14:22:06 -0700] rev 916
fix maintainer email I'm not working at Logilab since july 2013. Using my personal address to prevent this kind of situation in the future.
Fri, 11 Apr 2014 19:24:29 -0400 fold: enable --date and --user options stable
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Fri, 11 Apr 2014 19:24:29 -0400] rev 915
fold: enable --date and --user options Like all other commit-creating commits, `hg fold` should also have these options enabled. This also allows getting consistent hashes during tests involving fold.
Wed, 23 Apr 2014 14:15:40 -0700 evolve: improves readme wording stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 14:15:40 -0700] rev 914
evolve: improves readme wording (yes I just pushed the other version…)
Wed, 23 Apr 2014 14:10:28 -0700 evolve: update changelog in README stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 14:10:28 -0700] rev 913
evolve: update changelog in README
Wed, 23 Apr 2014 14:05:36 -0700 test: update testing statement stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 14:05:36 -0700] rev 912
test: update testing statement
Wed, 26 Mar 2014 00:38:14 +0100 evolve: abort when trying to move a node on top of itself stable
Olle Lundberg <geek@nerd.sh> [Wed, 26 Mar 2014 00:38:14 +0100] rev 911
evolve: abort when trying to move a node on top of itself This provides a clearer error message when evolve misstakenly tries to move a changeset on top of itself. Before we got an abort with a cryptic message about trying to rebase a merge changeset. A proper fix to make sure that evolve never tries to move a node on top of itself will come in later patches.
Wed, 26 Mar 2014 23:57:15 +0100 run-tests: add executable bit stable
Olle Lundberg <geek@nerd.sh> [Wed, 26 Mar 2014 23:57:15 +0100] rev 910
run-tests: add executable bit
Mon, 14 Apr 2014 15:10:29 -0400 rewrite: use cmdutil.logmessage instead of ad-hoc methods
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Mon, 14 Apr 2014 15:10:29 -0400] rev 909
rewrite: use cmdutil.logmessage instead of ad-hoc methods The logic for handling the --message and --logfile options is already in core hg in the cmdutil.logmessage function. This patch removes this duplicate logic from Evolve and just calls the core function.
Fri, 11 Apr 2014 19:24:29 -0400 fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Fri, 11 Apr 2014 19:24:29 -0400] rev 908
fold: enable --date and --user options Like all other commit-creating commits, `hg fold` should also have these options enabled. This also allows getting consistent hashes during tests involving fold.
Tue, 22 Apr 2014 17:04:40 -0700 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 22 Apr 2014 17:04:40 -0700] rev 907
merge with stable
Tue, 22 Apr 2014 17:15:05 -0700 test: sort output of listkey command
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 22 Apr 2014 17:15:05 -0700] rev 906
test: sort output of listkey command The pushkey namespace came as dict key. So they have no defined order. We sort them to stabilize the test.
Tue, 22 Apr 2014 17:00:24 -0700 exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 22 Apr 2014 17:00:24 -0700] rev 905
exchange: use fixed order for obstore content The obsstore content seems unstable from one version of python to another (we most certainly use some dict) we fix the order once and for all.
Sun, 20 Apr 2014 17:40:56 -0400 Finish killing fastobs (this test failed loudly after 33fdaec24432)
Greg Ward <greg@gerg.ca> [Sun, 20 Apr 2014 17:40:56 -0400] rev 904
Finish killing fastobs (this test failed loudly after 33fdaec24432)
Thu, 17 Apr 2014 17:15:54 -0400 Kill fastobs, as marmoute says it causes problems
Augie Fackler <raf@durin42.com> [Thu, 17 Apr 2014 17:15:54 -0400] rev 903
Kill fastobs, as marmoute says it causes problems
Mon, 07 Apr 2014 16:41:29 -0700 tests: fix test-prune.t breakage stable
Durham Goode <durham@fb.com> [Mon, 07 Apr 2014 16:41:29 -0700] rev 902
tests: fix test-prune.t breakage test-prune.t was broken due to 91d28bd0e04e in upstream Mercurial, which made hidden commits visible when a local tag made the commit reachable. The fix is to delete the tag in the test.
Mon, 14 Apr 2014 18:16:35 +0200 Fix preservation of rename information on evolve (#33) stable
Julien Cristau <julien.cristau@logilab.fr> [Mon, 14 Apr 2014 18:16:35 +0200] rev 901
Fix preservation of rename information on evolve (#33) Following what rebase itself does, call duplicatecopies between rebasenode and concludenode. Should fix https://bitbucket.org/marmoute/mutable-history/issue/33/evolve-command-loses-copy-metadata
Sun, 13 Apr 2014 16:46:13 -0400 merge stable into default
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 13 Apr 2014 16:46:13 -0400] rev 900
merge stable into default
Mon, 07 Apr 2014 16:41:29 -0700 tests: fix test-prune.t breakage
Durham Goode <durham@fb.com> [Mon, 07 Apr 2014 16:41:29 -0700] rev 899
tests: fix test-prune.t breakage test-prune.t was broken due to 91d28bd0e04e in upstream Mercurial, which made hidden commits visible when a local tag made the commit reachable. The fix is to delete the tag in the test.
Sat, 12 Apr 2014 23:16:02 +0200 evolve: small white space change
Olle Lundberg <geek@nerd.sh> [Sat, 12 Apr 2014 23:16:02 +0200] rev 898
evolve: small white space change
Sat, 12 Apr 2014 23:15:13 +0200 evolve: use new api _callcompressable
Olle Lundberg <geek@nerd.sh> [Sat, 12 Apr 2014 23:15:13 +0200] rev 897
evolve: use new api _callcompressable This changeset makes evolve compatible with the change introduced in 167047ba3cfa
Fri, 04 Apr 2014 01:07:27 +0200 evolve: downcase first word in module doc
Olle Lundberg <geek@nerd.sh> [Fri, 04 Apr 2014 01:07:27 +0200] rev 896
evolve: downcase first word in module doc This makes the output of hg help consistent with the other extensions.
Fri, 04 Apr 2014 00:58:15 +0200 evolve: deprecate gup and gdown aliases
Olle Lundberg <geek@nerd.sh> [Fri, 04 Apr 2014 00:58:15 +0200] rev 895
evolve: deprecate gup and gdown aliases This is done in an effort to clean up the UI of evolve.
Fri, 04 Apr 2014 00:30:56 +0200 evolve: add function to deprecate an alias
Olle Lundberg <geek@nerd.sh> [Fri, 04 Apr 2014 00:30:56 +0200] rev 894
evolve: add function to deprecate an alias When cleaning up the UI for evolve we will deprecate old aliases, but still want them to work for a while. This is a helper function that will be called during the extension setup and has the ability map an old alias to a new or canonical one.
Fri, 04 Apr 2014 01:07:27 +0200 evolve: downcase first word in module doc stable
Olle Lundberg <geek@nerd.sh> [Fri, 04 Apr 2014 01:07:27 +0200] rev 893
evolve: downcase first word in module doc This makes the output of hg help consistent with the other extensions.
Wed, 26 Mar 2014 23:58:45 +0100 evolve: active bookmark should move when using prev/next (#37) stable
Olle Lundberg <geek@nerd.sh> [Wed, 26 Mar 2014 23:58:45 +0100] rev 892
evolve: active bookmark should move when using prev/next (#37) The #37 references the bitbucket issue for mutable-history, that can be found here: https://bitbucket.org/marmoute/mutable-history/issue/37/
Thu, 03 Apr 2014 23:36:23 -0700 commands: small language fixes in help stable
Brendan Cully <brendan@kublai.com> [Thu, 03 Apr 2014 23:36:23 -0700] rev 891
commands: small language fixes in help
Wed, 26 Mar 2014 00:38:14 +0100 evolve: abort when trying to move a node on top of itself
Olle Lundberg <geek@nerd.sh> [Wed, 26 Mar 2014 00:38:14 +0100] rev 890
evolve: abort when trying to move a node on top of itself This provides a clearer error message when evolve misstakenly tries to move a changeset on top of itself. Before we got an abort with a cryptic message about trying to rebase a merge changeset. A proper fix to make sure that evolve never tries to move a node on top of itself will come in later patches.
Wed, 26 Mar 2014 23:57:15 +0100 run-tests: add executable bit
Olle Lundberg <geek@nerd.sh> [Wed, 26 Mar 2014 23:57:15 +0100] rev 889
run-tests: add executable bit
Thu, 27 Mar 2014 11:12:56 -0700 evolve: add a hook related to the new pushobsmarkers command
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 27 Mar 2014 11:12:56 -0700] rev 888
evolve: add a hook related to the new pushobsmarkers command Before the current expericment, people could hook on obsolescence marker push using pushkey. We add a new hook to serve the same purpose.
Wed, 19 Mar 2014 20:15:55 -0700 exchange: dropping dead code (issue36)
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 19 Mar 2014 20:15:55 -0700] rev 887
exchange: dropping dead code (issue36) This variable does not exist anywhere else in the code.
Tue, 18 Mar 2014 12:59:49 -0700 evolve: fix evolve with mercurial default
Matt Mackall <mpm@selenic.com> [Tue, 18 Mar 2014 12:59:49 -0700] rev 886
evolve: fix evolve with mercurial default MODERNCAPS have been renamed to moderncaps upstream.
Wed, 12 Mar 2014 13:07:37 -0700 simple4server: update tests
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 12 Mar 2014 13:07:37 -0700] rev 885
simple4server: update tests Forgot to amend before pushing.
Wed, 12 Mar 2014 13:03:35 -0700 sinmple4server: advertise new cap only when advertising obsolescence
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 12 Mar 2014 13:03:35 -0700] rev 884
sinmple4server: advertise new cap only when advertising obsolescence This is more consistent.
Wed, 12 Mar 2014 13:01:32 -0700 evolve: do not exchange obsolescence markers when server refuse it
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 12 Mar 2014 13:01:32 -0700] rev 883
evolve: do not exchange obsolescence markers when server refuse it The server can be configured to refuse obsolescence markers exchange. See changeset 48804a8d7472 for details about it. We respect server will in the client.
Wed, 12 Mar 2014 12:44:33 -0700 simple4server: option to advertise obsolescence support
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 12 Mar 2014 12:44:33 -0700] rev 882
simple4server: option to advertise obsolescence support We had an option to control the advertising of the obsolescence markers support from the server. The goal of this option is to allow large scale repo hosting service to control the use of obsolescence markers exchange.
Mon, 10 Mar 2014 19:47:24 -0700 export: add test for simple4server
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 10 Mar 2014 19:47:24 -0700] rev 881
export: add test for simple4server We now officially test it over http
Mon, 10 Mar 2014 21:57:41 -0700 exchange: fix push markers over wire protocol for http peer
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 10 Mar 2014 21:57:41 -0700] rev 880
exchange: fix push markers over wire protocol for http peer Http actually interpret the data passed to _callpush expecting them to a bundle. Interpretation of a markers stream as a bundle obviously led to crash.
Mon, 10 Mar 2014 21:55:41 -0700 exchange: expose length of pushed markers
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 10 Mar 2014 21:55:41 -0700] rev 879
exchange: expose length of pushed markers http wireprotocol will need it.
Mon, 10 Mar 2014 22:09:26 -0700 simple4server: update "from <changeset>" statement
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 10 Mar 2014 22:09:26 -0700] rev 878
simple4server: update "from <changeset>" statement Could obviously not do it in the same changeset than the original changes.
Mon, 10 Mar 2014 21:35:54 -0700 exchange: fix changeset pulling over http
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 10 Mar 2014 21:35:54 -0700] rev 877
exchange: fix changeset pulling over http http compress its stream. The were building a bogus stream where the first 10 bytes where uncompressed. Confusing the client.
Mon, 10 Mar 2014 22:08:21 -0700 simple4server: update "from <changeset>" statement
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 10 Mar 2014 22:08:21 -0700] rev 876
simple4server: update "from <changeset>" statement Could obviously not do it in the same changeset than the original changes.
Mon, 10 Mar 2014 21:34:36 -0700 exchange: properly wrap wireprotocol capabilities
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 10 Mar 2014 21:34:36 -0700] rev 875
exchange: properly wrap wireprotocol capabilities Just wrapping the module function only works for ssh. Ssh gets capability through the `hello` command. We also need to wrap the function stored in the command dict. This fix discovery for http peer.
Mon, 10 Mar 2014 17:40:38 -0700 simple4server: add origin and documentation to most function
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 10 Mar 2014 17:40:38 -0700] rev 874
simple4server: add origin and documentation to most function
(0) -1000 -224 +224 +1000 +3000 tip