Fri, 06 Jul 2012 16:32:53 +0200 obsolete: better lookuperror handling during convert stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 06 Jul 2012 16:32:53 +0200] rev 340
obsolete: better lookuperror handling during convert
Fri, 06 Jul 2012 16:25:06 +0200 [obsolete] convert json unicode into string before creating an obsolete marker stable
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
Fri, 06 Jul 2012 15:39:01 +0200 obsolete: we are not compatible with 2.1 any more stable
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
Wed, 04 Jul 2012 18:00:43 +0200 obsolete: convert try to guess what invalid node id are stable
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
Wed, 04 Jul 2012 17:51:33 +0200 obsolete: Only warn on bad obsolete marker stable
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.
Wed, 04 Jul 2012 16:27:08 +0200 obsolete: fix obsolete marker creation error message stable
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
Tue, 03 Jul 2012 12:58:55 +0200 obsolete: move to official binary format stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 03 Jul 2012 12:58:55 +0200] rev 334
obsolete: move to official binary format
Sat, 30 Jun 2012 03:25:25 +0200 merge with stable fix
Pierre-Yves.David@ens-lyon.org [Sat, 30 Jun 2012 03:25:25 +0200] rev 333
merge with stable fix
Wed, 27 Jun 2012 17:21:24 +0200 obsolete: public changeset are no longer latecomer. stable
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.
Wed, 27 Jun 2012 15:29:25 +0200 merge back with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:29:25 +0200] rev 331
merge back with stable
Wed, 27 Jun 2012 15:28:35 +0200 more README changes (oops) stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:28:35 +0200] rev 330
more README changes (oops)
Wed, 27 Jun 2012 15:14:35 +0200 Added tag 0.3.0 for changeset c046b083a5e0 stable
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
Wed, 27 Jun 2012 15:14:17 +0200 README: minor changelog update stable 0.3.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:14:17 +0200] rev 328
README: minor changelog update
Wed, 27 Jun 2012 15:12:19 +0200 Merge default new feature in stable stable
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
Wed, 27 Jun 2012 15:10:59 +0200 stabilize: clear error message than conflict during rebase offer no hope
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.
Wed, 27 Jun 2012 14:48:44 +0200 doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 14:48:44 +0200] rev 325
doc: readme and uncommit reference
Wed, 27 Jun 2012 12:48:16 +0200 readme: explain "instalation process"
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.
Wed, 27 Jun 2012 12:44:54 +0200 merge with stable doc update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 12:44:54 +0200] rev 323
merge with stable doc update
Wed, 27 Jun 2012 12:43:57 +0200 setup: update alias with new wording
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 12:43:57 +0200] rev 322
setup: update alias with new wording
Wed, 27 Jun 2012 12:30:10 +0200 obsolete: add an hidden revset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 12:30:10 +0200] rev 321
obsolete: add an hidden revset
Wed, 27 Jun 2012 12:30:16 +0200 obsolete: basic commit --amend support
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
Wed, 27 Jun 2012 03:53:44 +0200 evolve: add a prune alias for kill
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`
Wed, 27 Jun 2012 03:51:54 +0200 evolve: warn when uncommit leave an empty changeset
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.
Wed, 27 Jun 2012 03:37:49 +0200 evolve: improve kill testing
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
Tue, 26 Jun 2012 18:23:30 +0200 oops (forget to amend)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 26 Jun 2012 18:23:30 +0200] rev 316
oops (forget to amend)
Tue, 26 Jun 2012 16:21:08 +0200 uncommit: warn about new instability
Patrick Mezard <patrick@mezard.eu> [Tue, 26 Jun 2012 16:21:08 +0200] rev 315
uncommit: warn about new instability
Sat, 23 Jun 2012 19:24:37 +0200 uncommit: add --all option
Patrick Mezard <patrick@mezard.eu> [Sat, 23 Jun 2012 19:24:37 +0200] rev 314
uncommit: add --all option Convenient when combined with --exclude.
Tue, 26 Jun 2012 16:12:52 +0200 uncommit: handle bookmarks
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.
Tue, 26 Jun 2012 18:12:31 +0200 evolve: add uncommit command
Patrick Mezard <patrick@mezard.eu> [Tue, 26 Jun 2012 18:12:31 +0200] rev 312
evolve: add uncommit command
Tue, 26 Jun 2012 14:35:09 +0200 obsolete: enable rebase --keep again
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.
Tue, 26 Jun 2012 12:24:04 +0200 [obsolete] fix revset error message
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 26 Jun 2012 12:24:04 +0200] rev 310
[obsolete] fix revset error message
Tue, 26 Jun 2012 11:29:51 +0200 evolve: warn when latecomer changeset are created
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
Mon, 25 Jun 2012 15:18:47 +0200 obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 25 Jun 2012 15:18:47 +0200] rev 308
obsolete: detect late comer during push
Tue, 26 Jun 2012 11:33:39 +0200 obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 26 Jun 2012 11:33:39 +0200] rev 307
obsolete: add latecomer computation and display
Tue, 26 Jun 2012 11:13:46 +0200 obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 26 Jun 2012 11:13:46 +0200] rev 306
obsolete: add precursors and successors revset.
Tue, 26 Jun 2012 11:11:52 +0200 update revset vocabulary to use precursors, successors
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
Mon, 25 Jun 2012 12:40:42 +0200 obsolete: remove unused variable in rebase wrapping
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
Sat, 23 Jun 2012 11:46:06 +0200 evolve: tidy up a bit
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
Sat, 23 Jun 2012 11:14:09 +0200 obsolete: make collapse create less markers
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.
Fri, 22 Jun 2012 19:32:18 +0200 obsolete: remove unused code from reposetup()
Patrick Mezard <patrick@mezard.eu> [Fri, 22 Jun 2012 19:32:18 +0200] rev 301
obsolete: remove unused code from reposetup()
Sat, 23 Jun 2012 01:14:49 +0200 obsolete: suspended changeset with secret only children should be secret too
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
Fri, 22 Jun 2012 18:04:43 +0200 obsolete: add 'obsolete' keyword
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'.
Thu, 21 Jun 2012 19:58:57 +0200 obsolete: unify collapsed revisions markers handling
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.
Thu, 21 Jun 2012 19:24:19 +0200 rebase: improve invalid revisions filtering
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.
Thu, 21 Jun 2012 18:00:32 +0200 test-evolve: extend output and exhibit an amend bug
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.
Thu, 21 Jun 2012 17:33:02 +0200 evolve: remove --change . == --change .^ crazyness
Patrick Mezard <patrick@mezard.eu> [Thu, 21 Jun 2012 17:33:02 +0200] rev 295
evolve: remove --change . == --change .^ crazyness
Thu, 21 Jun 2012 16:23:42 +0200 evolve: use explicit phase constants
Patrick Mezard <patrick@mezard.eu> [Thu, 21 Jun 2012 16:23:42 +0200] rev 294
evolve: use explicit phase constants
Wed, 20 Jun 2012 18:04:50 +0200 [doc] update readme stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 18:04:50 +0200] rev 293
[doc] update readme
Wed, 20 Jun 2012 16:19:21 +0200 [doc] have people update on stable after cloning stable
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
Wed, 20 Jun 2012 16:07:20 +0200 merge with fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 16:07:20 +0200] rev 291
merge with fix
Wed, 20 Jun 2012 16:07:01 +0200 merge with fix stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 16:07:01 +0200] rev 290
merge with fix
Mon, 11 Jun 2012 11:59:08 +0200 [qsync] fix: 'newerversion' expect node id, not hexid
David Douard <david.douard@logilab.fr> [Mon, 11 Jun 2012 11:59:08 +0200] rev 289
[qsync] fix: 'newerversion' expect node id, not hexid
Wed, 20 Jun 2012 15:57:57 +0200 merge back with stable tag
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 15:57:57 +0200] rev 288
merge back with stable tag
Wed, 20 Jun 2012 15:57:35 +0200 Added tag 0.2.0 for changeset d3f20770b86a stable
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
Wed, 20 Jun 2012 15:57:28 +0200 Merge with Patrick improvement stable 0.2.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 15:57:28 +0200] rev 286
Merge with Patrick improvement
Wed, 20 Jun 2012 14:43:20 +0200 obsolete: do not obsolete rebase --detach nullmerge revs
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.
Tue, 19 Jun 2012 17:57:54 +0200 evolve: fix relocate() with removed revision
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.
Tue, 19 Jun 2012 17:58:49 +0200 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 17:58:49 +0200] rev 283
test-obsolete-rebase.t: test --abort and --continue
Tue, 19 Jun 2012 18:05:23 +0200 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 18:05:23 +0200] rev 282
obsolete: handle rebase --collapse Recording obsolete in concludenode() did not work for --collapse because only the first revision was passed to the call. The new strategy is to track the rebase state in defineparents() and concludenode() and to create markers only after a successful non-abort call. In theory, this should also fix --continue/--abort cases. The change in test-stabilize-order.t comes from concludenode() no longer creating obsolete marker. stabilize command was actually duplicating markers, once in concludenode(), once explicitely.
Tue, 19 Jun 2012 17:05:39 +0200 test-stabilize-order.t: trace obsolete markers
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 17:05:39 +0200] rev 281
test-stabilize-order.t: trace obsolete markers Will prevent breakage in rebase.concludenode() overriding.
(0) -300 -100 -60 +60 +100 +300 +1000 +3000 tip