Durham Goode <durham@fb.com> [Mon, 06 Apr 2015 11:21:20 -0700] rev 1242
setup: allow including inhibit in the build
Adds the INCLUDE_INHIBIT environment variable to allow including the inhibit
extension in the build.
Laurent Charignon <lcharignon@fb.com> [Tue, 31 Mar 2015 14:17:46 -0700] rev 1241
inhibit: Add -D option to the bookmark command
The -D option for bookmark is similar to the -B option for strip.
It deletes the bookmark and prunes the changes underneath it that are
not reachable.
Laurent Charignon <lcharignon@fb.com> [Wed, 01 Apr 2015 13:51:21 -0700] rev 1240
inhibit: don't leave any obsolete commit visible after closing transaction
We add a callback to wrap the transaction closure to identify commits that are
obsolete and visible. We inhibit them to prevent the user to see instability in the UI.
Laurent Charignon <lcharignon@fb.com> [Thu, 02 Apr 2015 18:33:44 -0700] rev 1239
evolve: apply prune update before creating obsolescence markers
Prune used to compute the destination commit to update to after creating the
obsolescence markers. This is a commit to prevent a bug that would occur
with the changes in inhibit for transactions (next commit).
Indeed, with that change in inhibit, when creating the obsolescence markers in
prune, they would get inhibited right away and we wouldn't update to the first
non obsolete parent but stay on the same node as its obsolescence would have
been inhibited (bug).
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 03 Apr 2015 11:35:46 -0700] rev 1238
test-inhibit: check graph after prune
We want to ensure prune keep working even with inhibit.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 03 Apr 2015 11:34:02 -0700] rev 1237
test-inhibit: drop trailing white space
Laurent Charignon <lcharignon@fb.com> [Thu, 02 Apr 2015 15:44:11 -0700] rev 1236
tests: make tests work on Mac OS
wc -m adds spacing before the results, we trim them to make the test pass on
Mac OS.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 01 Apr 2015 16:47:22 -0700] rev 1235
merge with stable
Laurent Charignon <lcharignon@fb.com> [Mon, 30 Mar 2015 13:31:09 -0700] rev 1234
inhibit: ensure that no obsolete changesets are visible after a bookmark change
When creating a bookmark, we could reveal obsolete changesets. We are
inhibiting the obsolete changesets resulting from a bookmark change.
There are two ways to record bookmark changes to disk and we wrap both.
Laurent Charignon <lcharignon@fb.com> [Mon, 30 Mar 2015 11:45:17 -0700] rev 1233
inhibit: ensure no visible changesets are obsolete after an update
When updating to a commit we want to inhibit any obsolete commit affecting
the changeset we are updating to. In other words we don't want any
visible commit to be obsolete.
Laurent Charignon <lcharignon@fb.com> [Fri, 27 Mar 2015 10:58:04 -0700] rev 1232
inhibit: enable direct access from parsing the revset tree
To enable direct access we:
- detect explicit hexadical reference to node in the revset tree
- add these hashes to the static blockers to make them and their parent
visible for the command to run
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 01 Apr 2015 14:44:12 -0700] rev 1231
Added tag 5.1.2 for changeset e886bc501796
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 01 Apr 2015 14:40:40 -0700] rev 1230
preparing version 5.1.2
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 01 Apr 2015 14:43:13 -0700] rev 1229
update 5.1.2 with latest bugfix
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 01 Apr 2015 14:37:02 -0700] rev 1228
evolve: have a stable manifest content when solving bumped
We cannot really use iteritems here.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 01 Apr 2015 14:26:10 -0700] rev 1227
evolve: change config option name
I forgot to amend...
Durham Goode <durham@fb.com> [Wed, 15 Oct 2014 15:41:26 -0700] rev 1226
config: allow disabling commands
Now that upstream Mercurial has multiple options for obsolete configuration, we
can allow enabling and disabling of evolve commands.
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 07 Mar 2015 02:32:43 -0800] rev 1225
inhibit: Add some inhibition clearing mechanism
We do not want to keep inhibition marker around for ever. So we are removing the
one applying on public changeset.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 06 Mar 2015 21:25:44 -0800] rev 1224
add a 'inhibit' extension
This extension will be used to reduce the scope of evolve in order to make some
of its features available to the mass earlier.
See extension documentation for details.
Matt Harbison <matt_harbison@yahoo.com> [Sat, 21 Mar 2015 19:09:56 -0400] rev 1223
tests: use 'wget' instead of 'curl' for Windows compatibility
The whole test suite now runs without skips, and the only two failures are a
bookmark cache issue in test-prune.t, and a local output vs remote output
reordering when pushing to ssh. The latter anyway is a core problem.
Matt Harbison <matt_harbison@yahoo.com> [Sat, 21 Mar 2015 18:42:51 -0400] rev 1222
tests: import killdaemons.py from Mercurial 1cfded2fa1a9
This contains updated functionality to kill the server process on Windows, which
is needed to run the test-*server.t tests. This version requires the pids to be
passed as an argument instead of via $DAEMON_PIDS.
Durham Goode <durham@fb.com> [Fri, 20 Mar 2015 12:51:57 -0700] rev 1221
prune: add --keep to not touch the working copy
In order to more closely emulate strip, lets add --keep to leave the working
copy untouched when we do our prune.
Durham Goode <durham@fb.com> [Thu, 19 Mar 2015 12:31:51 -0700] rev 1220
strip: add the option for wrapping the strip command
Adds an experimental option for wrapping the existing strip command and
replacing its functionality with prune. It currently doesn't handle the --keep
case, but an upcoming patch will address that.
Durham Goode <durham@fb.com> [Thu, 19 Mar 2015 12:32:32 -0700] rev 1219
wrapcommand: fix wrapping extensions that aren't enabled
The extension command wrapping would previously fail if the extension wasn't
enabled. Let's just eat that silently.
Durham Goode <durham@fb.com> [Thu, 19 Mar 2015 10:52:28 -0700] rev 1218
wrapcommand: allow adding additional arguments to commands
This allows eh.wrapcommand to specify additional parameters to be added to the
commands being wrapped. This will be useful when wrapping strip in the future.
Durham Goode <durham@fb.com> [Thu, 19 Mar 2015 17:42:21 -0700] rev 1217
pushexperiment: remove use of obsolete._enabled
pushexperiment.py was using obsolete._enabled but it didn't cause any tests to
fail so I didn't see it. Let's go ahead and replace it with the new
obsolete.isenabled() api.
Durham Goode <durham@fb.com> [Thu, 19 Mar 2015 13:42:27 -0700] rev 1216
oldobsolete: remove use of obsolete._enabled
obsolete._enabled is deprecated. Switch to the newer obsolete.isenabled() logic.
Durham Goode <durham@fb.com> [Thu, 19 Mar 2015 13:41:58 -0700] rev 1215
server4simple: remove use of obsolete._enabled
obsolete._enabled is deprecated, so let's replace it's uses.
Durham Goode <durham@fb.com> [Tue, 17 Mar 2015 19:04:16 -0700] rev 1214
config: remove uses of obsolete._enabled
Upstream Mercurial will be removing obsolete._enabled soon, so switch all our
uses of it to use the new obsolete.isenabled(repo, option) function.
Durham Goode <durham@fb.com> [Tue, 17 Mar 2015 19:03:27 -0700] rev 1213
config: enable all obsolete options
Upstream Mercurial has moved away from obsolete._enabled as the obsolete flag to
a series of options. This patch makes evolve enable all the options
automatically if the user hasn't enabled any already. This preserves the
existing evolve experience of not having to configure anything.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 13 Mar 2015 10:49:02 -0700] rev 1212
merge with stable
Durham Goode <durham@fb.com> [Fri, 13 Mar 2015 09:05:34 -0700] rev 1211
evolve: fix manifest usage to match upstream
The manifest class upstream is no longer a dictionary, so switch to using an API
it does support.
Durham Goode <durham@fb.com> [Fri, 13 Mar 2015 09:04:12 -0700] rev 1210
drophack: fix to match upstream repair.strip
repair.strip upstream now assumes the input nodelist is a list, so update to
match it. The upstream change only affects the name of the backup bundle, so
this shouldn't affect any other functionality.
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Mar 2015 20:02:07 -0500] rev 1209
evolve: prevent a crash in httpclient_pushobsmarkers() when pushing
I've been running into a crash when pushing from my hg repo in a Fedora 16 VM to
Win7 running 'hg serve', even with extensions disabled on both sides:
../hg push -r . pc
pushing to http://192.168.1.4:8000/
searching for changes
no changes found
pushing 2 obsolescence markers (263 bytes)
** unknown exception encountered, please report by visiting
...
File "hg-evolve/hgext/evolve.py", line 2482, in _pushobsolete
remote.evoext_pushobsmarkers_0(obsdata)
File "hg-evolve/hgext/evolve.py", line 2522, in httpclient_pushobsmarkers
ret, output = self._call('evoext_pushobsmarkers_0', data=obsfile)
ValueError: too many values to unpack
I'm not sure how this repo differs from the one in the test suite, so I'm not
sure how to craft a test for this. The failure occurs even when there _are_
csets to push. There was no crash if no obsolete markers needed to be pushed.
At any rate, this code was stolen from httppeer._callpush(), where it calls
self._call(). The socket exception handling wasn't necessary to fix the crash,
but the calling code might as well be duplicated in its entirety.
A successful push with this patch looks like this. Note the final line is _not_
in the output of the http push in test-simple4server.t:
../hg push -r . pc
pushing to http://192.168.1.4:8000/
searching for changes
remote has heads on branch 'default' that are not known locally: 3af110194a0c
56000e3ae44d 57ac6e51d290 7da4355c21b8 and 8 others
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 0 changes to 1 files (+1 heads)
pushing 4 obsolescence markers (525 bytes)
remote: 2 obsolescence markers added
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 05 Mar 2015 10:52:01 -0800] rev 1208
merge stable into default
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 05 Mar 2015 10:45:53 -0800] rev 1207
Added tag 5.1.1 for changeset 9b8628e0a142
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 05 Mar 2015 10:45:40 -0800] rev 1206
prepare release 5.1.1
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 05 Mar 2015 10:44:43 -0800] rev 1205
update readme
Yuya Nishihara <yuya@tcha.org> [Thu, 29 Jan 2015 22:53:43 +0900] rev 1204
evolve: use 3.2+ fullreposet to evaluate argument set (issue4515)
getset() has no compatibility wrapper for old-style argument and we don't
want to add more hacks in Mercurial core.
Mathias De Maré <mathias.demare@gmail.com> [Mon, 02 Mar 2015 20:12:00 +0100] rev 1203
evolve: cache marker encoding to avoid performance degradation
The main overhead in bug 4518 is caused by calculating relevant markers
and encoding markers into the correct format.
Calculating relevant markers takes (worst case) ~ 0.12 seconds.
Encoding markers takes (worst case) ~ 0.06 seconds.
Caching encoded markers takes care of the second part and
speeds up cloning in bug 4518 by about 35%.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 06 Feb 2015 17:01:28 +0000] rev 1202
evolve: handle invalid obsmarkers in the `debugobsconvert`
User can now recover from such situation, The error message is also changed to
point the `debugobsconvert` commands.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 06 Feb 2015 16:58:42 +0000] rev 1201
fix release date in the readme
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 30 Jan 2015 22:05:40 +0000] rev 1200
merge stable in default
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 30 Jan 2015 22:05:07 +0000] rev 1199
Added tag 5.1.0 for changeset bfe9be352453
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 30 Jan 2015 22:02:31 +0000] rev 1198
update readme and bump version to 5.1
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 30 Jan 2015 21:57:41 +0000] rev 1197
merge default into table
3.3 is about to be released.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 30 Jan 2015 20:29:33 +0000] rev 1196
discovery: filter null from the discovery revset
If there is nothing in common, common will be "null" and the revset will now
returns "-1" crashing the discovery process. We filter out the null revision to
prevent that.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 30 Jan 2015 19:01:23 +0000] rev 1195
tests: update to new core output
Multiple output change need to be applied to the test suite.
Tyrone Nicholas <tnicholas@fb.com> [Tue, 27 Jan 2015 16:07:57 +0000] rev 1194
evolve: explicitly disable bookmark on evolve (issue4432)
We no longer leave the current bookmark active after an evolve, since it
is no longer pointing to the working directory.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 07 Jan 2015 15:24:47 -0800] rev 1193
discovery: do not build sample if undecided is smaller than sample size
This prevents crash with coming change in the mercurial discovery.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 05 Jan 2015 19:04:32 -0800] rev 1192
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 23 Dec 2014 14:29:16 -0600] rev 1191
init: don't abort Mercurial on version mismatch
Evolve causes Mercurial to exit if there is a version mismatch, even
if no evolve command is invoked. This is a headache for people who
have to work with multiple versions of Mercurial. Instead, raise an
ImportError, which gives a warning but otherwise allows Mercurial to
run non-evolve commands.
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 14 Dec 2014 12:45:04 -0800] rev 1190
Added tag 5.0.2 for changeset dbd0733e5840
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 14 Dec 2014 12:44:40 -0800] rev 1189
prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 14 Dec 2014 12:19:40 -0800] rev 1188
test: adapt to core change in graft and rebase
The ouput changed we have to adapt
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 14 Dec 2014 12:14:45 -0800] rev 1187
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 14 Dec 2014 11:45:27 -0800] rev 1186
doc: drop rebase extension activation
The dependency have been dropped.
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 13 Dec 2014 18:19:12 -0800] rev 1185
evolve: remove the dependency to the rebase extension
We do not use any rebase internal anymore.
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 13 Dec 2014 18:09:23 -0800] rev 1184
evolve: remove the use of `rebase.concludenode`
Half of this function is now done in `merge.graft` and the over part is easy to
redo manually. So we remove the usage of this function to remove the dependency
of evolve on the rebase extension.
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 13 Dec 2014 17:47:09 -0800] rev 1183
evolve: use `merge.graft` instead of `rebasenode`
The core mechanism is properly factorised and have a more stable API.
This is also a good step toward removing the dependency between evolve and the
rebase extension.
This also avoid a breakage with the future 3.3 where some of the rebase API
changed.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 08 Dec 2014 12:45:32 -0800] rev 1182
readme: add a reference to the bugtracker in the contribute section
Idea from Patrick Mezard
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 30 Nov 2014 00:11:06 -0800] rev 1181
merge with stable
Faheem Mitha <faheem@faheem.info> [Fri, 28 Nov 2014 21:32:35 +0530] rev 1180
debian: update changelog to 5.0.1
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 30 Nov 2014 00:06:31 -0800] rev 1179
test: adapt test to stable output
Stable branch should pass test with mercurial stable branch.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 25 Nov 2014 11:02:09 -0800] rev 1178
Added tag 5.0.1 for changeset 0f3090785283
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 25 Nov 2014 11:01:29 -0800] rev 1177
evolve: update in file version
(I'll eventually -not- forget to do so)
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 25 Nov 2014 10:52:33 -0800] rev 1176
Added tag 5.0.1 for changeset 51e1e962172c
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 25 Nov 2014 10:49:39 -0800] rev 1175
readme: prepare for release 5.0.1
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 25 Nov 2014 10:48:59 -0800] rev 1174
readme: update changelog
Martin von Zweigbergk <martinvonz@google.com> [Thu, 20 Nov 2014 16:12:04 -0800] rev 1173
evolve: tell user which "base of divergent changeset" is not found
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 20 Nov 2014 15:49:52 -0800] rev 1172
debugobsconvert: fix 6f08a8f6bb1d and add proper test
The changeset adding deduplication (6f08a8f6bb1d) was super buggy and dropped
all obsmarkers in the repo. We update the test to check this case and fix the
deduplication.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 20 Nov 2014 15:34:34 -0800] rev 1171
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 20 Nov 2014 15:33:59 -0800] rev 1170
debugobsconvert: fix a typo on "version"
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 20 Nov 2014 15:33:14 -0800] rev 1169
debugobsconvert: also deduplicate markers in the process
Various bug allowed identical or semantically identical marker to be added to
the repository. So we also filter duplicates when converting.
André Sintzoff <andre.sintzoff@gmail.com> [Thu, 20 Nov 2014 22:05:29 +0100] rev 1168
evolve: fix capitalization in docstring for commands
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 17 Nov 2014 16:04:48 +0100] rev 1167
test: ensure we echo prompt
Tool running using the shipped 'run-tests.py' instead of the mercurial one would
get different result otherwise.
Julien Cristau <julien.cristau@logilab.fr> [Mon, 13 Oct 2014 11:09:35 +0200] rev 1166
debian: blacklist simple4server tests
simple4server is not part of the package.
Julien Cristau <julien.cristau@logilab.fr> [Mon, 13 Oct 2014 10:22:24 +0200] rev 1165
debian: blacklist test-drop
drophack.py is not shipped.
Julien Cristau <julien.cristau@logilab.fr> [Mon, 17 Nov 2014 15:49:39 +0100] rev 1164
debian: update control file to reflect dependency to mercurial 3.2
Julien Cristau <julien.cristau@logilab.fr> [Mon, 17 Nov 2014 15:45:24 +0100] rev 1163
evolve: fix the version number
The tag is 5.0.0 the content of the file was wrong.
Mike Edgar <adgar@google.com> [Tue, 18 Nov 2014 20:27:53 -0500] rev 1162
help: fix typo in help for 'obsolete' option added to import command
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 14 Nov 2014 09:54:55 +0000] rev 1161
test: add an explicit test for simple4server with bundle2
This makes it more likely to we catch issue with the iteration of these two.
Ryan McElroy <rmcelroy@fb.com> [Wed, 29 Oct 2014 10:34:08 -0700] rev 1160
Make next/prev only move bookmarks optionally
Augie Fackler <raf@durin42.com> [Mon, 20 Oct 2014 22:16:24 -0400] rev 1159
obsup: hack extension to make in-place upgrading of obsolete markers easy
I tried upgrading my obsstore by doing a local clone as suggested by
Pierre-Yves and Sean, but that caused me to end up with a ton of
unstable changes that should have been marked dead. In fact, as far as
I can tell, most of the performance win of that upgrade came from the
fact that only about 46% (46672 of 102285) of my markers were brought
over with the copy-and-pull method.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 11 Nov 2014 15:48:02 +0000] rev 1158
merge stable into default
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 11 Nov 2014 12:38:49 +0000] rev 1157
evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
The evolve algorithm picked a bad changesets to evolve (unstable changeset with
no obsolete parent (but unstable parent). And then get confused assuming that is
the first parent was not obsolete, the second should be.
This changeset fixed the issue by preventing selection of direct descendant of
[.] when evolving.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 11 Nov 2014 11:28:01 +0000] rev 1156
merge
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 11 Nov 2014 11:26:57 +0000] rev 1155
merge back with compat branch
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 11 Nov 2014 11:26:18 +0000] rev 1154
create a branch compatible with mercurial between 3.0.1 and 3.1.2
Martin von Zweigbergk <martinvonz@google.com> [Wed, 05 Nov 2014 15:35:13 -0800] rev 1153
evolve: fix suggested commands in "parents are not common" hint
The argument to 'hg rebase' is --dest, not -dest. Also, the same
command should not be suggested twice -- the second option should be
the rebasing the other way around.
Martin von Zweigbergk <martinvonz@google.com> [Wed, 05 Nov 2014 15:32:25 -0800] rev 1152
evolve: add missing newlines in "parents are not common" hint
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Nov 2014 11:41:10 +0000] rev 1151
test-touch: add a test for rename preservation after touch
This bug was recently fixed in 3.2.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Nov 2014 11:11:14 +0000] rev 1150
evolve: fix error during iteration over bumped changesets (bug38)
We are iterating over a manifest while altering it. We cannot use iteritems() in
this context. we move to items, that will be an issue for very large changesets.
anatoly techtonik <techtonik@gmail.com> [Mon, 20 Oct 2014 13:54:46 +0300] rev 1149
evolve: add various version info to save time on troubleshooting
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Nov 2014 10:25:20 +0000] rev 1148
readme: drop the mention to the wip repo
The time spend in work in progress repo are fairly low nowaday.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Nov 2014 10:24:35 +0000] rev 1147
readme: update the contribution process
The inability to easily pull from pull request on bitbucket and the lack of
obsolescence support there are too much pain. Patchbombed contribution are
flowing so we drop the bitbucket mention in the README.
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 02 Nov 2014 15:06:00 +0000] rev 1146
merge 5.x line into stable (drop pre hg-3.2 compat)
Matt Harbison <matt_harbison@yahoo.com> [Mon, 29 Sep 2014 21:31:27 -0400] rev 1145
evolve: add the missing newline to output messages where needed
Matt Harbison <matt_harbison@yahoo.com> [Mon, 29 Sep 2014 21:23:09 -0400] rev 1144
evolve: add the missing argument to a debug statement
Nathan Goldbaum <ngoldbau@ucsc.edu> [Tue, 28 Oct 2014 18:06:28 -0700] rev 1143
uncommit: abort when rev specifies the current changeset
The uncommit command now fails when the rev argument indicates the current
changeset. Previously this aborted in the changeset obsolescence machinery when
the current commit tries to obsolete itself.
Using the rev argument like this indicates a misunderstanding, so printing an
uncommit-specific error should make it easier to understand what went wrong.
Matt Harbison <matt_harbison@yahoo.com> [Tue, 28 Oct 2014 23:18:56 -0400] rev 1142
test-amend: add a test for amend with no configured username (issue4211)
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 01 Nov 2014 13:48:34 +0000] rev 1141
evolve: preserve branch change
evolve will now preserve branch change. If the evolved changeset had a different
phases than its parent, this branch name will be preserved. This allow
propagation of branch change during amend but do not overwrite special branch
name on children,
Matt Harbison <matt_harbison@yahoo.com> [Sat, 25 Oct 2014 22:25:42 -0400] rev 1140
amend: allow the --logfile argument to work properly
Though documented to work, using --logfile previously set the message option to
that of the parent commit, and cause amend to abort with this message:
abort: options --message and --logfile are mutually exclusive
It's not clear why the 'edit' option is popped, but this option is only fetched
in order to let the core commit command do the work.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Oct 2014 15:05:54 -0700] rev 1139
Added tag 5.0.0 for changeset c13b408c0006
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Oct 2014 15:03:49 -0700] rev 1138
setup.py: bump version to 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Oct 2014 15:03:17 -0700] rev 1137
evolve: update tested with statement
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Oct 2014 15:01:37 -0700] rev 1136
README: update for 5.0 release
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Oct 2014 14:58:06 -0700] rev 1135
fixup previous changesets (after forgot to amend).
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 20 Oct 2014 15:59:34 -0700] rev 1134
prune: stop reinjecting all selected revisions back into the revrange
This trigger quadratic complexity for no good reason.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 20 Oct 2014 15:53:00 -0700] rev 1133
test: adapt to new hidden-changeset message
From c1aede895072 we have a nicer error message when accessing public
changesets:
abort: hidden revision '6'!
(use --hidden to access hidden revisions)
Augie Fackler <raf@durin42.com> [Fri, 17 Oct 2014 17:43:52 -0400] rev 1132
pullobsolete: handle migration from todosteps to donesteps
This make evolve compatible with change made in Mercurial (92bf9abc4deb)
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 16 Oct 2014 04:38:37 -0700] rev 1131
evolve: adapt to change in core rebase
Mercurial core changeset 63e889cc610d (And the ones around it) changed the way
graft and rebase work. We adapt to them.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 16 Oct 2014 14:06:52 -0700] rev 1130
test: ignore bytes lenght in message
We should be storying floating point number as floating point number. So the
size of the meta for fm0 format is going to be unstable. We cover them with a
glob.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 16 Oct 2014 04:20:00 -0700] rev 1129
evolve: adapt to the new metadata storage
Metadata are not stored as a "list" of (key, value) tuple instead of a binary
blob.
This adapt to ef880e28e56a in Mercurial.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 16 Oct 2014 11:54:44 -0700] rev 1128
debugobsstorestats: drop the average meta length
Does not have much sense with the existence of multiple format with different
meta storage. We drop it for now and will introduce and average markers length
later.
Faheem Mitha <faheem@faheem.info> [Sat, 11 Oct 2014 02:27:21 +0530] rev 1127
debian: remove .PHONY line completely
This does not work in the case of implicit pattern matching rules as
used by dh. Consider this example from Geoffrey Thomas:
$ ls -l
total 16
-rw-r--r-- 1 faheem faheem 17 Aug 16 20:27 blue.c
-rw-r--r-- 1 faheem faheem 17 Aug 16 20:27 green.c
-rw-r--r-- 1 faheem faheem 35 Aug 16 20:26 Makefile
-rw-r--r-- 1 faheem faheem 17 Aug 16 20:27 red.c
$ cat Makefile
%: %.c
gcc -o $@ $<
.PHONY: blue
$ make red
gcc -o red red.c
$ make green
gcc -o green green.c
$ make blue
make: Nothing to be done for blue'.
The Make manual
(http://www.gnu.org/software/make/manual/make.html#Phony-Targets) says
Since it knows that phony targets do not name actual files that
could be remade from other files, make skips the implicit rule
search for phony targets (see Implicit Rules).
Thanks to the good folks on #debian-mentors on OFTC for instruction
and explanation in these matters.
Faheem Mitha <faheem@faheem.info> [Sat, 11 Oct 2014 02:14:12 +0530] rev 1126
debian: replace clean with override_dh_auto_clean
The current version does not call the default dh_auto_build, which is
a bug. This is required in particular for cleaning the build
directories.
Faheem Mitha <faheem@faheem.info> [Sat, 11 Oct 2014 04:23:22 +0530] rev 1125
debian: replace build line with a override_dh_auto_build line
This is more in line with how dh is supposed to work. In particular,
dh_auto_build is functionally equivalent to the repeated "dh build
--with python2 --buildsystem=python_distutils" used currently.
Faheem Mitha <faheem@faheem.info> [Sat, 11 Oct 2014 02:02:05 +0530] rev 1124
debian: remove clean target before implicit match rule
This is redundant because it is a match-everything rule. Possibly a
typo.
Faheem Mitha <faheem@faheem.info> [Sat, 11 Oct 2014 02:36:46 +0530] rev 1123
debian: Add DH_VERBOSE, commented out, for debugging convenience
Matt Harbison <matt_harbison@yahoo.com> [Thu, 02 Oct 2014 21:10:48 -0400] rev 1122
evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 08 Oct 2014 18:17:21 -0700] rev 1121
drophack: use `first` and `last` on smartset
This matches the new changes in mercurial core.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 08 Oct 2014 18:16:52 -0700] rev 1120
evolve: use `first` and `last` on revset
this match change in mercurial core.
G: changed hgext/evolve.py
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 02 Oct 2014 15:53:54 -0500] rev 1119
test: adapt to core mercurial 9ab18a912c44
This changesets improved the output of prompt during test.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 02 Oct 2014 15:50:07 -0500] rev 1118
evolve: adapt to core changeset 4f14303e8954
pushop.ret is now pushop.cgresult
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 02 Oct 2014 14:16:32 -0500] rev 1117
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 30 Sep 2014 10:27:11 -0500] rev 1116
evolve: update evolve merge message
People are apparently unaware of --succ
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 30 Sep 2014 10:27:54 -0500] rev 1115
import: fix the "is None" check for the Node
We are checking the wrong variable.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 22 Sep 2014 17:27:57 -0700] rev 1114
test: remote "date" from the output of obsmarker meta
Data is no longer a generic meta. it has its own field now.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 22 Sep 2014 17:24:23 -0700] rev 1113
test: adapt to mercurial changes
Changeset 816be4ca4ae2 in core make hg config return non-zero when no value
match the filter.
Siddharth Agarwal <sid0@fb.com> [Wed, 17 Sep 2014 13:38:24 -0700] rev 1112
evolve: wrap setparents calls in begin/endparentchange
Mercurial rev d259322a394b added a requirement to wrap any dirstate.setparents
calls and their associated dirstate changes in begin/endparentchange.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 04 Sep 2014 09:06:18 +0200] rev 1111
merge with stable
A couple of test fix were added on 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.
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 $@.
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.
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
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
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.
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.
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.
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.
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.
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
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.
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.
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
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.
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
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.
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
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
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.
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 27 Jul 2014 23:09:45 +0200] rev 1089
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 29 Aug 2014 11:56:16 +0200] rev 1088
drop the debug output
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.
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!!
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 17:55:20 +0200] rev 1084
evolve: display more message
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 17:31:21 +0200] rev 1082
pull: drop the custom bundle2 part
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.
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
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.
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.
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.
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.
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 12:04:57 +0200] rev 1074
evolve: remove unused drop random
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
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.
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 27 Aug 2014 10:22:50 +0200] rev 1070
drop relevant marker compat
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.
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`
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.
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
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.
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
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 18 Aug 2014 15:57:44 -0700] rev 1063
merge with 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.
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.
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 15 Aug 2014 12:56:01 -0700] rev 1059
merge with stable
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(.)'
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 14 Aug 2014 15:26:55 -0700] rev 1056
merge with 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.
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
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 10 Aug 2014 23:58:31 -0700] rev 1053
README: fix version number
Faheem Mitha <faheem@faheem.info> [Mon, 11 Aug 2014 01:57:09 +0530] rev 1052
relocate: fix typo
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 23:16:24 -0700] rev 1051
merge back with 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
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 23:15:26 -0700] rev 1049
pkg: prepare release 4.1.0
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
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.
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 21:06:48 -0700] rev 1045
doc: forgotten amend
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.
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.
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.
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.
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
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
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.
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
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.
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.
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.
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 15:55:04 -0700] rev 1032
merge with 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
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 15:43:07 -0700] rev 1030
evolve: prepare release 4.0.1
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
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 15:40:19 -0700] rev 1028
evolve: update readme
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 15:33:39 -0700] rev 1027
evolve: update tested with statement
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
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.
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.
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
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 17:14:00 -0700] rev 1022
uncommit tr
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.
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)
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 17:40:55 -0700] rev 1019
prune: lock inside the try
tss…
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 06 Aug 2014 17:37:28 -0700] rev 1017
evolve: drop useless wlock in rewrite
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.
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.
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
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 30 Jul 2014 13:40:40 -0700] rev 1013
merge with 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.
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.
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
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 30 Jul 2014 13:24:19 -0700] rev 1009
readme: update the official documentation location
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.
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.
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).
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.
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.
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.
Nathan Goldbaum <ngoldbau@ucsc.edu> [Thu, 24 Jul 2014 12:02:53 -0700] rev 1002
uncommit: improve error message for use with no arguments
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.
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
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
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.
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.
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.
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.
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.
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 26 Jun 2014 15:31:49 +0100] rev 992
merge with 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
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.
Greg Ward <greg@gerg.ca> [Mon, 23 Jun 2014 21:03:57 -0400] rev 989
test-obsolete: explicitly show which changesets are divergent
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 23 Jun 2014 02:31:53 -0700] rev 988
merge with stable
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)
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
Greg Ward <greg@gerg.ca> [Sun, 22 Jun 2014 12:01:11 -0400] rev 985
amend: add -U/--current-user option (inspired by mq)
Greg Ward <greg@gerg.ca> [Sat, 21 Jun 2014 18:31:21 -0400] rev 984
tests: fix grammar, spelling, punctuation in comments
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.
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".
Greg Ward <greg@gerg.ca> [Fri, 06 Jun 2014 17:21:59 -0400] rev 981
docs: update copyright statement used by sphinx
Greg Ward <greg@gerg.ca> [Fri, 06 Jun 2014 17:20:30 -0400] rev 980
docs: add concepts guide (the set theory behind obsolescence)
Greg Ward <greg@gerg.ca> [Fri, 06 Jun 2014 17:19:17 -0400] rev 979
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca> [Thu, 05 Jun 2014 22:11:04 -0400] rev 978
docs: add new user guide
This has also been reviewed to death on evolve-testers. There are
still a couple of short sections to write (clearly marked "TODO"), and
one example to add. But (if I may be so bold) this is a gigantic
improvement over the current docs, so it really should get merged.
Incidentally, the figures are all SVG files created with Inkscape.
They're not perfect, but they're pretty nice. Anyone who knows a
better way to create technical diagrams is welcome to contribute.
One wart: there's a test script that accompanies the document and
largely duplicates it, but I haven't unified them. I've been
concentrating on writing the best possible content, not on fiddling
with tools. I suspect that unifying them will be non-trivial, but
definitely worth doing.
Greg Ward <greg@gerg.ca> [Thu, 05 Jun 2014 21:57:34 -0400] rev 977
docs: rewrite index page (including dangling links to future docs)
This has been reviewed to death on the evolve-testers mailing list.
I've made some minor tweaks since the last round of reviews, but the
main content is the same.
Greg Ward <greg@gerg.ca> [Fri, 06 Jun 2014 17:43:45 -0400] rev 976
amend: add -D/--current-date option, just like mq's qrefresh has
Carefully designed so we can easily add -D to other changeset-creating
commands (probably anything that takes -d), and so that we can add
-U/--current-user as well. When that's done, the date and user options
should be very similar to those in MQ.
Greg Ward <greg@gerg.ca> [Thu, 05 Jun 2014 21:27:28 -0400] rev 975
amend: explicitly test -d option
Greg Ward <greg@gerg.ca> [Thu, 05 Jun 2014 21:27:06 -0400] rev 974
amend: in tests, do not rely on defaults -- always use explicit -d
Having a default -d option will make it hard to test
-D/--current-date, which is coming shortly: presence of -d overrides
-D, just like with mq's qrefresh.
Greg Ward <greg@gerg.ca> [Thu, 05 Jun 2014 18:07:39 -0400] rev 973
evolve: fix createmarkers() wrapper to accept an iterable
Docstring in mercurial.obsolete says "<relations> must be an iterable
of ...", and hgsubversion takes it at its word and passes a generator.
Until around Mercurial 3.0, this did not cause any problems, but now
it does: in a repo with both evolve and hgsubversion enabled, pushing
to Subversion when obsolete changesets are present causes a crash:
[...]
File "/home/gward/src/hgsubversion/hgsubversion/wrappers.py", line 346, in push
obsolete.createmarkers(repo, relations)
File "/home/gward/src/hg-stable/mercurial/extensions.py", line 196, in wrap
return wrapper(origfn, *args, **kwargs)
File "/home/gward/src/hg-evolve/hgext/evolve.py", line 332, in _createmarkers
relations[idx] = (prec, sucs, meta)
TypeError: 'generator' object does not support item assignment
Since hgsubersion is playing by the documented rules, evolve must be
the guilty party here.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 16:45:02 -0700] rev 972
merge with 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 16:44:24 -0700] rev 971
Added tag 4.0.0 for changeset 0304fc2bab15
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 15:38:16 -0700] rev 970
pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 15:36:58 -0700] rev 969
pkg: drop pushexperiment from the install list
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 14:31:15 -0700] rev 968
merge stable into default
default is meant to be a superset of stable
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 14:30:23 -0700] rev 967
merge default in to stable
evolve 4.0.0 is coming.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 14:29:24 -0700] rev 966
merge back into stable
The 2,7 is meant to be a subset of stable.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 14:28:31 -0700] rev 965
prepare a branch for compatibility with mercurial 2.7 to 3.0(.0)
Evolve 4.0.0 is coming
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 02 Jun 2014 15:22:23 -0700] rev 964
test: update to output change introduced by future 3.1
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 21 May 2014 12:01:28 -0700] rev 963
simple4server: backport the bundle2 exchange
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 22:36:47 -0700] rev 962
evolve: install progress support for the bundle2 pull path
The custom wireprotocol command had a trick to display progress while pulling.
We reinstall such logic for the new path using bundle2.
Its notable that we are using the bundle2 advisory parameter for this purpose.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 17:21:36 -0700] rev 961
evolve: install progress support for the bundle2 push path
The custom wireprotocol command had a trick to display progress while pushing.
We reinstall such logic for the new path using bundle2.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 14:39:13 -0700] rev 960
evolve: add a pull path using bundle2
Instead of using a dedicated wireprotocol commands, we use bundle2 to transmit
an obs marker parts. This aims at both testing bundle2 more and to limit the
amount of special code we needs to put in simple for server to fit our needs.
The massive test changes comes from the fact we can use this fast path for both
remote and local push.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 02:13:02 -0700] rev 959
evolve: advertise obsmarker creation in the transation hook
This will let extensions hooks on marker exchange.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 15:01:33 -0700] rev 958
evolve: add bytes and new marker data when processing part
This will helps use to keep printing useful message when pulling through
bundle2.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 13:41:27 -0700] rev 957
evolve: add a push pass using bundle2
Instead of using a dedicated wireprotocol commands, we use bundle2 to transmit
an obs marker parts. This aims at both testing bundle2 more and to limit the
amount of special code we needs to put in simple for server to fit our needs.
The massive test changes comes from the fact we can use this fast path for both
remote and local push.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 02 Jun 2014 14:44:13 -0700] rev 956
evolve: make exchange output compact in the old pushkey case too.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 01:37:08 -0700] rev 955
evolve: compatibility with memfilectx change
The future 3.1 have have more sophisticated memfilectx object. We add a
compatibility layer for them.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 01:22:31 -0700] rev 954
evolve: abstract access to context.memfilectx
This class is getting altered in the future Mercurial 3.1.0. This changeset
prepare a compatibility layer.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 02 Jun 2014 14:18:29 -0700] rev 953
import: drop version check for ``import --obsolete``
This code base does not support anything below mercurial-3.0 anyway.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 03 Jun 2014 01:16:39 -0700] rev 952
evolve: bump requirement to 3.0.1
Use of bundle2 for pulling will require this version or above.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 02 Jun 2014 14:58:45 -0700] rev 951
test: fix test-import condition
The help text is ``"only(`` not `` only(``
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 31 May 2014 00:23:25 -0700] rev 950
merge with stable
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 29 Apr 2014 22:25:57 +0200] rev 949
evolve: make most line lenghts 80 characters or less
There are still a few lines that are above 80 characters in length. Those have
not been changed because doing so would make the code a bit less clear.
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 29 Apr 2014 22:25:48 +0200] rev 948
evolve: start all util.Abort messages with lower case
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 29 Apr 2014 22:25:35 +0200] rev 947
evolve: improve wording of a few of messages
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 29 Apr 2014 22:25:21 +0200] rev 946
evolve: fix a couple of typos
Greg Ward <greg@gerg.ca> [Sun, 25 May 2014 17:37:13 -0400] rev 945
evolve: fix spelling error
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 13:45:52 -0700] rev 944
evolve: more compact output in the wire protocol case
We made the wording more similar and use less line. The writing operation is
usually fast so we do not needs a specific line for it.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 23:57:48 -0700] rev 943
evolve: test exchange through wireprotocol
The wireprotocol version of the exchange was only tested in the
`simple4server.py` case.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 May 2014 13:30:12 -0700] rev 942
evolve: align working during obsmarker push using pushkey
lets use the same wording everywhere to prevent user confusion.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 May 2014 17:43:31 -0700] rev 941
evolve: drop some pre-3.0 compatibility code
This extension already requires Mercurial 3.0
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 May 2014 17:45:28 -0700] rev 940
evolve: update the errors message to request mercurial 3.0 and above
And update the checking code too. This extension already requires 3.0 for some
time.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 May 2014 12:44:30 -0700] rev 939
readme: remove some duplicated entries
Those changes where backported to 3.3.2.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 May 2014 12:43:03 -0700] rev 938
readme: remove embarrassment
There were… conflict marker in this file. Its over, they are gone now.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 16:42:41 -0700] rev 937
merge with 3.3.2
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 16:40:50 -0700] rev 936
Added tag 3.3.2 for changeset a03ea39aca2a
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 16:36:37 -0700] rev 935
prepare release 3.3.2
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Thu, 10 Apr 2014 16:02:02 -0400] rev 934
fold: add squash as a possible alias
In order to respect the habituation of the majority of DVCS users and
to make this feature more easily discoverable, the very common
"squash" terminology should be added as a synonym to "fold". Since git
does not have a squash command, this should be safe.
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Mon, 14 Apr 2014 15:46:27 -0400] rev 933
fold: add --message and --logfile options
Like other commit-creating commands, this add two options for
specifying the resulting commit message, with tests. If either of
these options is specified, no editor is popped up asking for a commit
message.
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 11 May 2014 01:29:11 -0700] rev 932
merge with stable
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Thu, 09 Jan 2014 11:33:15 +0100] rev 931
prune: update to successor rather than parent when prune '.'
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 09 May 2014 03:06:36 -0700] rev 930
import: --obsolete flag for automatic obsolescence marker creation
A new `--obsolete` flag is added to import. When present, the new node will be
marked as a successors of the one specified in the `Node` field of the imported
patch. No marker are created when revision have the node expected in the patch.
This improves email based work flow where implicit rebase are likely to happen
and extra information are lost, changing the hash.
This new behavior requires a flags, otherwise the `hg export x | hg import -`
idiom would change, turning the source obsolete.
(Changing from `hg graft x` to `hg rebase --dest . --rev x`)
This change only takes effect when using Mercurial 3.0 and above
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 11 May 2014 01:17:02 -0700] rev 929
merge with all other change to 3.3
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 11 May 2014 01:14:34 -0700] rev 928
update 3.3.0 readme to include minimal mercurial requirement
This clarify the situation.
Greg Ward <greg@gerg.ca> [Tue, 15 Apr 2014 14:06:47 -0400] rev 927
evolve: fix grammar in a comment
Greg Ward <greg@gerg.ca> [Tue, 15 Apr 2014 14:06:20 -0400] rev 926
README: document how to run the tests
Faheem Mitha <faheem@faheem.info> [Sat, 03 May 2014 03:46:21 +0530] rev 925
uncommit: change 'kill' to 'prune' in error message
'kill' was renamed to 'prune' Long time ago.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 29 Apr 2014 16:31:21 -0700] rev 924
readme: the forgotten update strike again
Sean Farley <sean.michael.farley@gmail.com> [Fri, 25 Apr 2014 19:58:33 -0500] rev 923
evolve: protect call to rebase within a wlock (#42, #35, #16)
Without a wlock, repo.commit would blow away the dirstate's parents on OSes
that have no 'os.symlink' support in python, leading evolve to produce a merge
instead of a rebase. If a user ran the rebase command instead of evolve, then
things would work because rebase is wrapped in a giant wlock.
Unfortunately, we can't use the same idea of wrapping the evolve command in one
giant wlock because that's too early in the process. If the lock did wrap the
entire evolve command, then the working directory would save its current
parents which, since rebase hasn't been called yet, would be just
p1.
Therefore, we need to obtain the lock *after* the dirstate's parents are
changed but *before* the call to rebase. This way ensures that when a conflict
happens the working directory correctly shows both parent changeset.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 15:58:55 -0700] rev 922
readme: update the readme with all missing entry
One days one will stop forgetting to update it.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 15:32:52 -0700] rev 921
readme: rephrase the changelog entry regarding the new exchange
Lets try to have it readable by human being.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 15:08:28 -0700] rev 920
readme: drop the reference to fastobs
Its dead Jim.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 14:28:28 -0700] rev 919
merge with 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
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 14:23:23 -0700] rev 917
prepare release 3.3.1
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.
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.
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…)
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 14:10:28 -0700] rev 913
evolve: update changelog in README
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 23 Apr 2014 14:05:36 -0700] rev 912
test: update testing statement
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.
Olle Lundberg <geek@nerd.sh> [Wed, 26 Mar 2014 23:57:15 +0100] rev 910
run-tests: add executable bit
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.
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 22 Apr 2014 17:04:40 -0700] rev 907
merge with stable
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.
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.
Greg Ward <greg@gerg.ca> [Sun, 20 Apr 2014 17:40:56 -0400] rev 904
Finish killing fastobs (this test failed loudly after 33fdaec24432)
Augie Fackler <raf@durin42.com> [Thu, 17 Apr 2014 17:15:54 -0400] rev 903
Kill fastobs, as marmoute says it causes problems
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.
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
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 13 Apr 2014 16:46:13 -0400] rev 900
merge stable into default
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.
Olle Lundberg <geek@nerd.sh> [Sat, 12 Apr 2014 23:16:02 +0200] rev 898
evolve: small white space change
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
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.
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.
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.
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.
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/
Brendan Cully <brendan@kublai.com> [Thu, 03 Apr 2014 23:36:23 -0700] rev 891
commands: small language fixes in help
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.
Olle Lundberg <geek@nerd.sh> [Wed, 26 Mar 2014 23:57:15 +0100] rev 889
run-tests: add executable bit
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.
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.
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.
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.
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.
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.
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.
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
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.
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.
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.
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.
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.
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.
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
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 10 Mar 2014 16:54:08 -0700] rev 873
evolve: add 2.9.1 compatibility seal to simple4server
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 10 Mar 2014 16:52:46 -0700] rev 872
simple4server: fix a missing import
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 10 Mar 2014 16:27:21 -0700] rev 871
evolve: update version compatibility error message
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 07 Mar 2014 14:46:45 -0800] rev 870
exchange: fix pull over wire protocol
Actually hand pulled obsolescence markers to the pull logic.
In the wire protocol case we did not reset the position of the file pointer
after writing the pulled data. This lead the pull logic to thing that no markers
were send at all.
This changeset fix this client side bug.
(apparently no test check both markers pulling and wireprotocol)
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 06 Mar 2014 12:15:04 -0800] rev 869
exchange: enforce permission on new wireprotocol command
hgweb needs an explicit declaration of the permission level of each commands.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 05 Mar 2014 19:08:58 -0800] rev 868
merge stable
André Sintzoff <andre.sintzoff@gmail.com> [Sun, 02 Mar 2014 15:19:31 +0100] rev 867
evolve: fix typos in uncommit docstring
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 05 Mar 2014 15:21:21 -0800] rev 866
simple4server: add the wireproto command for obsolescence markers discovery
This come with its usual train of duplicated utility.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 05 Mar 2014 15:14:40 -0800] rev 865
discovery: use the discovery process for pull
Wow! Such speed! Much functional! Very proof on concept implementation!
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 05 Mar 2014 15:09:07 -0800] rev 864
discovery: implement a discovery process and use it for push
Much faster! So functional! Very proof on concept implementation! Wow!
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 05 Mar 2014 16:58:56 -0800] rev 863
discovery: first version of the "hash tree" idea
We build a hash for each node based on the markers that applies to it and the
hash of its parent. This will allow a kind of discovery process for markers.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 04 Mar 2014 11:34:38 -0800] rev 862
evolve: update changelog with recent advance
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 04 Mar 2014 11:31:11 -0800] rev 861
merged 3.3 release into default
Some of the default content was released in 3.3.0 the other ones are moved to
3.4
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 04 Mar 2014 11:14:24 -0800] rev 860
Added tag 3.3.0 for changeset 83882f2fbecb
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 04 Mar 2014 11:14:15 -0800] rev 859
prepare 3.3.0 release
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Feb 2014 18:14:20 -0800] rev 858
evolve: drop `latercomer` and `conflicting` compatibility.
Those old alias are deprecated for a long time now. All computations related to
troubles are in Mercurial core for multiple versions.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Feb 2014 18:03:13 -0800] rev 857
evolve: use flag value from core for bumped fix
This flag is available from core for a long time, lets use it directly from
there.
This commit intend to cleanup old stuff from the evolve extention.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 20 Feb 2014 13:32:04 -0800] rev 856
test: get rid of all reference to conflicting changesets
They are now called divergent for a long time.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 04 Mar 2014 11:02:42 -0800] rev 855
merge various improvement to stable
We want a good stable state before starting massive changes in default for
obsolescence marker update.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 22:46:46 -0800] rev 854
exchange: add progress bar when pushing using wire protocol command
Progress bar on pull was only available for pushkey based push before this
changeset. This implementation is very hacky but we are still at a proof of
concept stage for those new exchange method.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 22:18:05 -0800] rev 853
exchange: add progress bar when pulling using wire protocol command
progress bar on pull was only available for pushkey based pull before this
changeset.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 21:37:18 -0800] rev 852
exchange: fix pulling from simple for server
There is far too much code duplication down there.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 21:23:52 -0800] rev 851
exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 21:23:46 -0800] rev 850
exchange: add test case for D.3
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 21:23:42 -0800] rev 849
exchange: add test case for D.2
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 21:23:36 -0800] rev 848
exchange: add test case for D.1
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 20:48:06 -0800] rev 847
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 20:42:21 -0800] rev 846
exchange: add test case for C.3
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 20:39:50 -0800] rev 845
exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 20:36:47 -0800] rev 844
exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 20:28:03 -0800] rev 843
exchange: add test case for B.7
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 20:21:27 -0800] rev 842
exchange: add test case for B.6
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 20:09:27 -0800] rev 841
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 20:00:45 -0800] rev 840
exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 19:51:18 -0800] rev 839
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 19:39:20 -0800] rev 838
exchange: add test case for B.2
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 19:33:00 -0800] rev 837
exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 18:51:54 -0800] rev 836
exchange: add test case for A.7
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 15:31:39 -0800] rev 835
exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 15:21:01 -0800] rev 834
exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 15:14:48 -0800] rev 833
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 14:59:43 -0800] rev 832
exchange: add test case for A.3
Allow arbitrary arguments to dotest. This allow to push --force when the push
creates more heads.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 14:03:41 -0800] rev 831
exchange: automate the testing process too
we now have: dotest TESTNAME [TARGETNODE]
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 13:27:53 -0800] rev 830
exchange: have a function doing all the common initial setup
This will help creation of further test.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 13:12:50 -0800] rev 829
exchance: add a common setup script for all test
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 28 Feb 2014 16:36:37 -0800] rev 828
exchange: add test case for A.2
Testcase defined here: http://mercurial.selenic.com/wiki/ObsolescenceMarkersExchange
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 28 Feb 2014 16:21:22 -0800] rev 827
exchange: add test case for A.1
Testcase defined here: http://mercurial.selenic.com/wiki/ObsolescenceMarkersExchange
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 28 Feb 2014 13:45:59 -0800] rev 826
exchange: add the pullmarker wireproto command to simple4server
This will allow simple server side support.
(yes, code duplication is bad I already told you I won't do it too much mom)
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 28 Feb 2014 13:44:37 -0800] rev 825
exchange: extract computation of pulled markers boundary in a function
I expect massive experimentation on this specific aspect. so we better isolate
it.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 28 Feb 2014 13:38:19 -0800] rev 824
exchange: pull markers relevant to the pulled subset only
With the command recently introduced we can select to pull only markers relevant
to some nodes. We are now pull all markers for all node in the relevant subset.
We'll try to pull less (just markers for node where local and remote marker
diverge) later, but we need some marker discovery mechanism for that. which are
not easy.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 28 Feb 2014 13:25:34 -0800] rev 823
exchange: add a new method to pull markers
It has both local and wire protocol implementation. This command does not
requires escaping of the marker and are expecting to me highly faster than the
pushkey method.
The other main point is that command is to accept a `heads` and `common`
argument to select to pull changeset only relevant to a set a of node.
We are not using this capability yet but we'll do it soon
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 28 Feb 2014 00:55:34 -0800] rev 822
exchange: add the pushmarker wireproto command to simple4server
This will allow simple server side support.
(yes, code duplication is bad, I won't do it too much mom)
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 28 Feb 2014 00:40:29 -0800] rev 821
exchange: introduce a wireprotocol command to push markers
Pushkey is not adapted to transmit a stream of binary data. We used it as a hack
so far. We add a new wire protocol command to speed the things up (and also push
all the markers in a single transaction). The proper way to do it is to
introduce bundle2 in core, but this will already help in the mean time.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 28 Feb 2014 10:30:10 -0800] rev 820
exchange: actually use _pushkeyescape fallback
The code was still calling `obsolete._pushkeyescape` therefore never calling the
fallback we defined. Now that we call it, it had to be fixed to actually work
too.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 19:28:43 -0800] rev 819
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 03 Mar 2014 19:27:42 -0800] rev 818
prune: accept '0 0' as a valide --date value
I 've no idea why 4c0f6d555032 introduced it with this check.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 27 Feb 2014 19:58:08 -0800] rev 817
exchange: only push the set of marker relevant to want we push
We now compute all markers relevant to pushed set. And just send just those one.
So you are no longer pushing markers that point to changeset your are not
pushing. See the in line comment for details about what "relevant" is.
Multiple nice output have been added in the process.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 27 Feb 2014 18:30:55 -0800] rev 816
evolve: add relevant marker exchange machinery
This is going to be needed for obsolescence marker exchange.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 27 Feb 2014 17:20:34 -0800] rev 815
fastobs: rename var from `node` to `rev`
It contains revision (from repo.revs not node).
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 27 Feb 2014 17:11:09 -0800] rev 814
fastobs: move the extension to the hgext dir
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 26 Feb 2014 15:25:33 -0800] rev 813
test-prune: update test with a prune output compatible with newest hg
Newest hg can record the parent information in the marker. This change the
debugobsstorestate output a lot.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 25 Feb 2014 11:14:37 -0800] rev 812
drophack: major speedup to marker stripping
It appear that each call to obsstore.add have a significant overhead (in
particular the creation of a set form the list of markers and file system
operation to the obsstore file.
We now compute the marker we need to store and write them in a single call.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 24 Feb 2014 19:01:12 -0800] rev 811
evolve: add a cmddebugrecordpruneparents command
This command can be used to create prune marker with parent information from
prune marker on changeset known locally.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 24 Feb 2014 17:44:12 -0800] rev 810
debugobsstorestat: add test for pruning
There is multiple prune specific code in this command. So we test it in the
presence of prun marker too.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 24 Feb 2014 17:32:09 -0800] rev 809
debugobsstorestat: add information about cluster
We now display information about independant osolescence markers clusters.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 24 Feb 2014 19:00:04 -0800] rev 808
evolve: fix creation of prunedchildren for merge
The `p2` code path was broken. (stupid typo)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 20 Feb 2014 13:59:49 -0800] rev 807
evolve: add a debugobsstorestat command
This commands print multiple some data about the content of the obsstore. This
will be usefull to provide some metric and insight for obsolescence marker
exchange.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Feb 2014 17:27:45 -0800] rev 806
evolve: extend obsstore object to use prune parent information
Now that we have the information, we can use it to build a mapping to access all
marker that prune a children of a node. This is similar to what we do for
successors and precursors.
The performance impact is a few tens of second on my mercurial clone.
Experimenting is worth the trouble.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 13 Feb 2014 18:09:54 -0800] rev 805
prune: wrap mercurial internal to add parent information in prune marker
We store as a p1 (and p2) key in the extra dict for marker. This allow us to
record this information for future use without requiering a format change.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Feb 2014 18:14:20 -0800] rev 804
evolve: drop `latercomer` and `conflicting` compatibility.
Those old alias are deprecated for a long time now. All computations related to
troubles are in Mercurial core for multiple versions.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 20 Feb 2014 13:32:04 -0800] rev 803
test: get rid of all reference to conflicting changesets
They are now called divergent for a long time.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Feb 2014 18:03:13 -0800] rev 802
evolve: use flag value from core for bumped fix
This flag is available from core for a long time, lets use it directly from
there.
This commit intend to cleanup old stuff from the evolve extention.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 20 Feb 2014 12:56:57 -0800] rev 801
importing fastop extension in this repo
This repo is dedicated to experimentation on mutable history topic. Fastop is
appropriate there.
Augie Fackler <raf@durin42.com> [Wed, 19 Feb 2014 15:31:00 -0500] rev 800
fastobs: revset refactor related fixes
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 18 Feb 2014 15:32:31 -0800] rev 799
adapt fastopt extension to mercurial.exchange module
The push code have changed to be more modular. the fastop extension need to be
rewritten. No backward compatibility preserved for mercurial <=2.9x.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 18 Feb 2014 15:30:54 -0800] rev 798
drop unused function `pushmarkerwrapper`
I can find any user for this function.
Augie Fackler <raf@durin42.com> [Sat, 16 Nov 2013 20:44:44 -0500] rev 797
Add initial test.
Augie Fackler <raf@durin42.com> [Sat, 16 Nov 2013 20:44:37 -0500] rev 796
Deduplicate markers. Depends on __hash__ and __eq__ on obsolete.marker
Augie Fackler <raf@durin42.com> [Sat, 16 Nov 2013 20:43:44 -0500] rev 795
copy precursor revset from evolve so we don't depend on involve
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 03 Sep 2013 21:46:50 +0200] rev 794
fastobs: details strategies in the main help
Augie Fackler <raf@durin42.com> [Fri, 26 Jul 2013 21:35:56 -0400] rev 793
fastobs: fix a bunch of stupid errors that prevented it from working at all
Augie Fackler <raf@durin42.com> [Fri, 26 Jul 2013 16:08:56 -0400] rev 792
fastobs: clean up logging a little
Augie Fackler <raf@durin42.com> [Fri, 26 Jul 2013 16:04:40 -0400] rev 791
fastobs: first commit of an extension to test obsolete marker exchange methods
This currently implements the "fill in the box" approach discussed at
the 2.6 sprint, which seems to handle common cases correctly with
significantly less data transferred.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 12 Feb 2014 17:18:50 -0800] rev 790
drophack: add a new drop hack extension for Matt Mackall usage
This extension is hacky and not intended for real world usage. See documentation
for details.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Feb 2014 00:02:18 -0600] rev 789
prune: add biject option
This option allows two ranges to be given for successors and precursors such
that there is a one-to-one match between each range.
Test coverage has been added.
Simon Heimberg <simohe@besonet.ch> [Fri, 07 Feb 2014 09:36:42 +0100] rev 788
evolve: register a summary hook instead of wrapping the summary command
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:30:45 -0800] rev 787
merge stable into default.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:20:50 -0800] rev 786
doc: improve reference to log --hidden
- glog is not mucha thing anymore
- also add a usage exemple
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:19:55 -0800] rev 785
doc: fix trailing white space
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:19:40 -0800] rev 784
doc: DIE MQ DIE
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:19:25 -0800] rev 783
doc: use --succ in prune help
--succ is the new only way.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:18:43 -0800] rev 782
doc: remove referenc to proleferation of hidden commit
This is not much something we try to avoid anymore
This changeset is eathenly adding reference to other toubles too.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:14:06 -0800] rev 781
doc: try to clarify rebase warning
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:13:22 -0800] rev 780
doc: enhance your fold help
Refer to the two different for of using fold.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:12:44 -0800] rev 779
doc: refer to previous and next in the gup, gdown help
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:12:07 -0800] rev 778
doc: replace graft -O with grab
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:10:24 -0800] rev 777
doc: rework how to entry about amend
We can recommand the core `hg commit --amend` now. We also drop reference to MQ.
Arne Babenhauserheide <arne.babenhauserheide@kit.edu> [Mon, 20 Jan 2014 10:57:10 +0100] rev 776
raise util.Abort instead of assertion when trying to evolve a merge changeset.
This prevent exposing a nasty traceback to the user.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:46:23 -0800] rev 775
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:37:52 -0800] rev 774
tutorial: fix note
We need a double semin colon, otherwise this is a comment.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:21:29 -0800] rev 773
tutorial: warn about rollback beeing obsolete
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:16:09 -0800] rev 772
tutorial: use grab instead of rebase.
grab as now the advantage to move the working directory.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:14:41 -0800] rev 771
tutorial Clarify "." explanation
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:18:41 -0800] rev 770
tutorial: update divergent changeset section
Still not there but less fuzy.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:10:42 -0800] rev 769
tutorial: use long form of argument for the sake of clarity
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:22:41 -0800] rev 768
tutorial: fix some various typo
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:38:28 -0800] rev 767
tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 15:24:16 -0800] rev 766
doc: some documentation on the configuration part of the tutorial
Trying to make it less obscure on first contact
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:22:00 -0800] rev 765
doc: smarter make file
We regenerate the tutorials when needed only
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:38:56 -0800] rev 764
doc: use a symbolic link to point to the tutorial
the file was lagging behind a ton.
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Thu, 24 Oct 2013 10:42:50 +0200] rev 763
import: warn about new unstable changesets
'hg import' can add new unstable changesets, for example when invoked
with '--hidden' or '--exact', or when the working directory parent
already is unstable.
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Tue, 22 Oct 2013 11:16:55 +0200] rev 762
evolve: show progress
The total count may be too low on occasion. Not sure why.
gaved up at testing this, can't get stable result.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 07 Jan 2014 16:07:43 -0800] rev 761
removed the qsync extension.
The only user I knew about (logilab) is not using it anymore. It not compatible
with coming Mercurial version 2.9.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 07 Jan 2014 15:52:47 -0800] rev 760
evolve: add more details when we abort for case not handled yet
Verboser output to help people knowing what is going on and solving it on their
own.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 07 Jan 2014 17:03:36 -0800] rev 759
merge stable back into default
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 26 Dec 2013 17:21:01 -0800] rev 758
current release is stable enought
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 26 Dec 2013 17:20:16 -0800] rev 757
evolve: update the tested with statement
It actually ssems to work with version up to 2.6 but some minor changes makes
test fails. so better encourage people to upgrade.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 26 Dec 2013 14:42:22 -0800] rev 756
evolve: use super for calling parent class method
Otherwise we can bipass filtering (and break a lot of things)
Faheem Mitha <faheem@faheem.info> [Mon, 02 Dec 2013 23:31:45 +0530] rev 755
debian: add source/format file
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 21:53:22 -0500] rev 754
Added tag 3.2.0 for changeset c3ba8a965a7a
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 21:39:47 -0500] rev 753
prepare 2.8 release
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 21:44:24 -0500] rev 752
grab: update the alias for 2.8 compatibility
2.8 does not update on rebase anymore. We need to update by hand. this makes
this alias more fragile.
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Fri, 15 Nov 2013 21:33:54 -0500] rev 751
gdown/gup: add next/previous alias
Up and down refer to the customary order in log output rather than
concepts; as such, it may be confusing to the user. I for one found
them suprising -- they just didn't fit with my mental model.
Previous and next, however, imply a clear parent/child relationship.
We attroduce the new name as aliases for now.
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Tue, 22 Oct 2013 11:51:01 +0200] rev 750
evolve: allow updating to the successor if the parent is obsolete
Although 'hg update' handles this as well, it will also update to
tipmost descendent of the successor, if any.
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Wed, 31 Jul 2013 19:56:28 +0200] rev 749
evolve: abort on unknown divergent changeset base
...rather than noisily dying with a KeyError.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 19:14:19 -0500] rev 748
test: prepare test for core changeset 6cd9b8428104
Changeset 6cd9b8428104 in Mercurial core (2.8) make rebase preserve more
extra. this mean hash changes. We make the test resilient to that.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 18:53:29 -0500] rev 747
test: prepare test for core changeset 9c78ed396075
New changeset in mercurial 2.8 (9c78ed396075) change rebase behavior to preverse
the original working directory. This break an handfull of test so we
preventively update to tip after rebase.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 16:01:40 -0500] rev 746
merge stable into default
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 16 Oct 2013 18:28:52 +0200] rev 745
add obsolete parents wrapper to the 'parents' command
although the command itself cannot *cause* obsolete changesets, the
information is rather relevant to the state of the parents
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 16 Oct 2013 18:23:54 +0200] rev 744
README: update changelog
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 26 Jul 2013 12:06:44 +0200] rev 743
conform to the Mercurial custom of lowercase messages
...and while at it, use the more usual long form of "can't"
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 16 Oct 2013 00:37:29 +0200] rev 742
amend: use core mechanism for amend
Evolve used its own code for amending. This was introduced before mercurial
includes commit --amend. The evolve code is now older and buggier. So we just
use the core cod when amend is called.
Message of the temporary commit is different, all test hash changed \o/.
Test change are been carefully checked.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 15 Oct 2013 16:20:17 +0200] rev 741
amend: drop the deprecated note option
We plan to get closer to the commit --amend implementation dropping this
deprecated option helps.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 25 Sep 2013 02:06:47 +0200] rev 740
test: adapt to 2.6 message improvement
From fd1bb7c1be78 (in core) hidden revision are excluded from partial match in a proper
way resulting in a nicer error message.
Greg Ward <greg@gerg.ca> [Sat, 10 Aug 2013 17:30:44 -0400] rev 739
README: polish the language so it reads better
Greg Ward <greg@gerg.ca> [Sat, 10 Aug 2013 17:27:19 -0400] rev 738
README: fix spelling, capitalization, grammar, punctuation
Greg Ward <greg@gerg.ca> [Sat, 10 Aug 2013 14:51:45 -0400] rev 737
README: fix minor markup inconsistencies
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:29:01 +0200] rev 736
3.2.0
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:50:52 +0200] rev 735
debian: properly clean the docs build
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:31:18 +0200] rev 734
pushexperiment requires mercurial 2.6
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:44:17 +0200] rev 733
ship pushexperiment extension
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:17:47 +0200] rev 732
pushexperiment: guard against non-push-capable remotes
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:16:09 +0200] rev 731
pushexperiment: fix doc typos
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Jun 2013 15:06:18 +0200] rev 730
merge stable into default
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Jun 2013 15:03:55 +0200] rev 729
push obsolescence marker before anything else
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Jun 2013 14:57:39 +0200] rev 728
add notification at the end of push
We have a dedicated hook to know when a push is done.
Julien Cristau <julien.cristau@logilab.fr> [Mon, 03 Jun 2013 14:53:24 +0200] rev 727
Add a new pushexperiment extension
This extension introduce a faster way to push obsolescence marker. Send the
obsstore directly instead of inefficiently going through pushkey's
inefficiency.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Jun 2013 13:28:13 +0200] rev 726
Adapt to human readable date in patch
Julien Cristau <julien.cristau@logilab.fr> [Fri, 31 May 2013 15:10:34 +0200] rev 725
debian: honor nocheck in DEB_BUILD_OPTIONS
André Sintzoff <andre.sintzoff@gmail.com> [Fri, 31 May 2013 18:47:01 +0200] rev 724
evolve: fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 May 2013 18:45:31 +0200] rev 723
amend: hide the --note option
The intermediate commit will not survive long
AndréSintzoff <andre.sintzoff@gmail.com> [Thu, 02 May 2013 18:00:38 +0200] rev 722
evolve: remove trailing spaces
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 04 Mar 2013 18:02:39 +0100] rev 721
update debian changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 11 Feb 2013 10:46:38 +0100] rev 720
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 11 Feb 2013 10:44:54 +0100] rev 719
Added tag 3.1.0 for changeset cdb52bbbe5b8
Levi Bard <levi@unity3d.com> [Sun, 10 Feb 2013 16:14:45 +0100] rev 718
evolve: update test output.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 11 Feb 2013 10:28:32 +0100] rev 717
prepare release 3.1.0
Levi Bard <levi@unity3d.com> [Mon, 11 Feb 2013 09:21:22 +0000] rev 716
prune: add --user and --date options
They control the metadata writen to the obsolescence marker.
Levi Bard <levi@unity3d.com> [Mon, 11 Feb 2013 09:21:11 +0000] rev 715
prune: add strip-like bookmark
This prune changesets pointed by the specified bookmark only (and removes the
bookmarks)
Levi Bard <levi@unity3d.com> [Sun, 10 Feb 2013 16:17:01 +0100] rev 714
evolve: remove duplicate alias.
Levi Bard <levi@unity3d.com> [Sun, 10 Feb 2013 00:23:22 +0100] rev 713
evolve: update stabilize order test after output change
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 10 Feb 2013 12:10:32 +0000] rev 712
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 09 Feb 2013 20:53:45 +0000] rev 711
evolve: document --all option
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 09 Feb 2013 20:53:03 +0000] rev 710
merge --all option from tak
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 09 Feb 2013 20:52:30 +0000] rev 709
minor help changes
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 18:07:49 +0100] rev 708
evolve: clean up help message
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 18:07:36 +0100] rev 707
evolve: remove magic return values from utility functions
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 17:02:34 +0100] rev 706
evolve: clean up evolve implementation.
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 16:21:32 +0100] rev 705
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 16:21:22 +0100] rev 704
evolve: add --all argument.
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 15:42:14 +0100] rev 703
evolve: extract evolve --any implementation into a function.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 22:44:43 +0000] rev 702
touch: properly handle touching multiple changeset
Denis Laxalde <denis.laxalde@logilab.fr> [Fri, 08 Feb 2013 22:12:46 +0000] rev 701
add a duplicate option in touch
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 22:09:42 +0000] rev 700
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 21:43:00 +0000] rev 699
amend: prune replacement commit without sucessors
This align with the core behavior of `commit --amend`.
All user of rewrite are not responsible for creating their own marker.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 21:27:48 +0000] rev 698
changelog: add more entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 21:26:47 +0000] rev 697
fix future 3.1.0 changelog entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 20:45:18 +0000] rev 696
alias: add a grab alias
Its a valid replacement for graft -O
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 20:18:40 +0000] rev 695
amend: drop the --change option
it is deprecated for quite some time already
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 06 Feb 2013 23:21:42 +0000] rev 694
drop suspicious import in evolve
introduced by 97ce1f801309
Thanks to Bryan Murdock for reporting the issue.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 21:38:19 +0100] rev 693
prune: handle bookmark
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 21:40:58 +0100] rev 692
test-prune: simplified log output
useful to testing bookmark later
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 19:08:27 +0100] rev 691
prune: update inline documentation
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 19:04:22 +0100] rev 690
prune: more command switch idea
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 19:02:19 +0100] rev 689
prune: documentation update
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 22:05:03 +0100] rev 688
prune: add an informative message about the number of pruned changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 22:04:50 +0100] rev 687
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 18:44:40 +0100] rev 686
prune: turn one of the test changeset public
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 18:42:50 +0100] rev 685
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 18:07:09 +0100] rev 684
prune: detect bad input
We accept multiple changeset folded into one successors. One changesets split in
multiple successors. But we refuse multiple changesets split in multiple ones.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:55:03 +0100] rev 683
simplify locking in prune
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:51:27 +0100] rev 682
prune: rename --new to --succ
This is closer to want the documentation says.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:45:38 +0100] rev 681
prune: improve command function name
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:45:22 +0100] rev 680
prune: fix doc
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:41:35 +0100] rev 679
evolve: drop uneeded noderange function
We can use revrange instead
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:40:28 +0100] rev 678
evolve: warn for troubles created by histedit too.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:39:16 +0100] rev 677
drop useless empty lines
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:31:43 +0100] rev 676
evolve: remove outdated documentation
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:31:20 +0100] rev 675
add an explicite warning when repo contains invalid obsolescence markers
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:21:02 +0100] rev 674
evolve: remove pre 2.3 code
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:18:02 +0100] rev 673
evolve: removes amend from the list of advertised function
We have commit --amend almost as powerful now.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:11:58 +0100] rev 672
evolve: fix extsetup extension helper
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:04:36 +0100] rev 671
evolve: remove unused function imported from mercurial
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:03:20 +0100] rev 670
evolve: drop unused import
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:07:01 +0100] rev 669
merge with doc fixes
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:02:07 +0100] rev 668
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:05:01 +0100] rev 667
doc: update version information
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:01:34 +0100] rev 666
merge with hg2.4 compat branch
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:00:02 +0100] rev 665
Added tag 3.0.0 for changeset 862b6b71a358
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:57:58 +0100] rev 664
prepare for release 3.0.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:21:01 +0100] rev 663
mark test with 2.5
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:20:10 +0100] rev 662
merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:17:00 +0100] rev 661
create a compat-hg2.4 branch
2.5 is out, 2.4 compatible code is parked in a compat-hg2.4 branch as we did for
2.3
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 25 Jan 2013 17:26:47 +0100] rev 660
hgext: add a simpler extension to enable obsolete on server
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 25 Jan 2013 16:59:20 +0100] rev 659
drop: divergence related code
It is now in code
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 25 Jan 2013 16:42:49 +0100] rev 658
evolve: remove revset calls in warnobserror
revset have serious performance impact in several case.
The resulting code is a bit too complicated to my taste. I hope for much simpler
implementation in core anyway.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 05 Jan 2013 18:10:07 +0100] rev 657
evolve: drop "troubles" and "troubled" method now in core
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 25 Jan 2013 16:31:29 +0100] rev 656
test: drop rebase test
We assume that the mercurial rebases tests suite is strong enough now.
Greg Ward <greg@gerg.ca> [Thu, 24 Jan 2013 18:05:59 -0500] rev 655
doc: fix grammar, spelling, punctuation
I restrained myself to making only changes that turn bad English into
good English. There are still opportunities to improve, but other
changes require some discussion and review. This change should be
uncontroversial.
Greg Ward <greg@gerg.ca> [Thu, 24 Jan 2013 18:02:00 -0500] rev 654
tutorial: fix grammar, spelling, punctuation
I restrained myself to making only changes that turn bad English into
good English. There are still opportunities to improve the tutorial,
but other changes require some discussion and review. This change
should be uncontroversial.
The same changes had to be duplicated in both copies of the tutorial
(hmmm); it's not clear which one is definitive.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 07 Dec 2012 12:14:46 +0100] rev 653
[evolve] Drop useless filtered code
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 04 Jan 2013 12:43:22 +0100] rev 652
merge with filtering change (DO NOT USE WITHOUT FILTERING)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 04 Jan 2013 12:42:43 +0100] rev 651
evolve: ensure evolve command run unfiltered
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 04 Jan 2013 11:47:45 +0100] rev 650
test: drop divergent test
It is into core now
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 02 Jan 2013 14:41:47 +0100] rev 649
evolve: stop working around phase limitation
Core is handling this part a bit better
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:52:32 +0100] rev 648
fix punctuation
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 15:57:51 +0100] rev 647
evolve: fix version message
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 15:01:30 +0100] rev 646
test: more resistance to filtering changes
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:38:40 +0100] rev 645
merge with stable
Denis Laxalde <denis.laxalde@logilab.fr> [Mon, 03 Dec 2012 14:41:14 +0100] rev 644
support -r option in prune, add a test for this
Also localize options in fold.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:28:04 +0100] rev 643
doc: index version info on index
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:22:20 +0100] rev 642
doc: updates mq refugee book
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:17:17 +0100] rev 641
doc: update how-to
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:01:24 +0100] rev 640
tutorial: second replacement of hg amend by commit --amend
(the diff is huge because commit --amend have protection vs cycle)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 13:48:48 +0100] rev 639
tutorial: use evolve directly
We a real mode in addition to the dry run one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 12:37:25 +0100] rev 638
tutorial: use rebase instead of graft -O
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 12:23:56 +0100] rev 637
tutorial: use commit --amend when possible
commit --amend is the core way to do that, we better get used to it.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 12:15:56 +0100] rev 636
evolve: make evolve smarter
It is not more confused by killed changeset and can also choose to stabilise '.'
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 11:52:22 +0100] rev 635
tutorial: update notes in unwritten section
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 11:49:22 +0100] rev 634
tutorial: glog is into core now
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 18 Dec 2012 17:31:23 +0100] rev 633
test: adapt to the way the bundle is generated
optimised generation gives 1 changes, strict on gives 2.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 05 Dec 2012 11:30:24 +0100] rev 632
fold: work around potential bug with filtering
Folded revision may be becomes filtered leading to a crash of the replaced rset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 04 Dec 2012 00:18:32 +0100] rev 631
prepare for filtering
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 17 Dec 2012 14:33:01 +0100] rev 630
compat: adapt to upstreaming of divergent logic
successorsset and divergent logic have been moved into core by changeset
4bec77e62c00::e411fd79ca69
We drop dedicated code in evolve.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 16:30:25 +0100] rev 629
Added tag 2.1.0 for changeset f9d305deeff3
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 15:19:24 +0100] rev 628
[prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 15:13:50 +0100] rev 627
update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 15:11:09 +0100] rev 626
merge with fix in 2.3
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 03 Dec 2012 00:10:58 +0100] rev 625
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 02 Dec 2012 16:21:19 +0100] rev 624
more versatile test.
push can fails on any divergent changeset I do not care for now.
Denis Laxalde <denis.laxalde@logilab.fr> [Wed, 28 Nov 2012 10:19:43 +0100] rev 623
fix retrieval of divergent changesets in obssummary (typo)
Add a test for this; drop wrong divergent print in 'Test rollback support'.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Nov 2012 14:28:41 +0100] rev 622
merge with Denis improvement
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Nov 2012 14:27:50 +0100] rev 621
merge with Denis improvement
Denis Laxalde <denis.laxalde@logilab.fr> [Thu, 22 Nov 2012 11:30:36 +0100] rev 620
use comments to combine commit messages in fold
Denis Laxalde <denis.laxalde@logilab.fr> [Mon, 26 Nov 2012 11:59:40 +0100] rev 619
add a -e option to fold
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:37:30 +0100] rev 618
merge
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:14:20 +0100] rev 617
detect incompatibility with future mercurial 2.5
changes in bookmark break compatibility
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:05:51 +0100] rev 616
merge
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:03:39 +0100] rev 615
merge
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:03:23 +0100] rev 614
Added tag 1.1.0 for changeset 22cacfce2a65
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:02:37 +0100] rev 613
fix version in setup.py
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 21 Nov 2012 00:18:41 +0100] rev 612
adapt to 7f5dab94e48c in crew
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 15 Nov 2012 15:46:54 +0100] rev 611
deprecate "amend --change" option
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:23:01 +0100] rev 610
merge with qsync fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:22:41 +0100] rev 609
merge with qsync fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:22:16 +0100] rev 608
merge with qsync fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:19:54 +0100] rev 607
[qsync] fix filestore usage
The filestore was closed too early, dropping on disk cache
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:05:21 +0200] rev 606
merge back with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:02:51 +0200] rev 605
Added tag 2.0.0 for changeset d43e80504e5
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:44:52 +0200] rev 604
evolve: some comment update
Bumped is in core now.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:01:50 +0200] rev 603
update debian control
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:01:08 +0200] rev 602
merge 2.4 code back into default.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:00:18 +0200] rev 601
merge with 1.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:59:34 +0200] rev 600
Added tag 1.1.0 for changeset c062edbcaf13
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:58:31 +0200] rev 599
Fix debian control
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:40:25 +0200] rev 598
prepare a branch for Compat with mercurial 2.3 only
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:38:51 +0200] rev 597
prepares evolve 1.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:45:21 +0200] rev 596
merge changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:44:31 +0200] rev 595
update changelog with future 1.1.0 news
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:43:22 +0200] rev 594
merge bumped rename
(drop several part of the code because bumped is now in core)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:32:22 +0200] rev 593
evolve: Rename latecomer into bumped
This is the new name in core
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:13:30 +0200] rev 592
evolve: set tested with 2.4
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:13:19 +0200] rev 591
evolve: require Mercurial 2.4 to work
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:12:53 +0200] rev 590
evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 16:53:11 +0200] rev 589
merge with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 16:49:29 +0200] rev 588
mercurial: replace all `newerversion` call by `successorsset` call
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 16:36:29 +0200] rev 587
evolve: smarter code for divergent changeset
This newer version properly handle split now. Code and test copied for future
upstream one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 15:44:24 +0200] rev 586
evolve: rename conflicting into divergent
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 15:05:32 +0200] rev 585
evolve: detect and abort if 2.4 is detected
The meaning of critical attribut have changed in 2.4
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 15:03:25 +0200] rev 584
evolve: add tested with info
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 14 Oct 2012 16:23:25 +0200] rev 583
merge stable into default
Patrick Mezard <patrick@mezard.eu> [Sat, 13 Oct 2012 16:44:14 +0200] rev 582
test-stabilize-conflict.t: fix "eight" spelling
Patrick Mezard <patrick@mezard.eu> [Sat, 13 Oct 2012 16:38:23 +0200] rev 581
test-stabilize-conflict.t: sed -i is still not portable
Patrick Mezard <patrick@mezard.eu> [Sat, 13 Oct 2012 16:31:52 +0200] rev 580
test-stabilize-conflict.t: yes is not a standard shell utility
And for some reason the test fails on OSX.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 10 Oct 2012 15:26:09 +0200] rev 579
evolve: drop code now in core
The default branch aims compat with the mercurial default branch. we do not need
all those conditional.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 10 Oct 2012 15:11:31 +0200] rev 578
merge with default
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 10 Oct 2012 14:58:21 +0200] rev 577
evolve: filter nullid successors
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 27 Sep 2012 16:55:08 +0200] rev 576
evolve: new divergent revset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 27 Sep 2012 16:40:25 +0200] rev 575
doc: rename conflicting to divergent.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 25 Sep 2012 12:06:48 +0200] rev 574
more schema
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 20 Sep 2012 23:14:59 +0200] rev 573
merge stable into default
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 19 Sep 2012 15:28:35 +0200] rev 572
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:30:07 +0200] rev 571
rebase: warn about troubles created by rebase
The previous order created obsolete marker after checking for new troubles
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 14:53:24 +0200] rev 570
test-obsolete: clean up useless inlined option
rebase is enabled globally and graphlog is into core
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 18:07:07 +0200] rev 569
add image magic depends
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:52:39 +0200] rev 568
upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:52:33 +0200] rev 567
update MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:35:44 +0200] rev 566
merge (overwrite wrong tag)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:34:59 +0200] rev 565
Added tag 1.0.2 for changeset 5559e5a4b656
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:34:03 +0200] rev 564
prepare 1.0.2
Pierre-Yves David <pierre-yves.david@logilab.fr> [Sun, 16 Sep 2012 04:19:52 +0200] rev 563
Added tag 1.0.2 for changeset b1bdcb4506de
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 14 Sep 2012 15:36:29 +0200] rev 562
hg prune: prevent empty call
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 12 Sep 2012 14:24:23 +0200] rev 561
fold: handle the lack of revision to fold
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 16:19:27 +0200] rev 560
fix readme header
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 16:17:56 +0200] rev 559
slight change to the evolve logo
thank to Adrien Di Mascio
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 16:17:11 +0200] rev 558
docs: fix makefile
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 15:59:27 +0200] rev 557
doc: add a logo
It's not that cute be we have one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 15:57:54 +0200] rev 556
README: remove bogus date
This version is not released yet.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 14:05:37 +0200] rev 555
update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 13:51:24 +0200] rev 554
commit --amend: adap to core 63e45aee46d4
commit is now able to create obsolete marker itself. We don't alter core if we
detect it's the case.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 12:38:49 +0200] rev 553
createmarkers: adapt to f85816af6294 in core
The createmarkers function is now in core. Fallback on our function if not
available
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 12:30:22 +0200] rev 552
warning: work around phase limitation when computing warnings
The new phase have not been written yet because we did not release the lock yet
:-/
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 12:19:13 +0200] rev 551
caches: now in core adapt to fb72eec7efd8
If we detect a cache mechanism in core we is it intead of instead our own
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 11:45:00 +0200] rev 550
evolve-cmd: fix merge error detection for external tools.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 10 Sep 2012 18:56:44 +0200] rev 549
Properly update after fold
The previous version only set the parent, it did not rebuilt dirstate or update
any file content.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 10 Sep 2012 18:22:45 +0200] rev 548
fix hg pull --rebase
There is more user of rebase than just the rebase command
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 10 Sep 2012 16:54:58 +0200] rev 547
remove all notion of --detach in the test
Mercurial 2.3 killed --detach (dance)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 10 Sep 2012 17:33:06 +0200] rev 546
fix missing --dest evolve output in dryrun
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 Aug 2012 11:50:37 +0200] rev 545
pkg: proper debian version
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 Aug 2012 11:32:21 +0200] rev 544
pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 Aug 2012 11:30:51 +0200] rev 543
Added tag 1.0.1 for changeset ca5bb72d14ae
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 Aug 2012 11:30:30 +0200] rev 542
pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 Aug 2012 11:18:39 +0200] rev 541
pkg: prepare version 1.0.1
Patrick Mezard <patrick@mezard.eu> [Thu, 30 Aug 2012 22:05:05 +0200] rev 540
evolve: fixing syntax/grammar
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 21:47:09 +0200] rev 539
hgweb: disable branchtip filtering for hgweb
hgweb make extensibe use of branchtip we should.
- Our branchtip wrapping make the function expensive, killing performance.
- We do not filter anything un hgweb yet.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 30 Aug 2012 20:28:00 +0200] rev 538
doc improvement
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 14:03:14 +0200] rev 537
pkg-debian: fix uploader fields
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 14:01:53 +0200] rev 536
pkg-debian: improve control files
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 14:01:29 +0200] rev 535
pkg-debian: remove conflicting __init__.py files
Aurelien Campeas <aurelien.campeas@logilab.fr> [Thu, 30 Aug 2012 13:54:43 +0200] rev 534
a better msg for this tricky situation
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 13:50:17 +0200] rev 533
test conflicting conflicting (sic) resolution
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Aug 2012 11:58:21 +0200] rev 532
Added tag 1.0.0 for changeset b18b00036355
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Aug 2012 11:36:10 +0200] rev 531
pkg/debian: Debian packaging
This change add the necessary files to create a debian package for the evolve
extension. I do not care about the rest.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Aug 2012 11:15:03 +0200] rev 530
tests: remove unused required tools
The original mercurial test use much more stuff than us.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Aug 2012 11:10:29 +0200] rev 529
pkg: exclude tests for unpackaged extension
the old obsolete format BC and qsync are not included in this package. exclude
related tests.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 18:35:46 +0200] rev 528
test: remove unused obsolete extension in the tutorial
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 15:31:42 +0200] rev 527
docs: add missing blank line after Copyright notice
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 15:19:28 +0200] rev 526
hgignore: ignore compiled tutorials
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 15:17:13 +0200] rev 525
doc: remove spurious print in test2rest.py
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 15:16:47 +0200] rev 524
pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 14:57:20 +0200] rev 523
doc: long desc update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 14:56:11 +0200] rev 522
remove old qsync enable file
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 14:54:26 +0200] rev 521
setup: fix version number to 1.0.0
0.1.0 was release times ago
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 26 Aug 2012 12:04:16 +0200] rev 520
Conditionnaly add the `hidden` revset symbol
Mercurial Core#default now have it (but 2.3 don't)
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 25 Aug 2012 14:43:34 +0200] rev 519
ensure all file have a copyright notice
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 25 Aug 2012 14:43:18 +0200] rev 518
add COPYING File with the license
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 09:45:03 +0200] rev 517
evolve: usual syntax/grammar errors/long lines cleanup
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 09:32:05 +0200] rev 516
evolve: simplify locking in _solveconflicting()
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 09:18:40 +0200] rev 515
fold: simplify locking
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 09:20:15 +0200] rev 514
touch: simplify locking pattern
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 08:51:37 +0200] rev 513
evolve: factor out copy/paste in obssummary()
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 08:30:02 +0200] rev 512
evolve: avoid 'any' argument name in _picknexttroubled()
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 08:26:28 +0200] rev 511
evolve: localrepo.revs() already returns a list
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 08:20:50 +0200] rev 510
evolve: compute "troubled" revs in stabilize only when necessary
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 08:17:59 +0200] rev 509
evolve: move _stabilizableunstable() with related functions
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 07:59:51 +0200] rev 508
test-tutorial: stop using enable.sh, removed by 53d7e3413337
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 19:11:49 +0200] rev 507
evolve: add touch and fold to command that may create troubles
They should raise warning about it too.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 17:27:09 +0200] rev 506
doc: add missing image
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 17:12:47 +0200] rev 505
doc: fix emphasis
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 17:12:30 +0200] rev 504
doc: remove toc reference to dead file
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 17:12:07 +0200] rev 503
setup.py: remove setuptools related info
bad setuptool bad.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 15:55:40 +0200] rev 502
doc: add more warning
This is not "stable"
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 13:19:11 +0200] rev 501
update implementation details
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 12:47:12 +0200] rev 500
Doc: several update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:53:55 +0200] rev 499
Prepare 0.1.0 by merging default into stable
stable is now compatible with 2.3 only.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:49:21 +0200] rev 498
pkg: rewrote the install process
We now have a single extension.
- enable is dropped
- a setup.py is added
- the doc is updated to reflect this
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:52:49 +0200] rev 497
evolve: add the odiff alias
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:39:22 +0200] rev 496
[pkg] Add a setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:39:03 +0200] rev 495
Ignore build directory
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:30:01 +0200] rev 494
update documentation
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:21:09 +0200] rev 493
doc: some terms update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:17:18 +0200] rev 492
rename `stabilize` to `evolve`
stabilize keep being valide but as Matt still like "Changeset Evolution" as a
name evolve make more sense.
Stabilize is a bit too tight to unstable too.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 10:44:23 +0200] rev 491
merge evolve and obsolete
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 18:21:18 +0200] rev 490
sort import
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 18:19:42 +0200] rev 489
Fix mercurial version check
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 18:09:45 +0200] rev 488
Start a mercurial 2.2 branch
This branch contains and old version compatible with mercurial 2.2.
It's less complete and safe than later version.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 18:01:28 +0200] rev 487
update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 18:00:29 +0200] rev 486
fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 17:40:28 +0200] rev 485
evolve: stabilize now handle conflicting changeset
Some a lot of rough edge but it just damn work.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 14:15:36 +0200] rev 484
stabilize: conflicting changeset are considered if "."
if not unstable changeset are found, the current parent directory may be
stabilize if conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 12:53:27 +0200] rev 483
Introduction of olog as an alias
This will won't stay as such long.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 23 Aug 2012 12:51:06 +0200] rev 482
evolve: fold command
First crude version of a fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 23 Aug 2012 12:51:34 +0200] rev 481
evolve: touch command
command to easily revive a changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 23 Aug 2012 03:14:03 +0200] rev 480
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 12:23:34 +0200] rev 479
obsolete: add obsolete data to summary.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 12:23:00 +0200] rev 478
update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 21 Aug 2012 12:47:50 +0200] rev 477
merge with stable improvement
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 21 Aug 2012 12:43:21 +0200] rev 476
[evolve] amend: display proper error message while trying to amend non ancestor
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 21 Aug 2012 12:42:09 +0200] rev 475
[evolve] amend: check phase before starting the transition
We better abort before starting a useless transaction.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 21 Aug 2012 12:38:19 +0200] rev 474
test: turn the base public
usefull for followup that test phases enforcement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 21 Aug 2012 04:36:25 +0200] rev 473
obsolete: prevent bare hg update to select hidden changeset
The issue remain with branch name.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 21 Aug 2012 02:50:11 +0200] rev 472
obsolete: prevent rebasing of public changeset
Because we force keep we have to check this on our own.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 21 Aug 2012 02:25:19 +0200] rev 471
obsolete: warn when the whole rebase set was remove because extinct
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 19:12:20 +0200] rev 470
obsolete: use flag to detect that a obsolescence marker fix a latecomer
Otherwise latecomer fix will be latecomer too.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 21 Aug 2012 10:10:44 +0200] rev 469
stabilize: handle latecomer
Merge are not handled yet.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 18:59:07 +0200] rev 468
stabilize: rework stabilize code to allow selection of latecomer and conflicting
They are still unhandled but the tool now explicitly state this fact.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 15:43:57 +0200] rev 467
obsolete: add a "troubled" revset
returns all changeset with troubles whatever the trouble is.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 14:40:48 +0200] rev 466
stabilize: handle killed changeset in stabilize.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 14:13:29 +0200] rev 465
stabilize: --continue support !!!
Based on graft one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 12:31:43 +0200] rev 464
stabilize: rename "node" variable to "orig"
It's a not a node at all. this is a context.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 12:25:08 +0200] rev 463
obsolete Move merge failure handling into stabilize code
This violate less Layer. For this purpose we crate an easy to recognize
Exception Class.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 20 Aug 2012 22:18:10 +0200] rev 462
obsolet: fix extension help code about extension wrapping
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 21 Aug 2012 02:37:53 +0200] rev 461
merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 21 Aug 2012 02:36:33 +0200] rev 460
obsolete: filter out nullid from possible successors
This have several bad effect as wrong late comer detection.
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 16:54:48 +0200] rev 459
obsolete: more typos and cleanup
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 16:34:25 +0200] rev 458
obsolete: fix indentation in obsolete import block
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 16:09:09 +0200] rev 457
obsolete: fix docstrings
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 15:38:55 +0200] rev 456
obsolete: simplify module docstring
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 16:51:45 +0200] rev 455
obsolete: simplify rebase wrapping code and change relation creation
We have don't have changeset simply pruned by rebase. When they disapeared, that
means that destination is a valid successors for them.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 15:40:09 +0200] rev 454
obsolete: more comment
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 13:51:10 +0200] rev 453
remove useless function
It has no user left and no purpose in live.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 13:50:48 +0200] rev 452
add cleanup todo
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 12:59:32 +0200] rev 451
more doc and cleanup
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 11:54:27 +0200] rev 450
obsolete: document the cache stuff
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 11:10:43 +0200] rev 449
obsolete: Improves cache invalidation logic
Filecache are not the same that cache property.
This can probably be improved
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 07 Aug 2012 21:39:55 +0200] rev 448
obsolete: some more movement
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 21:35:39 +0200] rev 447
obsolete: move caches on obsstore
No need to clutter local repo
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 18:53:26 +0200] rev 446
obsolete: remove legacy revset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 18:46:38 +0200] rev 445
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 18:26:13 +0200] rev 444
drop repo.addobsolete
We now use createmarkers directly.
No black magic with nullid is done anymore.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 18:05:41 +0200] rev 443
obsolete: remove usage of addcollapsedobsolete
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 18:17:13 +0200] rev 442
obsolete: extract high level marker creation in a dedicated util function
This prepare the dooms of repo based method.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 16:02:50 +0200] rev 441
obsolete: remove debugsuccessors
This was kinda duplicate of core "debugobsolete"
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 15:38:20 +0200] rev 440
obsolete: tag more function for disapearance
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 15:05:04 +0200] rev 439
obsolete: reorder import
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 15:04:03 +0200] rev 438
obsolete: some more dead code
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 15:02:54 +0200] rev 437
obsolete: sort all code
Move (splitting some function) all code in dedicated section
The hook wrapping have disapeared in the process.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:38:28 +0200] rev 436
obsolete: remove unused repo method
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:34:25 +0200] rev 435
obsolete: clean up import
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:33:24 +0200] rev 434
obsolete: more BC drop
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:32:54 +0200] rev 433
obsolete: move version checks at the start of the file
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:19:18 +0200] rev 432
obsolete: some more comment
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:08:20 +0200] rev 431
obsolete: add and use templatekw decorator
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:00:39 +0200] rev 430
obsolete: move old format stuff at the end
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:08:31 +0200] rev 429
obsolete: introduce an extension helper and use it
this extension helper allow most of setup operation to be declared in place
using decorator. This allow clear separation between independant part of the
code.
This is the first HUGE wave of changes related to this introduction.
The goal is to have a clear distinction and documention of every part of this
extension.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 07 Aug 2012 11:35:45 +0200] rev 428
obsolete: remove 2.2 compat hack
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 19:34:24 +0200] rev 427
merge with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 19:31:52 +0200] rev 426
Added tag 0.7 for changeset 1b2757c1bd91
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 19:31:15 +0200] rev 425
changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 19:16:30 +0200] rev 424
enable: update check to ensure people use 2.3
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 06 Aug 2012 17:02:38 +0200] rev 423
obsolete: remove unused BC code
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 16:56:17 +0200] rev 422
hgignore: ignore the "common" tests/easy_run.sh file
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 17:15:00 +0200] rev 421
test: drop old BC clause
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 05 Aug 2012 12:02:45 +0200] rev 420
merge
Patrick Mezard <patrick@mezard.eu> [Sat, 04 Aug 2012 12:44:51 +0200] rev 419
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu> [Sun, 05 Aug 2012 11:34:21 +0200] rev 418
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu> [Sat, 04 Aug 2012 12:48:20 +0200] rev 417
evolve: avoid duplication in graft wrapper
Patrick Mezard <patrick@mezard.eu> [Sat, 04 Aug 2012 12:28:21 +0200] rev 416
obsolete/evolve: fix grammar in prerequisite messages
Patrick Mezard <patrick@mezard.eu> [Sat, 04 Aug 2012 12:06:34 +0200] rev 415
obsolete: fix doc, rebase no longer aborts with --keep
Patrick Mezard <patrick@mezard.eu> [Fri, 03 Aug 2012 17:48:21 +0200] rev 414
evolve: tweak and add EOL to kill warning
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 14:30:00 +0200] rev 413
nopushpublish: add license en copyright notice
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 14:26:41 +0200] rev 412
obsolete: simplify obsolete feature enabling
We don't need setattr here
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 02 Aug 2012 18:52:15 +0200] rev 411
merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 30 Jul 2012 22:45:06 +0200] rev 410
amend: wrap the whole process in a single transaction.
David Douard <david.douard@logilab.fr> [Tue, 31 Jul 2012 15:23:01 +0200] rev 409
pushkey: properly handle abort during obsolete markers push
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 15:04:59 +0200] rev 408
hook: work around insanely huge value in obsolete pushkey call
The value is not that useful and make shell call explode.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 12:47:56 +0200] rev 407
merge with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 12:45:45 +0200] rev 406
Added tag 0.6 for changeset 4a5488c01a66
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 12:45:24 +0200] rev 405
obsolete: enable obsolete feature
The feature is now disabled by default in core.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 11:53:41 +0200] rev 404
obsolete: improve compat with new core dump%i scheme
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jul 2012 14:45:42 +0200] rev 403
add nopushpublish extension.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jul 2012 14:45:08 +0200] rev 402
move the extension to contrib to prepare merge with mutable history
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jul 2012 14:42:02 +0200] rev 401
some doc
David Douard <david.douard@logilab.fr> [Fri, 25 May 2012 11:21:43 +0200] rev 400
initial import
Simple extension that prevent from pushing in a publishing remote repo.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jul 2012 12:37:33 +0200] rev 399
merge with stable
Patrick Mezard <patrick@mezard.eu> [Sun, 29 Jul 2012 17:25:47 +0200] rev 398
obsolete: fix hidden() revset
The hiddenrevs set was moved from changelog to localrepository in
hg@62c56c94c77e.
Patrick Mezard <patrick@mezard.eu> [Sun, 29 Jul 2012 17:10:43 +0200] rev 397
obsolete: improve revset online help
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 27 Jul 2012 15:04:55 +0200] rev 396
make compat server both compatible with "dump" and "dump%i" version
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 26 Jul 2012 15:23:05 +0200] rev 395
merge
David Douard <david.douard@logilab.fr> [Wed, 18 Jul 2012 12:40:41 +0200] rev 394
qsync: ignore unexistent nodes
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 26 Jul 2012 15:17:34 +0200] rev 393
backout 97b75bbfacc5. Use cached version of obsolete, unstable and extinct
The core version are far too slow
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 26 Jul 2012 15:09:08 +0200] rev 392
backout temporary fix for clone
Now fixed into core
Patrick Mezard <patrick@mezard.eu> [Thu, 26 Jul 2012 13:42:12 +0200] rev 391
.hgignore: ignore vi swap files
Patrick Mezard <patrick@mezard.eu> [Thu, 26 Jul 2012 13:40:32 +0200] rev 390
obsolete: fix typos, improve messages
Patrick Mezard <patrick@mezard.eu> [Thu, 26 Jul 2012 13:45:09 +0200] rev 389
test-obsolete: handle local clones copying obsolete markers
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:36:02 +0200] rev 388
obsolete: rely on core for context and reveset which exist there
(this means loosing the cache :-( )
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:28:46 +0200] rev 387
obsolete: rely on core for rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:26:01 +0200] rev 386
obsolete: rely on core to hide extinct changeset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:23:43 +0200] rev 385
obsolete: Stop turning obsolete secret changesets secret
Extinct changeset are not properly excluded by core.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:14:18 +0200] rev 384
obsolete remove unused module
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:13:43 +0200] rev 383
obsolete: drop outdated doc
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:07:20 +0200] rev 382
Use the core check heads mecanism to prevent zaelous warning
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:08:45 +0200] rev 381
obsolete: rely on core to filter extinct changeset out
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 26 Jul 2012 11:44:05 +0200] rev 380
[temp] fix obsolete marker cloning broken in core.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 18:18:38 +0200] rev 379
Wider triggering of the debug marker abort
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 18:09:11 +0200] rev 378
obsolete: fix visibleheads/branchmap wrapping
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 17:53:17 +0200] rev 377
merge with stable fix and preparation
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 17:43:38 +0200] rev 376
obsolete: move hint punching to push
Core does not raise the warning in check heads
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 17:40:50 +0200] rev 375
obsolete: doc punch the hint about hg stabilize into the push error message.
The goal is to ease the transposition of to default where half of the message
may be raised by core directly.
Patrick Mezard <patrick@mezard.eu> [Wed, 25 Jul 2012 17:28:32 +0200] rev 374
obsolete: change warning output to match mercurial core on
The new messages were introduced by hg@12fdaa30063a.
Patrick Mezard <patrick@mezard.eu> [Thu, 19 Jul 2012 16:16:08 +0200] rev 373
doc: fix weird quote in from-mq.rst
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 17 Jul 2012 19:49:08 +0200] rev 372
merge with 0.5
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 17 Jul 2012 19:47:54 +0200] rev 371
Added tag 0.5 for changeset 7ef8ab8c6fea
Pierre-Yves.David@ens-lyon.org [Mon, 16 Jul 2012 16:57:17 +0200] rev 370
some more fix
Pierre-Yves.David@ens-lyon.org [Mon, 16 Jul 2012 03:59:39 +0200] rev 369
marmoute N+2 pass
Alain Leufroy <alain.leufroy@logilab.fr> [Sun, 15 Jul 2012 16:19:02 +0200] rev 368
[docs] obsolete: fix some typos
Pierre-Yves.David@ens-lyon.org [Sun, 15 Jul 2012 14:51:52 +0200] rev 367
merge with doc fix
Pierre-Yves.David@ens-lyon.org [Sun, 15 Jul 2012 14:42:21 +0200] rev 366
grmlgm edit
Pierre-Yves.David@ens-lyon.org [Sun, 15 Jul 2012 13:07:54 +0200] rev 365
evolve: switch the official name for "kill" to prune
doc have been updated too
Pierre-Yves.David@ens-lyon.org [Sun, 15 Jul 2012 12:57:22 +0200] rev 364
doc: cleanup in caveat and 2.1 compat
Pierre-Yves.David@ens-lyon.org [Sun, 15 Jul 2012 12:49:25 +0200] rev 363
doc: big update of terms and summary of the concept
This is intended to be sent to the mailing list for discussion.
Pierre-Yves.David@ens-lyon.org [Sat, 14 Jul 2012 18:10:24 +0200] rev 362
evolve: add the solve alias to obsolete
Pierre-Yves.David@ens-lyon.org [Fri, 13 Jul 2012 13:07:42 +0200] rev 361
obsolete: adapt to core: marker are written in transaction now
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 11 Jul 2012 21:07:02 +0200] rev 360
obsolete: ctx.obsolete in core is not buggy anymore
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 11 Jul 2012 15:20:22 +0200] rev 359
merge with conflicting detection
Pierre-Yves.David@ens-lyon.org [Sat, 14 Jul 2012 17:58:08 +0200] rev 358
merge with doc fix
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Wed, 11 Jul 2012 13:59:06 -0400] rev 357
doc: English proofreading
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 11 Jul 2012 13:59:02 +0200] rev 356
Move obserror warning into the obsolete extension.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 11 Jul 2012 13:38:48 +0200] rev 355
evolve: warn on conflicting changeset too
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 11 Jul 2012 12:38:05 +0200] rev 354
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 10 Jul 2012 16:14:29 +0200] rev 353
merge with stable fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 10 Jul 2012 16:14:03 +0200] rev 352
Added tag 0.4.1 for changeset 4ecbaec1d664
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 10 Jul 2012 16:07:48 +0200] rev 351
Ignore buggy marker in newerversion
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 10 Jul 2012 16:03:29 +0200] rev 350
[convert] properly exclude null successors from convertion
Old remain of the old way to kill changeset.
Patrick Mezard <patrick@mezard.eu> [Tue, 10 Jul 2012 15:14:58 +0200] rev 349
obsolete: remove unused add2set/markerid functions
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 10 Jul 2012 01:05:13 +0200] rev 348
Merge with debugconvertobsolete update
Patrick Mezard <patrick@mezard.eu> [Sun, 08 Jul 2012 19:18:07 +0200] rev 347
docs: improve recent updates
Patrick Mezard <patrick@mezard.eu> [Sun, 08 Jul 2012 19:02:36 +0200] rev 346
tests: update graphlog output after hg@2e13c1bd34dc
2e13c1bd34dc displays obsolete changesets as 'x' instead of 'o'.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 06 Jul 2012 18:43:25 +0200] rev 345
Added tag 0.4.0 for changeset 9bbcd2746898
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 06 Jul 2012 18:32:10 +0200] rev 344
obsolete: fix bug in detection of remote obsolete support
We were checking again local...
Pierre-Yves.David@ens-lyon.org [Tue, 03 Jul 2012 11:35:31 +0200] rev 343
adapt for new mercurial
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 03 Jul 2012 14:18:33 +0200] rev 342
merge with new binary format
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 06 Jul 2012 17:15:30 +0200] rev 341
obsolete: harden convertion from first format
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 06 Jul 2012 16:32:53 +0200] rev 340
obsolete: better lookuperror handling during convert
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 06 Jul 2012 16:25:06 +0200] rev 339
[obsolete] convert json unicode into string before creating an obsolete marker
David Douard <david.douard@logilab.fr> [Fri, 06 Jul 2012 15:39:01 +0200] rev 338
obsolete: we are not compatible with 2.1 any more
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 04 Jul 2012 18:00:43 +0200] rev 337
obsolete: convert try to guess what invalid node id are
invalid input are probably short version of node
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 04 Jul 2012 17:51:33 +0200] rev 336
obsolete: Only warn on bad obsolete marker
Older version probably created invalide one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 04 Jul 2012 16:27:08 +0200] rev 335
obsolete: fix obsolete marker creation error message
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 03 Jul 2012 12:58:55 +0200] rev 334
obsolete: move to official binary format
Pierre-Yves.David@ens-lyon.org [Sat, 30 Jun 2012 03:25:25 +0200] rev 333
merge with stable fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 17:21:24 +0200] rev 332
obsolete: public changeset are no longer latecomer.
They are plain duplicate.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:29:25 +0200] rev 331
merge back with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:28:35 +0200] rev 330
more README changes (oops)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:14:35 +0200] rev 329
Added tag 0.3.0 for changeset c046b083a5e0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:14:17 +0200] rev 328
README: minor changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:12:19 +0200] rev 327
Merge default new feature in stable
0.3.0 planned
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:10:59 +0200] rev 326
stabilize: clear error message than conflict during rebase offer no hope
The warning is big and ugly. It will be removed when stab handle that properly.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 14:48:44 +0200] rev 325
doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 12:48:16 +0200] rev 324
readme: explain "instalation process"
if it may be called like that.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 12:44:54 +0200] rev 323
merge with stable doc update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 12:43:57 +0200] rev 322
setup: update alias with new wording
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 12:30:10 +0200] rev 321
obsolete: add an hidden revset
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 27 Jun 2012 12:30:16 +0200] rev 320
obsolete: basic commit --amend support
commit --amend still strip. but lay obsolete marker down anyway
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 27 Jun 2012 03:53:44 +0200] rev 319
evolve: add a prune alias for kill
pro:
- it's short
- It's already used in version control context
- it's in the same lexical field than `graft`
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 27 Jun 2012 03:51:54 +0200] rev 318
evolve: warn when uncommit leave an empty changeset
This is intended to replace the proposed --delete flag.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 27 Jun 2012 03:37:49 +0200] rev 317
evolve: improve kill testing
show than uncommited changes are properly merged
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 26 Jun 2012 18:23:30 +0200] rev 316
oops (forget to amend)
Patrick Mezard <patrick@mezard.eu> [Tue, 26 Jun 2012 16:21:08 +0200] rev 315
uncommit: warn about new instability
Patrick Mezard <patrick@mezard.eu> [Sat, 23 Jun 2012 19:24:37 +0200] rev 314
uncommit: add --all option
Convenient when combined with --exclude.
Patrick Mezard <patrick@mezard.eu> [Tue, 26 Jun 2012 16:12:52 +0200] rev 313
uncommit: handle bookmarks
Extract the bookmarks handling code from amend and share it with
uncommit.
Patrick Mezard <patrick@mezard.eu> [Tue, 26 Jun 2012 18:12:31 +0200] rev 312
evolve: add uncommit command
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 26 Jun 2012 14:35:09 +0200] rev 311
obsolete: enable rebase --keep again
We still never strip anything. But using --keep on the command line dos not lay
marker.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 26 Jun 2012 12:24:04 +0200] rev 310
[obsolete] fix revset error message
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 26 Jun 2012 11:29:51 +0200] rev 309
evolve: warn when latecomer changeset are created
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 25 Jun 2012 15:18:47 +0200] rev 308
obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 26 Jun 2012 11:33:39 +0200] rev 307
obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 26 Jun 2012 11:13:46 +0200] rev 306
obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 26 Jun 2012 11:11:52 +0200] rev 305
update revset vocabulary to use precursors, successors
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 25 Jun 2012 12:40:42 +0200] rev 304
obsolete: remove unused variable in rebase wrapping
Patrick Mezard <patrick@mezard.eu> [Sat, 23 Jun 2012 11:46:06 +0200] rev 303
evolve: tidy up a bit
- long lines
- extra blank lines
- commands options descriptions
Patrick Mezard <patrick@mezard.eu> [Sat, 23 Jun 2012 11:14:09 +0200] rev 302
obsolete: make collapse create less markers
Collapsing A and B into C was registering:
A -> C
B -> C
A -> B
At this point, the last relation brings nothing and is removed for the
sake of simplicity:
A -> C
B -> C
test-evolve.t is slightly modified as one of the relations let stabilize
compute a target outside of the parent revision tree. This is a
stabilize bug, not trivial to fix, so let's tweak the test for now.
Patrick Mezard <patrick@mezard.eu> [Fri, 22 Jun 2012 19:32:18 +0200] rev 301
obsolete: remove unused code from reposetup()
Patrick Mezard <patrick@mezard.eu> [Sat, 23 Jun 2012 01:14:49 +0200] rev 300
obsolete: suspended changeset with secret only children should be secret too
test-obsolete-push.t: exhibit outgoing bug with suspended changeset in this case
Patrick Mezard <patrick@mezard.eu> [Fri, 22 Jun 2012 18:04:43 +0200] rev 299
obsolete: add 'obsolete' keyword
The obsolete keyword displays the node status among 'stable',
'unstable', 'suspended', 'extinct'.
Patrick Mezard <patrick@mezard.eu> [Thu, 21 Jun 2012 19:58:57 +0200] rev 298
obsolete: unify collapsed revisions markers handling
When collapsing A, B and C into D, amend was registering:
A -> D
B -> D
A -> B
C -> D
A -> C
while the rebase wrapper was doing:
A -> D
B -> D
C -> D
At this point, I have no argument to favor one or another or even a new
one like:
A -> B
B -> C
C -> D
so I am aligning the rebase implementation on the older amend one. At
least we can now change them all at once.
Patrick Mezard <patrick@mezard.eu> [Thu, 21 Jun 2012 19:24:19 +0200] rev 297
rebase: improve invalid revisions filtering
- Filter rebasestate nullmerge and unrebased revision before considering
updating obsolete. This simplifies the handling of obsolete and make
it ignore unrebased revision rather than extinguishing them.
- Apply obsolete markers only if rebasestate is not empty, testing
rebasetarget was irrelevant.
Patrick Mezard <patrick@mezard.eu> [Thu, 21 Jun 2012 18:00:32 +0200] rev 296
test-evolve: extend output and exhibit an amend bug
The extended section shows the parent revision stabilizing itself on
another revision, without --any. In theory, only descendants of the
parent predecessors or of its descendants should be stabilized, and be
stabilized in parent subtree. Unfortunately, stabilize implementation
correctly picks the changesets to stabilize but not their target.
This problem is aggravated by amend registering too many obsolete
markers which prevents the stabilize selection heuristic to prune
several changesets.
Patrick Mezard <patrick@mezard.eu> [Thu, 21 Jun 2012 17:33:02 +0200] rev 295
evolve: remove --change . == --change .^ crazyness
Patrick Mezard <patrick@mezard.eu> [Thu, 21 Jun 2012 16:23:42 +0200] rev 294
evolve: use explicit phase constants
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 18:04:50 +0200] rev 293
[doc] update readme
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 16:19:21 +0200] rev 292
[doc] have people update on stable after cloning
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 16:07:20 +0200] rev 291
merge with fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 16:07:01 +0200] rev 290
merge with fix
David Douard <david.douard@logilab.fr> [Mon, 11 Jun 2012 11:59:08 +0200] rev 289
[qsync] fix: 'newerversion' expect node id, not hexid
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 15:57:57 +0200] rev 288
merge back with stable tag
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 15:57:35 +0200] rev 287
Added tag 0.2.0 for changeset d3f20770b86a
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 15:57:28 +0200] rev 286
Merge with Patrick improvement
Patrick Mezard <patrick@mezard.eu> [Wed, 20 Jun 2012 14:43:20 +0200] rev 285
obsolete: do not obsolete rebase --detach nullmerge revs
Rebase state contains the changesets to rebase as well as 'nullmerge'
entries used drive the merge strategy. These nullmerge were not rebased
and should be ignored, and certainly not be marked obsolete.
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 17:57:54 +0200] rev 284
evolve: fix relocate() with removed revision
relocate() was not handling the case where the rebased revision was
discarded and was raising when trying to update the phase of None.
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 17:58:49 +0200] rev 283
test-obsolete-rebase.t: test --abort and --continue