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.

obsolete: fix rebase wrapping ui and repo arguments were swapped which made --keep calls traceback.

obsolete: add debugsuccessors command It dumps obsolete changesets and their successors.

evolve: add alias for kill and stabilize

merge with 0.1.0 tag

Added tag 0.1.0 for changeset 6c6bb7a23bb5

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 changeset which can be rebased on top of the parent revision, or on top of one of its descendants (selected in revision order). This has the advantage of selecting a revision which can be rebased on the current subtree, and leave the working directory in a more convenient location.

amend: remove useless repo.changelog alias

README: some more changes

merge with Arne changes

amend: do not traceback on no-ops If rewrite() generated changeset happened to be an existing one, the call would traceback when trying to obsolete the changeset with itself. Instead, leave gracefully, marking any intermediate changeset extinct.

amend: do not rely on revsingle() default for --change

amend: drop --branches, pick it from working directory The amended changeset branch was picked either from --branch or from the first parent, but the actual working directory branch was ignored. The behaviour is changed so the amended revision branch is picked from the intermediate revision, which branch comes from the usual working directory rules. --branch is thus replaced by "hg branch".

.hgignore: add .rej/.err/.orig and emacs tmp files

added “pull here is OK, too” to the README.

evolve: fix stabilize --any short option It was displayed as --A instead of -A.

tutorial: zsh fix

Fix amend and relocate who picked phases data after extinct wher made secret

zsh does not like "`" in << EOF

readlinks does not do what we wnat on BSD

evolve: update rebase usage to match 2.3

obsolete: fix error in cache invalidation

[obsolete] fix new api: be more flexible on rebase's buildstate signature Introduced by `d1afbf03e69a@mercurial <http://selenic.com/repo/hg/rev/d1afbf03e69a>`_

[obsolete] fix new api: use the new phase cache api Introduced by `b6081c2c4647@mercurial <http://selenic.com/repo/hg/rev/b6081c2c4647>`_

[qsync] abort properly of a patches repository does not exists

[doc] Specify that tuto hg configuration is used for testing.

qsync: fix mq commit message generation A CR was missing when both applied and ready to review patches are generated during a single qsync.

[doc] changes location of repo We now have a "stable" repo on bitbucket and a dev repo on logilab hg lab.

change version definition

doc: idea about OnDisk Storage

doc: add the RoadMap

[doc] add Question and Answer about Obsolet Marker Implementation

fix typo in file name

[doc] change doc generation directory

[doc] add good practice section

[doc] fix unstable code block

[readme] fix stupid typo

more read me update

update README

[doc] fix tutorial warning

[doc] add `.t` to `.rst` converteur Update make file accordingly.

[doc] fix bad include

[doc] add a simple make file

docs: proof-read and review

restore unstability content

less verbose table

[doc] update tutorial text.

proof-read documentation and docstrings

doc: several update and review.

obsolete: export pretty printed json Will help unavoidable hand fixing.

accept test change (not very happy about it)

new obsolete store The new formats allows multiple "new" changeset and various meta-data. Forcing extinct to secret phase happen now on an irregular basis A command exist to migrate to the new format

enable.sh: enable rebase because evolve need it

ignore .pyc files

doc: unstability principle

qsync: support for synchronisation with applied patches from outer space and more :more: - also add some tests - kill OLDBRANCHNAME - several minor cleaning

evolve-amend: properly handle amending file renames and additions.

obsolete: do no complain when push create a new head but obsolete an old one. Do not read the code or your eyes will burn. The (+1 heads) message still appear (see mercurial issue 3394).

obsolete: refuse to push unstable changeset without -f We do not alter phase of suspended and unstable changeset anymore. But push refuse to push them without force. The extinct part of the history stay secret for simplicity shake.

qsync: add a warning file in qsync changeset.

obsolete: fix changelog reload This changelog was not properly reloaded. This leaded to bug with rollback and strip.

obsolete: do not warn about unpushed extinct changeset.

obsolete: add an extinct property on context

obsolete: to not overwrite cancopy This does not bring anything and this confuse verify.

evolve: issue the "%i new unstable changeset" in more place most command able to create unstability now issue the warning

obsolete: blindly obsolete unstability cache when changeset are added

tutorial: make it pass again More work is needed but the tutorial work as a functionnal test.

