merge changelog update

update changelog with future 1.1.0 news

merge bumped rename (drop several part of the code because bumped is now in core)

evolve: Rename latecomer into bumped This is the new name in core

evolve: set tested with 2.4

evolve: require Mercurial 2.4 to work

evolve: adapt to 2.4 code

merge with stable

mercurial: replace all `newerversion` call by `successorsset` call

evolve: smarter code for divergent changeset This newer version properly handle split now. Code and test copied for future upstream one.

evolve: rename conflicting into divergent

evolve: detect and abort if 2.4 is detected The meaning of critical attribut have changed in 2.4

evolve: add tested with info

merge stable into default

test-stabilize-conflict.t: fix "eight" spelling

test-stabilize-conflict.t: sed -i is still not portable

test-stabilize-conflict.t: yes is not a standard shell utility And for some reason the test fails on OSX.

evolve: drop code now in core The default branch aims compat with the mercurial default branch. we do not need all those conditional.

merge with default

evolve: filter nullid successors

evolve: new divergent revset

doc: rename conflicting to divergent.

more schema

merge stable into default

adapt to core rebase support

rebase: warn about troubles created by rebase The previous order created obsolete marker after checking for new troubles

test-obsolete: clean up useless inlined option rebase is enabled globally and graphlog is into core

add image magic depends

upgrade debian changelog

update MANIFEST.in

merge (overwrite wrong tag)

Added tag 1.0.2 for changeset 5559e5a4b656

prepare 1.0.2

Added tag 1.0.2 for changeset b1bdcb4506de

hg prune: prevent empty call

fold: handle the lack of revision to fold

fix readme header

slight change to the evolve logo thank to Adrien Di Mascio

docs: fix makefile

doc: add a logo It's not that cute be we have one.

README: remove bogus date This version is not released yet.

update changelog

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.

createmarkers: adapt to f85816af6294 in core The createmarkers function is now in core. Fallback on our function if not available

warning: work around phase limitation when computing warnings The new phase have not been written yet because we did not release the lock yet :-/

caches: now in core adapt to fb72eec7efd8 If we detect a cache mechanism in core we is it intead of instead our own

evolve-cmd: fix merge error detection for external tools.

Properly update after fold The previous version only set the parent, it did not rebuilt dirstate or update any file content.

fix hg pull --rebase There is more user of rebase than just the rebase command

remove all notion of --detach in the test Mercurial 2.3 killed --detach (dance)

fix missing --dest evolve output in dryrun

pkg: proper debian version

pkg: debian changelog

Added tag 1.0.1 for changeset ca5bb72d14ae

pkg: abstract version in makefile

pkg: prepare version 1.0.1

evolve: fixing syntax/grammar

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.

doc improvement

pkg-debian: fix uploader fields

pkg-debian: improve control files

pkg-debian: remove conflicting __init__.py files

a better msg for this tricky situation

test conflicting conflicting (sic) resolution

Added tag 1.0.0 for changeset b18b00036355

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.

tests: remove unused required tools The original mercurial test use much more stuff than us.

pkg: exclude tests for unpackaged extension the old obsolete format BC and qsync are not included in this package. exclude related tests.

test: remove unused obsolete extension in the tutorial

docs: add missing blank line after Copyright notice

hgignore: ignore compiled tutorials

doc: remove spurious print in test2rest.py

pkg: add proper MANIFEST.in

doc: long desc update

remove old qsync enable file

setup: fix version number to 1.0.0 0.1.0 was release times ago

Conditionnaly add the `hidden` revset symbol Mercurial Core#default now have it (but 2.3 don't)

ensure all file have a copyright notice

add COPYING File with the license

evolve: usual syntax/grammar errors/long lines cleanup

evolve: simplify locking in _solveconflicting()

fold: simplify locking

touch: simplify locking pattern

evolve: factor out copy/paste in obssummary()

evolve: avoid 'any' argument name in _picknexttroubled()

evolve: localrepo.revs() already returns a list

evolve: compute "troubled" revs in stabilize only when necessary

evolve: move _stabilizableunstable() with related functions

test-tutorial: stop using enable.sh, removed by 53d7e3413337

evolve: add touch and fold to command that may create troubles They should raise warning about it too.

doc: add missing image

doc: fix emphasis

doc: remove toc reference to dead file

setup.py: remove setuptools related info bad setuptool bad.

doc: add more warning This is not "stable"

update implementation details

Doc: several update

