Commits

Author Commit Message Labels Comments Date
Patrick Mézard
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.
Branches
default
Patrick Mézard
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.
Branches
default
Patrick Mézard
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 man…
Branches
default
Patrick Mézard
evolve: remove --change . == --change .^ crazyness
Branches
default
Patrick Mézard
evolve: use explicit phase constants
Branches
default
Pierre-Yves David
[doc] update readme
Pierre-Yves David
[doc] have people update on stable after cloning
Pierre-Yves David
merge with fix
Branches
default
Pierre-Yves David
merge with fix
David Douard
[qsync] fix: 'newerversion' expect node id, not hexid
Branches
default
Pierre-Yves David
merge back with stable tag
Branches
default
Pierre-Yves David
Added tag 0.2.0 for changeset d3f20770b86a
Pierre-Yves David
Merge with Patrick improvement
Tags
0.2.0
Patrick Mézard
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.
Branches
default
Patrick Mézard
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.
Branches
default
Patrick Mézard
test-obsolete-rebase.t: test --abort and --continue
Branches
default
Patrick Mézard
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 c…
Branches
default
Patrick Mézard
test-stabilize-order.t: trace obsolete markers Will prevent breakage in rebase.concludenode() overriding.
Branches
default
Patrick Mézard
test-obsolete-rebase.t: move --keep test from test-obsolete.t
Branches
default
Patrick Mézard
obsolete: handle rebase removing empty changesets The new revision identifier returned by concludenode() was None and was not correctly translated to nullid.
Branches
default
Patrick Mézard
obsolete: add or fix debug commands help
Branches
default
Patrick Mézard
obsolete: do not duplicate command help
Branches
default
Patrick Mézard
obsolete: use new-style command registration
Branches
default
Patrick Mézard
obsolete: make rebase abort with --keep obsolete modifies rebase to mark rebased changesets obsolete instead of stripping them, which makes --keep irrelevant.
Branches
default
Patrick Mézard
obsolete: fix rebase wrapping ui and repo arguments were swapped which made --keep calls traceback.
Branches
default
Patrick Mézard
obsolete: add debugsuccessors command It dumps obsolete changesets and their successors.
Branches
default
Pierre-Yves David
evolve: add alias for kill and stabilize
Branches
default
Pierre-Yves David
merge with 0.1.0 tag
Branches
default
Pierre-Yves David
Added tag 0.1.0 for changeset 6c6bb7a23bb5
Patrick Mézard
stabilize: improve unstable selection heuristic Without argument, stabilize was picking the first in: "unstable() and ((suspended() or obsancestors(::.))::)" which usually returned the "oldest" unstable revision in parent predecessors descendants. This revision is interesting because it usually gives "soft" merges but rebasing it left the working directory on a remote branch, which was very confusing. The new heuristic picks an unstable ch…
Tags
0.1.0
Branches
default
  1. Prev
  2. Next