some more fix

marmoute N+2 pass

[docs] obsolete: fix some typos

merge with doc fix

grmlgm edit

evolve: switch the official name for "kill" to prune doc have been updated too

doc: cleanup in caveat and 2.1 compat

doc: big update of terms and summary of the concept This is intended to be sent to the mailing list for discussion.

evolve: add the solve alias to obsolete

obsolete: adapt to core: marker are written in transaction now

obsolete: ctx.obsolete in core is not buggy anymore

merge with conflicting detection

merge with doc fix

doc: English proofreading

Move obserror warning into the obsolete extension.

evolve: warn on conflicting changeset too

obsolete: Detect conflicting changeset!

merge with stable fix

Added tag 0.4.1 for changeset 4ecbaec1d664

Ignore buggy marker in newerversion

[convert] properly exclude null successors from convertion Old remain of the old way to kill changeset.

obsolete: remove unused add2set/markerid functions

Merge with debugconvertobsolete update

docs: improve recent updates

tests: update graphlog output after hg@2e13c1bd34dc 2e13c1bd34dc displays obsolete changesets as 'x' instead of 'o'.

Added tag 0.4.0 for changeset 9bbcd2746898

obsolete: fix bug in detection of remote obsolete support We were checking again local...

adapt for new mercurial

merge with new binary format

obsolete: harden convertion from first format

obsolete: better lookuperror handling during convert

[obsolete] convert json unicode into string before creating an obsolete marker

obsolete: we are not compatible with 2.1 any more

obsolete: convert try to guess what invalid node id are invalid input are probably short version of node

obsolete: Only warn on bad obsolete marker Older version probably created invalide one.

obsolete: fix obsolete marker creation error message

obsolete: move to official binary format

merge with stable fix

obsolete: public changeset are no longer latecomer. They are plain duplicate.

merge back with stable

more README changes (oops)

Added tag 0.3.0 for changeset c046b083a5e0

README: minor changelog update

Merge default new feature in stable 0.3.0 planned

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.

doc: readme and uncommit reference

readme: explain "instalation process" if it may be called like that.

merge with stable doc update

setup: update alias with new wording

obsolete: add an hidden revset

obsolete: basic commit --amend support commit --amend still strip. but lay obsolete marker down anyway

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`

evolve: warn when uncommit leave an empty changeset This is intended to replace the proposed --delete flag.

evolve: improve kill testing show than uncommited changes are properly merged

oops (forget to amend)

uncommit: warn about new instability

uncommit: add --all option Convenient when combined with --exclude.

uncommit: handle bookmarks Extract the bookmarks handling code from amend and share it with uncommit.

evolve: add uncommit command

obsolete: enable rebase --keep again We still never strip anything. But using --keep on the command line dos not lay marker.

[obsolete] fix revset error message

evolve: warn when latecomer changeset are created

obsolete: detect late comer during push

obsolete: add latecomer computation and display

obsolete: add precursors and successors revset.

update revset vocabulary to use precursors, successors

obsolete: remove unused variable in rebase wrapping

evolve: tidy up a bit - long lines - extra blank lines - commands options descriptions

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.

obsolete: remove unused code from reposetup()

obsolete: suspended changeset with secret only children should be secret too test-obsolete-push.t: exhibit outgoing bug with suspended changeset in this case

obsolete: add 'obsolete' keyword The obsolete keyword displays the node status among 'stable', 'unstable', 'suspended', 'extinct'.

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.

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.

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.

evolve: remove --change . == --change .^ crazyness

evolve: use explicit phase constants

[doc] update readme

[doc] have people update on stable after cloning

merge with fix

merge with fix

[qsync] fix: 'newerversion' expect node id, not hexid

merge back with stable tag

Added tag 0.2.0 for changeset d3f20770b86a

Merge with Patrick improvement

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.

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.

test-obsolete-rebase.t: test --abort and --continue

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.

test-stabilize-order.t: trace obsolete markers Will prevent breakage in rebase.concludenode() overriding.

test-obsolete-rebase.t: move --keep test from test-obsolete.t

obsolete: handle rebase removing empty changesets The new revision identifier returned by concludenode() was None and was not correctly translated to nullid.

obsolete: add or fix debug commands help

obsolete: do not duplicate command help

obsolete: use new-style command registration

obsolete: make rebase abort with --keep obsolete modifies rebase to mark rebased changesets obsolete instead of stripping them, which makes --keep irrelevant.