Prepare 0.1.0 by merging default into stable stable is now compatible with 2.3 only.

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

evolve: add the odiff alias

[pkg] Add a setup.py

Ignore build directory

update documentation

doc: some terms update

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.

merge evolve and obsolete

sort import

Fix mercurial version check

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.

update changelog

fix typo

evolve: stabilize now handle conflicting changeset Some a lot of rough edge but it just damn work.

stabilize: conflicting changeset are considered if "." if not unstable changeset are found, the current parent directory may be stabilize if conflicting

Introduction of olog as an alias This will won't stay as such long.

evolve: fold command First crude version of a fold command

evolve: touch command command to easily revive a changeset.

obsolete: ignore hidden changeset when resolving `branchname` revision

obsolete: add obsolete data to summary.

update changelog for upcoming 1.0

merge with stable improvement

[evolve] amend: display proper error message while trying to amend non ancestor

[evolve] amend: check phase before starting the transition We better abort before starting a useless transaction.

test: turn the base public usefull for followup that test phases enforcement.

obsolete: prevent bare hg update to select hidden changeset The issue remain with branch name.

obsolete: prevent rebasing of public changeset Because we force keep we have to check this on our own.

obsolete: warn when the whole rebase set was remove because extinct

obsolete: use flag to detect that a obsolescence marker fix a latecomer Otherwise latecomer fix will be latecomer too.

stabilize: handle latecomer Merge are not handled yet.

stabilize: rework stabilize code to allow selection of latecomer and conflicting They are still unhandled but the tool now explicitly state this fact.

obsolete: add a "troubled" revset returns all changeset with troubles whatever the trouble is.

stabilize: handle killed changeset in stabilize.

stabilize: --continue support !!! Based on graft one.

stabilize: rename "node" variable to "orig" It's a not a node at all. this is a context.

obsolete Move merge failure handling into stabilize code This violate less Layer. For this purpose we crate an easy to recognize Exception Class.

obsolet: fix extension help code about extension wrapping

merge

obsolete: filter out nullid from possible successors This have several bad effect as wrong late comer detection.

obsolete: more typos and cleanup

obsolete: fix indentation in obsolete import block

obsolete: fix docstrings

obsolete: simplify module docstring

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.

obsolete: more comment

remove useless function It has no user left and no purpose in live.

add cleanup todo

more doc and cleanup

obsolete: document the cache stuff

obsolete: Improves cache invalidation logic Filecache are not the same that cache property. This can probably be improved

obsolete: some more movement

obsolete: move caches on obsstore No need to clutter local repo

obsolete: remove legacy revset

obsolete: enforce pdiff and pstatus alias in the extension

drop repo.addobsolete We now use createmarkers directly. No black magic with nullid is done anymore.

obsolete: remove usage of addcollapsedobsolete

obsolete: extract high level marker creation in a dedicated util function This prepare the dooms of repo based method.

obsolete: remove debugsuccessors This was kinda duplicate of core "debugobsolete"

obsolete: tag more function for disapearance

obsolete: reorder import

obsolete: some more dead code

obsolete: sort all code Move (splitting some function) all code in dedicated section The hook wrapping have disapeared in the process.

obsolete: remove unused repo method

obsolete: clean up import

obsolete: more BC drop

obsolete: move version checks at the start of the file

obsolete: some more comment

obsolete: add and use templatekw decorator

obsolete: move old format stuff at the end

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.

obsolete: remove 2.2 compat hack

merge with stable

Added tag 0.7 for changeset 1b2757c1bd91

changelog: update changelog for all missing version

enable: update check to ensure people use 2.3

obsolete: remove unused BC code

hgignore: ignore the "common" tests/easy_run.sh file

test: drop old BC clause

merge

evolve: make graft wrapper handle --rev

evolve: graft --continue is optional, test

evolve: avoid duplication in graft wrapper

obsolete/evolve: fix grammar in prerequisite messages

obsolete: fix doc, rebase no longer aborts with --keep

evolve: tweak and add EOL to kill warning

nopushpublish: add license en copyright notice

obsolete: simplify obsolete feature enabling We don't need setattr here

merge

amend: wrap the whole process in a single transaction.

pushkey: properly handle abort during obsolete markers push

hook: work around insanely huge value in obsolete pushkey call The value is not that useful and make shell call explode.

merge with stable

Added tag 0.6 for changeset 4a5488c01a66

obsolete: enable obsolete feature The feature is now disabled by default in core.