docs: fix broken alias for qseries template for description in `{desc}` not `{description}`

fix enable.sh script it was printing the mercurial version in to HGRC file

test: graphlog honor --hidden honor in 2.2

obsolete: fix rollback wrapper for 2.2-rc

2.2 compat: nodemap.get take a single argument now.

[obsolete] add supprt for futur Hg 2.2

[obsolete] simplify by using the Hg 2.1 api

qsync: display short node repr on error

FAQ: add en entry about rebasing after a pull

FAQ: typos

FAQ: small typo

stronger try except for store cache

amend: add a warning after amend added unstablility

ignore merge in qsync

add a known issu

merge arne change

docs: Merged obs-concept changes by hand.

Backed out backout changeset f047cd4f1235

fix qsync-enable.sh extension name is qsync not obsolete (terrible terrible trouble)

follow-up on evolve-collaboration

add split example

doc: some minor fixes

merge with arne change

merge with backout

backout obs-concept.rst changes too much conflict with changes in another branch

docs: polish for glossary

docs: polishing of from-mq.

docs: fix typos in evolve collaboration.

docs: added a question: split changesets?

docs: fix typos in the FAQ

evolve: logopts was called logopt.

docs: typo

docs: polishing of obs-concept.rst

docs: some fixes on the index and the first half of the obsolete concepts.

merge

many fixes

doc: replace ">" by ">>" (oups)

doc: add reference to qsync

merge with auc improvement

auc improvement of the doc

add more canveas

add auc user story

big doc update

title reorganisation

improved intro about evolve

more doc update

add svg for schema

More doc and index with sphynx

mercurial 2.1.2 compat

really add qsync enable

this is an FAQ not a tutorial

add version info

some more doc update

add a qsync-enable

use cat in enable.sh

add qsync extension to mutable history

very cruse evolve tutorial

evolve: improve graft handling of -O we now resolve changeset reference before graft

obsolete: improve rebase compat

import some doc

obsolete: define an unstable property on context

kill: properly get revision pointed by --new Previously the raw value on --new ended in the obsolete file.

stabilize: proper --quiet behavior

stabilize: stabilize my topological branch only if not stated otherwize.

Add a bosancestors revset

add an obsolete parent revset and related alias

overwrite user not date

remove useless hidden related stuff in amend

add user to the list of option prevent the "no change found" message to show up

evolve that does something \o/

stuff that pass

fix evolve test

add test for revset

obsolete: add revset for various error case

add a simple script to help people enabling the extension.

rename evolution to evolve too much confusion with the email client

obsolete: alter newerversion return prepare ability to split and return kill information.

keep branch on amend

evolution: add a --new argument for kill

obsolete: lazy relation adding

obsolete: remove outgoing filtering as it is taken care but forcing obsolete to be secret

Add gup and gdown command to mimic qpop and qpush command

obsolete: stop using rev as it rebuild the cache every time there is a fault We now use nodemap directly

remove dead comment

obsolete: clever obsolete not in secret detection to avoid locking the repo without a reason.

obsolete: fix locking when enforcing obsolete as secret

Locking while writing obsolete data.

obsolete: improve locking when writing obsolete data

