Tue, 12 Aug 2014 21:02:34 -0400 test: add glob annotations where Mercurial's run-tests.py suggests stable
Matt Harbison <matt_harbison@yahoo.com> [Tue, 12 Aug 2014 21:02:34 -0400] rev 1110
test: add glob annotations where Mercurial's run-tests.py suggests These happen to also be 5 of the 6 tests that warn about no result code when run on Windows. Probably not a coincidence. The tests previously warned about no result code whether or not it was run interactively. They only started working when test output changes were accepted in interactive mode, and these globs were added automatically.
Wed, 03 Sep 2014 21:25:13 -0400 evolve: really fix the 'grab' alias on Windows stable
Matt Harbison <matt_harbison@yahoo.com> [Wed, 03 Sep 2014 21:25:13 -0400] rev 1109
evolve: really fix the 'grab' alias on Windows Something seems to have happened when importing cb36a4eb0157- it dropped the $@ argument to --rev, and it picked up a bunch of test changes for the obsolete sha1 replacement patch. Instead of backing it out and breaking the tests for the sha1 replacement, this just fixes the missing $@.
Wed, 03 Sep 2014 23:56:39 +0200 evolve: keep vague compatibility with 3.1
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 03 Sep 2014 23:56:39 +0200] rev 1108
evolve: keep vague compatibility with 3.1 Matt Mackall work flow requires this to not crash in fire with 3.1. We apply basic bandage to stop the bleeding.
Tue, 02 Sep 2014 20:11:45 +0200 merge: all the stable sweetness into default
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 02 Sep 2014 20:11:45 +0200] rev 1107
merge: all the stable sweetness into default
Sat, 09 Aug 2014 19:12:16 -0400 evolve: replace each obsolete sha1 in the description with its latest successor stable
Matt Harbison <matt_harbison@yahoo.com> [Sat, 09 Aug 2014 19:12:16 -0400] rev 1106
evolve: replace each obsolete sha1 in the description with its latest successor Obsolete csets are hidden by default and don't get pushed to the parent repo. In order to avoid broken references in commit messages, it makes sense to evolve those references to the latest and greatest successor, as each cset containing them is evolved. Of course, stale references can still occur if a commit in branch 'A' references something in branch 'B', and that something in 'B' is evolved but 'A' isn't subsequently evolved. This alleviates the user that is evolving a series of commits from having to 1) recognize that there is a hash that needs updating in any one of the series 2) look up the latest successor manually 3) hg amend -e The regular expression for matching and the logic for replacing are borrowed from the convert extension [1]. It might be nice for the output to state the reason that the reference couldn't be updated (it was pruned, split or diverged), but that may be excessive for something only displayed in verbose mode. (Maybe it should be a ui.status() instead?) [1] http://selenic.com/hg/rev/45562379ce4e
Sat, 09 Aug 2014 18:36:28 -0400 test: add parent hash to commit message in test-evolve.t stable
Matt Harbison <matt_harbison@yahoo.com> [Sat, 09 Aug 2014 18:36:28 -0400] rev 1105
test: add parent hash to commit message in test-evolve.t This (slightly) reduces the changes to the test when hashes in the commit message are evolved in the next commit.
Tue, 12 Aug 2014 19:09:53 -0400 evolve: fix the 'grab' alias to work on Windows stable
Matt Harbison <matt_harbison@yahoo.com> [Tue, 12 Aug 2014 19:09:53 -0400] rev 1104
evolve: fix the 'grab' alias to work on Windows For some reason, the variable wasn't substituted on Windows in this case. From the test suite: $ hg grab 8 '' is not recognized as an internal or external command,\r (esc) operable program or batch file.\r (esc) This change seems hacky, but there isn't a readily available example of setting up a shell alias like this from a python module to know if there is a better way, and it seems like this is maybe just a convenience for tests, since there is no documentation for the aliases. The local copy of run-tests.py appears to predate the Windows support in the Mercurial repository's version, and fails each test with: The system cannot find the path specified. However, with this change and blacklisting test-simple4server.t, the tests can (mostly) be run on Windows like so: $ ../../hg/tests/run-tests.py --with-hg=../../hg/hg --blacklist windows Skipped test-simple4server.t: blacklisted Warned test-obsolete.t: no result code from test Warned test-tutorial.t: no result code from test Warned test-evolve.t: no result code from test Warned test-userguide.t: no result code from test Warned test-sharing.t: no result code from test Warned test-drop.t: no result code from test Failed test-prune.t: output changed # Ran 41 tests, 1 skipped, 6 warned, 1 failed.
Sun, 24 Aug 2014 01:02:18 +0530 debian: add README to the list of documents shipped with the package. stable
Faheem Mitha <faheem@faheem.info> [Sun, 24 Aug 2014 01:02:18 +0530] rev 1103
debian: add README to the list of documents shipped with the package.
Sun, 24 Aug 2014 01:42:34 +0530 debian: add missing curl Build-Depends stable
Faheem Mitha <faheem@faheem.info> [Sun, 24 Aug 2014 01:42:34 +0530] rev 1102
debian: add missing curl Build-Depends curl is required to run the tests.
Fri, 25 Apr 2014 14:14:29 -0700 prune: work around lazy revset slowdown stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 25 Apr 2014 14:14:29 -0700] rev 1101
prune: work around lazy revset slowdown Since 3.0 lazy revset is making some revset very slow. We currently work around the issue by using a simple loop instead.
Tue, 02 Sep 2014 19:19:17 +0200 readme: act that there will not be a 4.1.1 release stable
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 02 Sep 2014 19:19:17 +0200] rev 1100
readme: act that there will not be a 4.1.1 release
Fri, 29 Aug 2014 14:26:17 +0200 evolve: write a status message when the working directory changes stable
David Soria Parra <davidsp@fb.com> [Fri, 29 Aug 2014 14:26:17 +0200] rev 1099
evolve: write a status message when the working directory changes Evolve changes the working directory during atop, etc which can confuse people as they are not aware that this happend. The ideal solution is to not have evolve change it, however mercurial limitations don't allow us to do that at the moment. So instead we are printing a status message that the working directory changed.
Fri, 29 Aug 2014 09:29:02 +0200 merge small default improvement before dropping compat with released Mercurial stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 29 Aug 2014 09:29:02 +0200] rev 1098
merge small default improvement before dropping compat with released Mercurial We are going to drop a bunch of compatibility layer.
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
(0) -1000 -120 +120 +1000 +3000 tip