merge stable into default

add obsolete parents wrapper to the 'parents' command although the command itself cannot *cause* obsolete changesets, the information is rather relevant to the state of the parents

README: update changelog

conform to the Mercurial custom of lowercase messages ...and while at it, use the more usual long form of "can't"

amend: use core mechanism for amend Evolve used its own code for amending. This was introduced before mercurial includes commit --amend. The evolve code is now older and buggier. So we just use the core cod when amend is called. Message of the temporary commit is different, all test hash changed \o/. Test change are been carefully checked.

amend: drop the deprecated note option We plan to get closer to the commit --amend implementation dropping this deprecated option helps.

test: adapt to 2.6 message improvement From fd1bb7c1be78 (in core) hidden revision are excluded from partial match in a proper way resulting in a nicer error message.

README: polish the language so it reads better

README: fix spelling, capitalization, grammar, punctuation

README: fix minor markup inconsistencies

3.2.0

debian: properly clean the docs build

pushexperiment requires mercurial 2.6

ship pushexperiment extension

pushexperiment: guard against non-push-capable remotes

pushexperiment: fix doc typos

merge stable into default

push obsolescence marker before anything else

add notification at the end of push We have a dedicated hook to know when a push is done.

Add a new pushexperiment extension This extension introduce a faster way to push obsolescence marker. Send the obsstore directly instead of inefficiently going through pushkey's inefficiency.

Adapt to human readable date in patch

debian: honor nocheck in DEB_BUILD_OPTIONS

evolve: fix typo

amend: hide the --note option The intermediate commit will not survive long

evolve: remove trailing spaces

update debian changelog

merge with stable

Added tag 3.1.0 for changeset cdb52bbbe5b8

evolve: update test output.

prepare release 3.1.0

prune: add --user and --date options They control the metadata writen to the obsolescence marker.

prune: add strip-like bookmark This prune changesets pointed by the specified bookmark only (and removes the bookmarks)

evolve: remove duplicate alias.

evolve: update stabilize order test after output change

merge with stable

evolve: document --all option

merge --all option from tak

minor help changes

evolve: clean up help message

evolve: remove magic return values from utility functions

evolve: clean up evolve implementation.

evolve: add test for evolve --all.

evolve: add --all argument.

evolve: extract evolve --any implementation into a function.

touch: properly handle touching multiple changeset

add a duplicate option in touch

touch: add basic testing

amend: prune replacement commit without sucessors This align with the core behavior of `commit --amend`. All user of rewrite are not responsible for creating their own marker.

changelog: add more entry

fix future 3.1.0 changelog entry

alias: add a grab alias Its a valid replacement for graft -O

amend: drop the --change option it is deprecated for quite some time already

drop suspicious import in evolve introduced by 97ce1f801309 Thanks to Bryan Murdock for reporting the issue.

prune: handle bookmark

test-prune: simplified log output useful to testing bookmark later

prune: update inline documentation

prune: more command switch idea

prune: documentation update

prune: add an informative message about the number of pruned changesets

prune: test and improve message of immutable aborting.

prune: turn one of the test changeset public

prune: add test and more robusness

prune: detect bad input We accept multiple changeset folded into one successors. One changesets split in multiple successors. But we refuse multiple changesets split in multiple ones.

simplify locking in prune

prune: rename --new to --succ This is closer to want the documentation says.

prune: improve command function name

prune: fix doc

evolve: drop uneeded noderange function We can use revrange instead

evolve: warn for troubles created by histedit too.

drop useless empty lines

evolve: remove outdated documentation

add an explicite warning when repo contains invalid obsolescence markers

evolve: remove pre 2.3 code

evolve: removes amend from the list of advertised function We have commit --amend almost as powerful now.

evolve: fix extsetup extension helper

evolve: remove unused function imported from mercurial

evolve: drop unused import

merge with doc fixes

merge with stable

doc: update version information

merge with hg2.4 compat branch

Added tag 3.0.0 for changeset 862b6b71a358

prepare for release 3.0.0

mark test with 2.5

merge

create a compat-hg2.4 branch 2.5 is out, 2.4 compatible code is parked in a compat-hg2.4 branch as we did for 2.3

hgext: add a simpler extension to enable obsolete on server

drop: divergence related code It is now in code

evolve: remove revset calls in warnobserror revset have serious performance impact in several case. The resulting code is a bit too complicated to my taste. I hope for much simpler implementation in core anyway.

evolve: drop "troubles" and "troubled" method now in core

test: drop rebase test We assume that the mercurial rebases tests suite is strong enough now.

doc: fix grammar, spelling, punctuation I restrained myself to making only changes that turn bad English into good English. There are still opportunities to improve, but other changes require some discussion and review. This change should be uncontroversial.

tutorial: fix grammar, spelling, punctuation I restrained myself to making only changes that turn bad English into good English. There are still opportunities to improve the tutorial, but other changes require some discussion and review. This change should be uncontroversial. The same changes had to be duplicated in both copies of the tutorial (hmmm); it's not clear which one is definitive.

[evolve] Drop useless filtered code

merge with filtering change (DO NOT USE WITHOUT FILTERING)

evolve: ensure evolve command run unfiltered

test: drop divergent test It is into core now

evolve: stop working around phase limitation Core is handling this part a bit better

fix punctuation

evolve: fix version message

test: more resistance to filtering changes

merge with stable

support -r option in prune, add a test for this Also localize options in fold.

doc: index version info on index

doc: updates mq refugee book

doc: update how-to

tutorial: second replacement of hg amend by commit --amend (the diff is huge because commit --amend have protection vs cycle)

tutorial: use evolve directly We a real mode in addition to the dry run one.

tutorial: use rebase instead of graft -O

tutorial: use commit --amend when possible commit --amend is the core way to do that, we better get used to it.

evolve: make evolve smarter It is not more confused by killed changeset and can also choose to stabilise '.'

tutorial: update notes in unwritten section

tutorial: glog is into core now

test: adapt to the way the bundle is generated optimised generation gives 1 changes, strict on gives 2.

fold: work around potential bug with filtering Folded revision may be becomes filtered leading to a crash of the replaced rset.

prepare for filtering

compat: adapt to upstreaming of divergent logic successorsset and divergent logic have been moved into core by changeset 4bec77e62c00::e411fd79ca69 We drop dedicated code in evolve.

Added tag 2.1.0 for changeset f9d305deeff3

[prepare] 2.1.0

update changelog

merge with fix in 2.3

prepare for Full scale filtering !!!

more versatile test. push can fails on any divergent changeset I do not care for now.

fix retrieval of divergent changesets in obssummary (typo) Add a test for this; drop wrong divergent print in 'Test rollback support'.

merge with Denis improvement

merge with Denis improvement

use comments to combine commit messages in fold

add a -e option to fold

merge

detect incompatibility with future mercurial 2.5 changes in bookmark break compatibility

merge

merge

Added tag 1.1.0 for changeset 22cacfce2a65

fix version in setup.py

adapt to 7f5dab94e48c in crew

deprecate "amend --change" option

merge with qsync fix

merge with qsync fix

merge with qsync fix

[qsync] fix filestore usage The filestore was closed too early, dropping on disk cache

merge back with stable

Added tag 2.0.0 for changeset d43e80504e5

evolve: some comment update Bumped is in core now.

update debian control

merge 2.4 code back into default.

merge with 1.1.0

Added tag 1.1.0 for changeset c062edbcaf13

Fix debian control

prepare a branch for Compat with mercurial 2.3 only

prepares evolve 1.1.0

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.