obsolete: remove public revset (it's now expected to be in core)

evolution: proper locking scheme (maybe a bit zelous with wlock and lock)

edit option \o/

Add a -o and -O option to graft.

Add a -o option to commit

add an option to ensure unstable are secret

nicer hiddenrevs init

adapt evolution to phase in core.

adapt obsolete to phase.

more removal from phase in core.

remote the states extention. (phase are now in mercurial core)

obsolete: smarter initialisation of obsolete stuff from disk.

Properly inherit phase of relocated changeset.

Add a states.bypass option to push without touching state.

Allow setstate with the last non trcked state.

Add missing break line at the end of a debug message

propertly handle -m and -l option

amend: add a --branch option

monkeypatch strip fancier

fix strip - seems good enougth now

[states] fix strip but one thing still stay wrong (see test test-state-strip.t)

[states] fix strip but a case still does not work (see test test-state-strip.t)

[states] make enabling state saftier * Fix the lower state heads while enabling a state. * Add a --clever opiton that do not fix the lower heads (as earlier) * Add test for enable/disable state

[states] make disabling state saftier It is not allowed to disable a state that is not empty because "Explicit is better than implicit". A hint is displayed to help the user.

[states] add --exact option to `hg <state> <nodes>` that allows to backward states bondaries

improve tuto

[evolution:evolve] use short hex instead of rev number

docs: Small tutorial

[evolution:amend] prevent amending immutable changeset.

[evolution:relocate] propertly interpred src and destination.

[states] do not activate deactivated state with ``hg states --off <state>`` previously: $ hg init alpha $ cd alpha $ hg states --off draft $ hg states published draft now: $ hg init alpha $ cd alpha $ hg states --off draft $ hg states published

[obsolet] base64 encore obsolete rel for pushkey Yop this is ugly

[evolution] first workign draft of a relocate function The relocate function is a lighter rebase.

[evolution/obsolete] very experimental and crude evolve support.

[obsolete] code section comment for repo subclassing

[obsolete] vocabulary update suggestion

[obsolete] rebase always keep changeset.

Compat with mercurial 1.9.2

[evolution] imported hg amend from parren works (this rocks heavily)

Basic kill command

[obsolete] add kill support

[obsolete] issue a warning when parent of current directory is obsolete.

[states] add some documentation for extension wrapping

[states] update qimport code so it doesn't fails on qimport without -r

mention plan for hook in the documentation

[obsolete] published changeset can't be obsoleted states extension is now required. A warning message is emitted when obsoleting a published changeset.

[obsolete] update docstring

[obsolete] remove useless code.

[obsolete] rationalize doc header.

[obsolete] Move extension compat code

[obsolete] extract serialization logic.

[obsolete] update doc

[state] Update doc on the mutable property of state (and the way it's implemented)

[state] add mutable property to state object.

[states] add a todo related to MQ

[states] fix a bug with rebase --detach There is unexpected (for me) content in state.

[states] add mq support

[states] add rebase support.

[states] move IO logic outside the repository subclass This is meant to lighted this part a bit

[states] add a small paragraph about controlling permision to move the boundary

small refactoring and big doc update. Sorry for the big commit crecord one so much diff seems to confuse my powerbook to death :-/

move part of the readme about states in states itself.

[obsolete] Fix pushkey

Use dedicated mechanism to report pushkey success

[obsolete] Update pushkey code

Update pushkey code to be able to push ready heads too.

Make states more resilient to missing head In particuliar pushkey is now more robust (with a very naif approach)

reorganise code

Rollback support

move extensions in a hgext directory

clone support

Change test output again (get a better distinction between rev number and hash to detect hidden changeset)

update README

Don't overwrite non local repo.

Do not propagate obsolete changeset

include hash in test.

Add pushkey support for pull and push

more comment

Make rebase set-obsolete relation

Do not hide current and bookmarked

proper computation of hidden changeset.

revset

Fix

Documentation !

Complete a Readme sentence.

Spelling fixes

Add a few information about obsolete relation.

Add some doc.

obsolet: basic support (hide changeset)

tag: do not publish for local tag.

fix outgoing filtering.

fix nodestate computation

published is always enabled.

Working directory is draft.

add a states command The command list enabled state and allow to enable, disable state. test have been update to use it.

Add docstring to move head command.

Move state activitation in a dedicated file repo-side The main issue with having state information is hgrc is that hgrc can be ignored for trust reason.

add rollback support.

Automatically publish on tag.

Add pull and push support for relevant heads. This use pushkey.

Smarter states heads. We use the next relevant heads instead of repo one when asking for the head of a disabled state.

introduce a ``laststatewithout`` method We use it to remove explicite reference to state in to module code. This allow more flexible dev for now.

Autogenerate command table.

add templatekeyword in a proper location

Remove useless comment.

add dedicated command to mark changeset as published or ready This command coul be generated.

reorder extsetup

Get ride of dedicated heads property. This is now handle throught a generic repo.stateheads(state) methode.

rename state related attributes frozen is now published public is now ready

update doc

state are now object.

introduce a third state

stronger tests

Add write protocol support for private. Writeprotocol repo doesn't need to _reducehead locally. It's the heads command implementation server side that handle the filtering.

merge

fix clone

http test

fix test

hide private changeset to inc and pull.

Add "private" concept (2). private changeset are hiden suppose to be hidden for pull and push. For now it works for out and push

minimalistic state concept.