Augie Fackler <raf@durin42.com> [Sat, 16 Nov 2013 20:44:37 -0500] rev 796
Deduplicate markers. Depends on __hash__ and __eq__ on obsolete.marker
Augie Fackler <raf@durin42.com> [Sat, 16 Nov 2013 20:43:44 -0500] rev 795
copy precursor revset from evolve so we don't depend on involve
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 03 Sep 2013 21:46:50 +0200] rev 794
fastobs: details strategies in the main help
Augie Fackler <raf@durin42.com> [Fri, 26 Jul 2013 21:35:56 -0400] rev 793
fastobs: fix a bunch of stupid errors that prevented it from working at all
Augie Fackler <raf@durin42.com> [Fri, 26 Jul 2013 16:08:56 -0400] rev 792
fastobs: clean up logging a little
Augie Fackler <raf@durin42.com> [Fri, 26 Jul 2013 16:04:40 -0400] rev 791
fastobs: first commit of an extension to test obsolete marker exchange methods
This currently implements the "fill in the box" approach discussed at
the 2.6 sprint, which seems to handle common cases correctly with
significantly less data transferred.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 12 Feb 2014 17:18:50 -0800] rev 790
drophack: add a new drop hack extension for Matt Mackall usage
This extension is hacky and not intended for real world usage. See documentation
for details.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Feb 2014 00:02:18 -0600] rev 789
prune: add biject option
This option allows two ranges to be given for successors and precursors such
that there is a one-to-one match between each range.
Test coverage has been added.
Simon Heimberg <simohe@besonet.ch> [Fri, 07 Feb 2014 09:36:42 +0100] rev 788
evolve: register a summary hook instead of wrapping the summary command
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:30:45 -0800] rev 787
merge stable into default.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:20:50 -0800] rev 786
doc: improve reference to log --hidden
- glog is not mucha thing anymore
- also add a usage exemple
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:19:55 -0800] rev 785
doc: fix trailing white space
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:19:40 -0800] rev 784
doc: DIE MQ DIE
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:19:25 -0800] rev 783
doc: use --succ in prune help
--succ is the new only way.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:18:43 -0800] rev 782
doc: remove referenc to proleferation of hidden commit
This is not much something we try to avoid anymore
This changeset is eathenly adding reference to other toubles too.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:14:06 -0800] rev 781
doc: try to clarify rebase warning
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:13:22 -0800] rev 780
doc: enhance your fold help
Refer to the two different for of using fold.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:12:44 -0800] rev 779
doc: refer to previous and next in the gup, gdown help
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:12:07 -0800] rev 778
doc: replace graft -O with grab
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Jan 2014 14:10:24 -0800] rev 777
doc: rework how to entry about amend
We can recommand the core `hg commit --amend` now. We also drop reference to MQ.
Arne Babenhauserheide <arne.babenhauserheide@kit.edu> [Mon, 20 Jan 2014 10:57:10 +0100] rev 776
raise util.Abort instead of assertion when trying to evolve a merge changeset.
This prevent exposing a nasty traceback to the user.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:46:23 -0800] rev 775
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:37:52 -0800] rev 774
tutorial: fix note
We need a double semin colon, otherwise this is a comment.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:21:29 -0800] rev 773
tutorial: warn about rollback beeing obsolete
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:16:09 -0800] rev 772
tutorial: use grab instead of rebase.
grab as now the advantage to move the working directory.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:14:41 -0800] rev 771
tutorial Clarify "." explanation
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:18:41 -0800] rev 770
tutorial: update divergent changeset section
Still not there but less fuzy.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:10:42 -0800] rev 769
tutorial: use long form of argument for the sake of clarity
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:22:41 -0800] rev 768
tutorial: fix some various typo
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:38:28 -0800] rev 767
tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 15:24:16 -0800] rev 766
doc: some documentation on the configuration part of the tutorial
Trying to make it less obscure on first contact
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:22:00 -0800] rev 765
doc: smarter make file
We regenerate the tutorials when needed only
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 09 Jan 2014 21:38:56 -0800] rev 764
doc: use a symbolic link to point to the tutorial
the file was lagging behind a ton.
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Thu, 24 Oct 2013 10:42:50 +0200] rev 763
import: warn about new unstable changesets
'hg import' can add new unstable changesets, for example when invoked
with '--hidden' or '--exact', or when the working directory parent
already is unstable.
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Tue, 22 Oct 2013 11:16:55 +0200] rev 762
evolve: show progress
The total count may be too low on occasion. Not sure why.
gaved up at testing this, can't get stable result.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 07 Jan 2014 16:07:43 -0800] rev 761
removed the qsync extension.
The only user I knew about (logilab) is not using it anymore. It not compatible
with coming Mercurial version 2.9.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 07 Jan 2014 15:52:47 -0800] rev 760
evolve: add more details when we abort for case not handled yet
Verboser output to help people knowing what is going on and solving it on their
own.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 07 Jan 2014 17:03:36 -0800] rev 759
merge stable back into default
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 26 Dec 2013 17:21:01 -0800] rev 758
current release is stable enought
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 26 Dec 2013 17:20:16 -0800] rev 757
evolve: update the tested with statement
It actually ssems to work with version up to 2.6 but some minor changes makes
test fails. so better encourage people to upgrade.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 26 Dec 2013 14:42:22 -0800] rev 756
evolve: use super for calling parent class method
Otherwise we can bipass filtering (and break a lot of things)
Faheem Mitha <faheem@faheem.info> [Mon, 02 Dec 2013 23:31:45 +0530] rev 755
debian: add source/format file
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 21:53:22 -0500] rev 754
Added tag 3.2.0 for changeset c3ba8a965a7a
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 21:39:47 -0500] rev 753
prepare 2.8 release
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 21:44:24 -0500] rev 752
grab: update the alias for 2.8 compatibility
2.8 does not update on rebase anymore. We need to update by hand. this makes
this alias more fragile.
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Fri, 15 Nov 2013 21:33:54 -0500] rev 751
gdown/gup: add next/previous alias
Up and down refer to the customary order in log output rather than
concepts; as such, it may be confusing to the user. I for one found
them suprising -- they just didn't fit with my mental model.
Previous and next, however, imply a clear parent/child relationship.
We attroduce the new name as aliases for now.
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Tue, 22 Oct 2013 11:51:01 +0200] rev 750
evolve: allow updating to the successor if the parent is obsolete
Although 'hg update' handles this as well, it will also update to
tipmost descendent of the successor, if any.
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Wed, 31 Jul 2013 19:56:28 +0200] rev 749
evolve: abort on unknown divergent changeset base
...rather than noisily dying with a KeyError.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 19:14:19 -0500] rev 748
test: prepare test for core changeset 6cd9b8428104
Changeset 6cd9b8428104 in Mercurial core (2.8) make rebase preserve more
extra. this mean hash changes. We make the test resilient to that.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 18:53:29 -0500] rev 747
test: prepare test for core changeset 9c78ed396075
New changeset in mercurial 2.8 (9c78ed396075) change rebase behavior to preverse
the original working directory. This break an handfull of test so we
preventively update to tip after rebase.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 16:01:40 -0500] rev 746
merge stable into default
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 16 Oct 2013 18:28:52 +0200] rev 745
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
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 16 Oct 2013 18:23:54 +0200] rev 744
README: update changelog
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 26 Jul 2013 12:06:44 +0200] rev 743
conform to the Mercurial custom of lowercase messages
...and while at it, use the more usual long form of "can't"
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 16 Oct 2013 00:37:29 +0200] rev 742
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.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 15 Oct 2013 16:20:17 +0200] rev 741
amend: drop the deprecated note option
We plan to get closer to the commit --amend implementation dropping this
deprecated option helps.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 25 Sep 2013 02:06:47 +0200] rev 740
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.
Greg Ward <greg@gerg.ca> [Sat, 10 Aug 2013 17:30:44 -0400] rev 739
README: polish the language so it reads better
Greg Ward <greg@gerg.ca> [Sat, 10 Aug 2013 17:27:19 -0400] rev 738
README: fix spelling, capitalization, grammar, punctuation
Greg Ward <greg@gerg.ca> [Sat, 10 Aug 2013 14:51:45 -0400] rev 737
README: fix minor markup inconsistencies
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:29:01 +0200] rev 736
3.2.0
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:50:52 +0200] rev 735
debian: properly clean the docs build
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:31:18 +0200] rev 734
pushexperiment requires mercurial 2.6
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:44:17 +0200] rev 733
ship pushexperiment extension
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:17:47 +0200] rev 732
pushexperiment: guard against non-push-capable remotes
Julien Cristau <julien.cristau@logilab.fr> [Tue, 04 Jun 2013 17:16:09 +0200] rev 731
pushexperiment: fix doc typos
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Jun 2013 15:06:18 +0200] rev 730
merge stable into default
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Jun 2013 15:03:55 +0200] rev 729
push obsolescence marker before anything else
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Jun 2013 14:57:39 +0200] rev 728
add notification at the end of push
We have a dedicated hook to know when a push is done.
Julien Cristau <julien.cristau@logilab.fr> [Mon, 03 Jun 2013 14:53:24 +0200] rev 727
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Jun 2013 13:28:13 +0200] rev 726
Adapt to human readable date in patch
Julien Cristau <julien.cristau@logilab.fr> [Fri, 31 May 2013 15:10:34 +0200] rev 725
debian: honor nocheck in DEB_BUILD_OPTIONS
André Sintzoff <andre.sintzoff@gmail.com> [Fri, 31 May 2013 18:47:01 +0200] rev 724
evolve: fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 May 2013 18:45:31 +0200] rev 723
amend: hide the --note option
The intermediate commit will not survive long
AndréSintzoff <andre.sintzoff@gmail.com> [Thu, 02 May 2013 18:00:38 +0200] rev 722
evolve: remove trailing spaces
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 04 Mar 2013 18:02:39 +0100] rev 721
update debian changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 11 Feb 2013 10:46:38 +0100] rev 720
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 11 Feb 2013 10:44:54 +0100] rev 719
Added tag 3.1.0 for changeset cdb52bbbe5b8
Levi Bard <levi@unity3d.com> [Sun, 10 Feb 2013 16:14:45 +0100] rev 718
evolve: update test output.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 11 Feb 2013 10:28:32 +0100] rev 717
prepare release 3.1.0
Levi Bard <levi@unity3d.com> [Mon, 11 Feb 2013 09:21:22 +0000] rev 716
prune: add --user and --date options
They control the metadata writen to the obsolescence marker.
Levi Bard <levi@unity3d.com> [Mon, 11 Feb 2013 09:21:11 +0000] rev 715
prune: add strip-like bookmark
This prune changesets pointed by the specified bookmark only (and removes the
bookmarks)
Levi Bard <levi@unity3d.com> [Sun, 10 Feb 2013 16:17:01 +0100] rev 714
evolve: remove duplicate alias.
Levi Bard <levi@unity3d.com> [Sun, 10 Feb 2013 00:23:22 +0100] rev 713
evolve: update stabilize order test after output change
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 10 Feb 2013 12:10:32 +0000] rev 712
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 09 Feb 2013 20:53:45 +0000] rev 711
evolve: document --all option
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 09 Feb 2013 20:53:03 +0000] rev 710
merge --all option from tak
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 09 Feb 2013 20:52:30 +0000] rev 709
minor help changes
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 18:07:49 +0100] rev 708
evolve: clean up help message
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 18:07:36 +0100] rev 707
evolve: remove magic return values from utility functions
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 17:02:34 +0100] rev 706
evolve: clean up evolve implementation.
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 16:21:32 +0100] rev 705
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 16:21:22 +0100] rev 704
evolve: add --all argument.
Levi Bard <levi@unity3d.com> [Sat, 09 Feb 2013 15:42:14 +0100] rev 703
evolve: extract evolve --any implementation into a function.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 22:44:43 +0000] rev 702
touch: properly handle touching multiple changeset
Denis Laxalde <denis.laxalde@logilab.fr> [Fri, 08 Feb 2013 22:12:46 +0000] rev 701
add a duplicate option in touch
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 22:09:42 +0000] rev 700
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 21:43:00 +0000] rev 699
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.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 21:27:48 +0000] rev 698
changelog: add more entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 21:26:47 +0000] rev 697
fix future 3.1.0 changelog entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 20:45:18 +0000] rev 696
alias: add a grab alias
Its a valid replacement for graft -O
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 08 Feb 2013 20:18:40 +0000] rev 695
amend: drop the --change option
it is deprecated for quite some time already
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 06 Feb 2013 23:21:42 +0000] rev 694
drop suspicious import in evolve
introduced by 97ce1f801309
Thanks to Bryan Murdock for reporting the issue.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 21:38:19 +0100] rev 693
prune: handle bookmark
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 21:40:58 +0100] rev 692
test-prune: simplified log output
useful to testing bookmark later
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 19:08:27 +0100] rev 691
prune: update inline documentation
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 19:04:22 +0100] rev 690
prune: more command switch idea
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 19:02:19 +0100] rev 689
prune: documentation update
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 22:05:03 +0100] rev 688
prune: add an informative message about the number of pruned changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 22:04:50 +0100] rev 687
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 18:44:40 +0100] rev 686
prune: turn one of the test changeset public
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 18:42:50 +0100] rev 685
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 18:07:09 +0100] rev 684
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.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:55:03 +0100] rev 683
simplify locking in prune
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:51:27 +0100] rev 682
prune: rename --new to --succ
This is closer to want the documentation says.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:45:38 +0100] rev 681
prune: improve command function name
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:45:22 +0100] rev 680
prune: fix doc
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:41:35 +0100] rev 679
evolve: drop uneeded noderange function
We can use revrange instead
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:40:28 +0100] rev 678
evolve: warn for troubles created by histedit too.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:39:16 +0100] rev 677
drop useless empty lines
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:31:43 +0100] rev 676
evolve: remove outdated documentation
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:31:20 +0100] rev 675
add an explicite warning when repo contains invalid obsolescence markers
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:21:02 +0100] rev 674
evolve: remove pre 2.3 code
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:18:02 +0100] rev 673
evolve: removes amend from the list of advertised function
We have commit --amend almost as powerful now.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:11:58 +0100] rev 672
evolve: fix extsetup extension helper
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:04:36 +0100] rev 671
evolve: remove unused function imported from mercurial
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 04 Feb 2013 17:03:20 +0100] rev 670
evolve: drop unused import
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:07:01 +0100] rev 669
merge with doc fixes
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:02:07 +0100] rev 668
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:05:01 +0100] rev 667
doc: update version information
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:01:34 +0100] rev 666
merge with hg2.4 compat branch
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:00:02 +0100] rev 665
Added tag 3.0.0 for changeset 862b6b71a358
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:57:58 +0100] rev 664
prepare for release 3.0.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:21:01 +0100] rev 663
mark test with 2.5
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:20:10 +0100] rev 662
merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:17:00 +0100] rev 661
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
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 25 Jan 2013 17:26:47 +0100] rev 660
hgext: add a simpler extension to enable obsolete on server
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 25 Jan 2013 16:59:20 +0100] rev 659
drop: divergence related code
It is now in code
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 25 Jan 2013 16:42:49 +0100] rev 658
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.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 05 Jan 2013 18:10:07 +0100] rev 657
evolve: drop "troubles" and "troubled" method now in core
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 25 Jan 2013 16:31:29 +0100] rev 656
test: drop rebase test
We assume that the mercurial rebases tests suite is strong enough now.
Greg Ward <greg@gerg.ca> [Thu, 24 Jan 2013 18:05:59 -0500] rev 655
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.
Greg Ward <greg@gerg.ca> [Thu, 24 Jan 2013 18:02:00 -0500] rev 654
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 07 Dec 2012 12:14:46 +0100] rev 653
[evolve] Drop useless filtered code
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 04 Jan 2013 12:43:22 +0100] rev 652
merge with filtering change (DO NOT USE WITHOUT FILTERING)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 04 Jan 2013 12:42:43 +0100] rev 651
evolve: ensure evolve command run unfiltered
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 04 Jan 2013 11:47:45 +0100] rev 650
test: drop divergent test
It is into core now
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 02 Jan 2013 14:41:47 +0100] rev 649
evolve: stop working around phase limitation
Core is handling this part a bit better
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:52:32 +0100] rev 648
fix punctuation
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 15:57:51 +0100] rev 647
evolve: fix version message
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 15:01:30 +0100] rev 646
test: more resistance to filtering changes
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:38:40 +0100] rev 645
merge with stable
Denis Laxalde <denis.laxalde@logilab.fr> [Mon, 03 Dec 2012 14:41:14 +0100] rev 644
support -r option in prune, add a test for this
Also localize options in fold.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:28:04 +0100] rev 643
doc: index version info on index
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:22:20 +0100] rev 642
doc: updates mq refugee book
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:17:17 +0100] rev 641
doc: update how-to
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:01:24 +0100] rev 640
tutorial: second replacement of hg amend by commit --amend
(the diff is huge because commit --amend have protection vs cycle)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 13:48:48 +0100] rev 639
tutorial: use evolve directly
We a real mode in addition to the dry run one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 12:37:25 +0100] rev 638
tutorial: use rebase instead of graft -O
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 12:23:56 +0100] rev 637
tutorial: use commit --amend when possible
commit --amend is the core way to do that, we better get used to it.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 12:15:56 +0100] rev 636
evolve: make evolve smarter
It is not more confused by killed changeset and can also choose to stabilise '.'
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 11:52:22 +0100] rev 635
tutorial: update notes in unwritten section
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 11:49:22 +0100] rev 634
tutorial: glog is into core now
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 18 Dec 2012 17:31:23 +0100] rev 633
test: adapt to the way the bundle is generated
optimised generation gives 1 changes, strict on gives 2.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 05 Dec 2012 11:30:24 +0100] rev 632
fold: work around potential bug with filtering
Folded revision may be becomes filtered leading to a crash of the replaced rset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 04 Dec 2012 00:18:32 +0100] rev 631
prepare for filtering
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 17 Dec 2012 14:33:01 +0100] rev 630
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 16:30:25 +0100] rev 629
Added tag 2.1.0 for changeset f9d305deeff3
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 15:19:24 +0100] rev 628
[prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 15:13:50 +0100] rev 627
update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 15:11:09 +0100] rev 626
merge with fix in 2.3
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 03 Dec 2012 00:10:58 +0100] rev 625
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 02 Dec 2012 16:21:19 +0100] rev 624
more versatile test.
push can fails on any divergent changeset I do not care for now.
Denis Laxalde <denis.laxalde@logilab.fr> [Wed, 28 Nov 2012 10:19:43 +0100] rev 623
fix retrieval of divergent changesets in obssummary (typo)
Add a test for this; drop wrong divergent print in 'Test rollback support'.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Nov 2012 14:28:41 +0100] rev 622
merge with Denis improvement
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Nov 2012 14:27:50 +0100] rev 621
merge with Denis improvement
Denis Laxalde <denis.laxalde@logilab.fr> [Thu, 22 Nov 2012 11:30:36 +0100] rev 620
use comments to combine commit messages in fold
Denis Laxalde <denis.laxalde@logilab.fr> [Mon, 26 Nov 2012 11:59:40 +0100] rev 619
add a -e option to fold
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:37:30 +0100] rev 618
merge
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:14:20 +0100] rev 617
detect incompatibility with future mercurial 2.5
changes in bookmark break compatibility
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:05:51 +0100] rev 616
merge
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:03:39 +0100] rev 615
merge
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:03:23 +0100] rev 614
Added tag 1.1.0 for changeset 22cacfce2a65
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:02:37 +0100] rev 613
fix version in setup.py
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 21 Nov 2012 00:18:41 +0100] rev 612
adapt to 7f5dab94e48c in crew
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 15 Nov 2012 15:46:54 +0100] rev 611
deprecate "amend --change" option
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:23:01 +0100] rev 610
merge with qsync fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:22:41 +0100] rev 609
merge with qsync fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:22:16 +0100] rev 608
merge with qsync fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:19:54 +0100] rev 607
[qsync] fix filestore usage
The filestore was closed too early, dropping on disk cache
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:05:21 +0200] rev 606
merge back with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:02:51 +0200] rev 605
Added tag 2.0.0 for changeset d43e80504e5
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:44:52 +0200] rev 604
evolve: some comment update
Bumped is in core now.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:01:50 +0200] rev 603
update debian control
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:01:08 +0200] rev 602
merge 2.4 code back into default.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:00:18 +0200] rev 601
merge with 1.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:59:34 +0200] rev 600
Added tag 1.1.0 for changeset c062edbcaf13
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:58:31 +0200] rev 599
Fix debian control
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:40:25 +0200] rev 598
prepare a branch for Compat with mercurial 2.3 only
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:38:51 +0200] rev 597
prepares evolve 1.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:45:21 +0200] rev 596
merge changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:44:31 +0200] rev 595
update changelog with future 1.1.0 news
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:43:22 +0200] rev 594
merge bumped rename
(drop several part of the code because bumped is now in core)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:32:22 +0200] rev 593
evolve: Rename latecomer into bumped
This is the new name in core
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:13:30 +0200] rev 592
evolve: set tested with 2.4
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:13:19 +0200] rev 591
evolve: require Mercurial 2.4 to work
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:12:53 +0200] rev 590
evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 16:53:11 +0200] rev 589
merge with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 16:49:29 +0200] rev 588
mercurial: replace all `newerversion` call by `successorsset` call
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 16:36:29 +0200] rev 587
evolve: smarter code for divergent changeset
This newer version properly handle split now. Code and test copied for future
upstream one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 15:44:24 +0200] rev 586
evolve: rename conflicting into divergent
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 15:05:32 +0200] rev 585
evolve: detect and abort if 2.4 is detected
The meaning of critical attribut have changed in 2.4
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 15:03:25 +0200] rev 584
evolve: add tested with info
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 14 Oct 2012 16:23:25 +0200] rev 583
merge stable into default
Patrick Mezard <patrick@mezard.eu> [Sat, 13 Oct 2012 16:44:14 +0200] rev 582
test-stabilize-conflict.t: fix "eight" spelling
Patrick Mezard <patrick@mezard.eu> [Sat, 13 Oct 2012 16:38:23 +0200] rev 581
test-stabilize-conflict.t: sed -i is still not portable
Patrick Mezard <patrick@mezard.eu> [Sat, 13 Oct 2012 16:31:52 +0200] rev 580
test-stabilize-conflict.t: yes is not a standard shell utility
And for some reason the test fails on OSX.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 10 Oct 2012 15:26:09 +0200] rev 579
evolve: drop code now in core
The default branch aims compat with the mercurial default branch. we do not need
all those conditional.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 10 Oct 2012 15:11:31 +0200] rev 578
merge with default
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 10 Oct 2012 14:58:21 +0200] rev 577
evolve: filter nullid successors
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 27 Sep 2012 16:55:08 +0200] rev 576
evolve: new divergent revset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 27 Sep 2012 16:40:25 +0200] rev 575
doc: rename conflicting to divergent.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 25 Sep 2012 12:06:48 +0200] rev 574
more schema
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 20 Sep 2012 23:14:59 +0200] rev 573
merge stable into default
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 19 Sep 2012 15:28:35 +0200] rev 572
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:30:07 +0200] rev 571
rebase: warn about troubles created by rebase
The previous order created obsolete marker after checking for new troubles
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 14:53:24 +0200] rev 570
test-obsolete: clean up useless inlined option
rebase is enabled globally and graphlog is into core
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 18:07:07 +0200] rev 569
add image magic depends
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:52:39 +0200] rev 568
upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:52:33 +0200] rev 567
update MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:35:44 +0200] rev 566
merge (overwrite wrong tag)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:34:59 +0200] rev 565
Added tag 1.0.2 for changeset 5559e5a4b656
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:34:03 +0200] rev 564
prepare 1.0.2
Pierre-Yves David <pierre-yves.david@logilab.fr> [Sun, 16 Sep 2012 04:19:52 +0200] rev 563
Added tag 1.0.2 for changeset b1bdcb4506de
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 14 Sep 2012 15:36:29 +0200] rev 562
hg prune: prevent empty call
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 12 Sep 2012 14:24:23 +0200] rev 561
fold: handle the lack of revision to fold
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 16:19:27 +0200] rev 560
fix readme header
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 16:17:56 +0200] rev 559
slight change to the evolve logo
thank to Adrien Di Mascio
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 16:17:11 +0200] rev 558
docs: fix makefile
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 15:59:27 +0200] rev 557
doc: add a logo
It's not that cute be we have one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 15:57:54 +0200] rev 556
README: remove bogus date
This version is not released yet.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 14:05:37 +0200] rev 555
update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 13:51:24 +0200] rev 554
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 12:38:49 +0200] rev 553
createmarkers: adapt to f85816af6294 in core
The createmarkers function is now in core. Fallback on our function if not
available
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 12:30:22 +0200] rev 552
warning: work around phase limitation when computing warnings
The new phase have not been written yet because we did not release the lock yet
:-/
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 12:19:13 +0200] rev 551
caches: now in core adapt to fb72eec7efd8
If we detect a cache mechanism in core we is it intead of instead our own
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 11:45:00 +0200] rev 550
evolve-cmd: fix merge error detection for external tools.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 10 Sep 2012 18:56:44 +0200] rev 549
Properly update after fold
The previous version only set the parent, it did not rebuilt dirstate or update
any file content.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 10 Sep 2012 18:22:45 +0200] rev 548
fix hg pull --rebase
There is more user of rebase than just the rebase command
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 10 Sep 2012 16:54:58 +0200] rev 547
remove all notion of --detach in the test
Mercurial 2.3 killed --detach (dance)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 10 Sep 2012 17:33:06 +0200] rev 546
fix missing --dest evolve output in dryrun
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 Aug 2012 11:50:37 +0200] rev 545
pkg: proper debian version
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 Aug 2012 11:32:21 +0200] rev 544
pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 Aug 2012 11:30:51 +0200] rev 543
Added tag 1.0.1 for changeset ca5bb72d14ae
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 Aug 2012 11:30:30 +0200] rev 542
pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 31 Aug 2012 11:18:39 +0200] rev 541
pkg: prepare version 1.0.1
Patrick Mezard <patrick@mezard.eu> [Thu, 30 Aug 2012 22:05:05 +0200] rev 540
evolve: fixing syntax/grammar
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 21:47:09 +0200] rev 539
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.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 30 Aug 2012 20:28:00 +0200] rev 538
doc improvement
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 14:03:14 +0200] rev 537
pkg-debian: fix uploader fields
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 14:01:53 +0200] rev 536
pkg-debian: improve control files
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 14:01:29 +0200] rev 535
pkg-debian: remove conflicting __init__.py files
Aurelien Campeas <aurelien.campeas@logilab.fr> [Thu, 30 Aug 2012 13:54:43 +0200] rev 534
a better msg for this tricky situation
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 13:50:17 +0200] rev 533
test conflicting conflicting (sic) resolution
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Aug 2012 11:58:21 +0200] rev 532
Added tag 1.0.0 for changeset b18b00036355
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Aug 2012 11:36:10 +0200] rev 531
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Aug 2012 11:15:03 +0200] rev 530
tests: remove unused required tools
The original mercurial test use much more stuff than us.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Aug 2012 11:10:29 +0200] rev 529
pkg: exclude tests for unpackaged extension
the old obsolete format BC and qsync are not included in this package. exclude
related tests.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 18:35:46 +0200] rev 528
test: remove unused obsolete extension in the tutorial
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 15:31:42 +0200] rev 527
docs: add missing blank line after Copyright notice
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 15:19:28 +0200] rev 526
hgignore: ignore compiled tutorials
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 15:17:13 +0200] rev 525
doc: remove spurious print in test2rest.py
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 15:16:47 +0200] rev 524
pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 14:57:20 +0200] rev 523
doc: long desc update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 14:56:11 +0200] rev 522
remove old qsync enable file
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 27 Aug 2012 14:54:26 +0200] rev 521
setup: fix version number to 1.0.0
0.1.0 was release times ago
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 26 Aug 2012 12:04:16 +0200] rev 520
Conditionnaly add the `hidden` revset symbol
Mercurial Core#default now have it (but 2.3 don't)
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 25 Aug 2012 14:43:34 +0200] rev 519
ensure all file have a copyright notice
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 25 Aug 2012 14:43:18 +0200] rev 518
add COPYING File with the license
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 09:45:03 +0200] rev 517
evolve: usual syntax/grammar errors/long lines cleanup
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 09:32:05 +0200] rev 516
evolve: simplify locking in _solveconflicting()
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 09:18:40 +0200] rev 515
fold: simplify locking
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 09:20:15 +0200] rev 514
touch: simplify locking pattern
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 08:51:37 +0200] rev 513
evolve: factor out copy/paste in obssummary()
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 08:30:02 +0200] rev 512
evolve: avoid 'any' argument name in _picknexttroubled()
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 08:26:28 +0200] rev 511
evolve: localrepo.revs() already returns a list
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 08:20:50 +0200] rev 510
evolve: compute "troubled" revs in stabilize only when necessary
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 08:17:59 +0200] rev 509
evolve: move _stabilizableunstable() with related functions
Patrick Mezard <patrick@mezard.eu> [Sat, 25 Aug 2012 07:59:51 +0200] rev 508
test-tutorial: stop using enable.sh, removed by 53d7e3413337
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 19:11:49 +0200] rev 507
evolve: add touch and fold to command that may create troubles
They should raise warning about it too.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 17:27:09 +0200] rev 506
doc: add missing image
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 17:12:47 +0200] rev 505
doc: fix emphasis
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 17:12:30 +0200] rev 504
doc: remove toc reference to dead file
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 17:12:07 +0200] rev 503
setup.py: remove setuptools related info
bad setuptool bad.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 15:55:40 +0200] rev 502
doc: add more warning
This is not "stable"
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 13:19:11 +0200] rev 501
update implementation details
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 12:47:12 +0200] rev 500
Doc: several update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:53:55 +0200] rev 499
Prepare 0.1.0 by merging default into stable
stable is now compatible with 2.3 only.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:49:21 +0200] rev 498
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
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:52:49 +0200] rev 497
evolve: add the odiff alias
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:39:22 +0200] rev 496
[pkg] Add a setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:39:03 +0200] rev 495
Ignore build directory
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:30:01 +0200] rev 494
update documentation
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:21:09 +0200] rev 493
doc: some terms update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 11:17:18 +0200] rev 492
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 10:44:23 +0200] rev 491
merge evolve and obsolete
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 18:21:18 +0200] rev 490
sort import
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 18:19:42 +0200] rev 489
Fix mercurial version check
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 18:09:45 +0200] rev 488
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 18:01:28 +0200] rev 487
update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 18:00:29 +0200] rev 486
fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 17:40:28 +0200] rev 485
evolve: stabilize now handle conflicting changeset
Some a lot of rough edge but it just damn work.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 14:15:36 +0200] rev 484
stabilize: conflicting changeset are considered if "."
if not unstable changeset are found, the current parent directory may be
stabilize if conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 12:53:27 +0200] rev 483
Introduction of olog as an alias
This will won't stay as such long.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 23 Aug 2012 12:51:06 +0200] rev 482
evolve: fold command
First crude version of a fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 23 Aug 2012 12:51:34 +0200] rev 481
evolve: touch command
command to easily revive a changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 23 Aug 2012 03:14:03 +0200] rev 480
obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 12:23:34 +0200] rev 479
obsolete: add obsolete data to summary.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 23 Aug 2012 12:23:00 +0200] rev 478
update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 21 Aug 2012 12:47:50 +0200] rev 477
merge with stable improvement
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 21 Aug 2012 12:43:21 +0200] rev 476
[evolve] amend: display proper error message while trying to amend non ancestor
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 21 Aug 2012 12:42:09 +0200] rev 475
[evolve] amend: check phase before starting the transition
We better abort before starting a useless transaction.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 21 Aug 2012 12:38:19 +0200] rev 474
test: turn the base public
usefull for followup that test phases enforcement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 21 Aug 2012 04:36:25 +0200] rev 473
obsolete: prevent bare hg update to select hidden changeset
The issue remain with branch name.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 21 Aug 2012 02:50:11 +0200] rev 472
obsolete: prevent rebasing of public changeset
Because we force keep we have to check this on our own.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 21 Aug 2012 02:25:19 +0200] rev 471
obsolete: warn when the whole rebase set was remove because extinct
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 19:12:20 +0200] rev 470
obsolete: use flag to detect that a obsolescence marker fix a latecomer
Otherwise latecomer fix will be latecomer too.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 21 Aug 2012 10:10:44 +0200] rev 469
stabilize: handle latecomer
Merge are not handled yet.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 18:59:07 +0200] rev 468
stabilize: rework stabilize code to allow selection of latecomer and conflicting
They are still unhandled but the tool now explicitly state this fact.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 15:43:57 +0200] rev 467
obsolete: add a "troubled" revset
returns all changeset with troubles whatever the trouble is.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 14:40:48 +0200] rev 466
stabilize: handle killed changeset in stabilize.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 14:13:29 +0200] rev 465
stabilize: --continue support !!!
Based on graft one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 12:31:43 +0200] rev 464
stabilize: rename "node" variable to "orig"
It's a not a node at all. this is a context.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 20 Aug 2012 12:25:08 +0200] rev 463
obsolete Move merge failure handling into stabilize code
This violate less Layer. For this purpose we crate an easy to recognize
Exception Class.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 20 Aug 2012 22:18:10 +0200] rev 462
obsolet: fix extension help code about extension wrapping
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 21 Aug 2012 02:37:53 +0200] rev 461
merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 21 Aug 2012 02:36:33 +0200] rev 460
obsolete: filter out nullid from possible successors
This have several bad effect as wrong late comer detection.
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 16:54:48 +0200] rev 459
obsolete: more typos and cleanup
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 16:34:25 +0200] rev 458
obsolete: fix indentation in obsolete import block
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 16:09:09 +0200] rev 457
obsolete: fix docstrings
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 15:38:55 +0200] rev 456
obsolete: simplify module docstring
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 16:51:45 +0200] rev 455
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 15:40:09 +0200] rev 454
obsolete: more comment
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 13:51:10 +0200] rev 453
remove useless function
It has no user left and no purpose in live.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 13:50:48 +0200] rev 452
add cleanup todo
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 12:59:32 +0200] rev 451
more doc and cleanup
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 11:54:27 +0200] rev 450
obsolete: document the cache stuff
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 08 Aug 2012 11:10:43 +0200] rev 449
obsolete: Improves cache invalidation logic
Filecache are not the same that cache property.
This can probably be improved
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 07 Aug 2012 21:39:55 +0200] rev 448
obsolete: some more movement
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 21:35:39 +0200] rev 447
obsolete: move caches on obsstore
No need to clutter local repo
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 18:53:26 +0200] rev 446
obsolete: remove legacy revset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 18:46:38 +0200] rev 445
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 18:26:13 +0200] rev 444
drop repo.addobsolete
We now use createmarkers directly.
No black magic with nullid is done anymore.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 18:05:41 +0200] rev 443
obsolete: remove usage of addcollapsedobsolete
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 18:17:13 +0200] rev 442
obsolete: extract high level marker creation in a dedicated util function
This prepare the dooms of repo based method.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 16:02:50 +0200] rev 441
obsolete: remove debugsuccessors
This was kinda duplicate of core "debugobsolete"
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 15:38:20 +0200] rev 440
obsolete: tag more function for disapearance
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 15:05:04 +0200] rev 439
obsolete: reorder import
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 15:04:03 +0200] rev 438
obsolete: some more dead code
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 15:02:54 +0200] rev 437
obsolete: sort all code
Move (splitting some function) all code in dedicated section
The hook wrapping have disapeared in the process.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:38:28 +0200] rev 436
obsolete: remove unused repo method
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:34:25 +0200] rev 435
obsolete: clean up import
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:33:24 +0200] rev 434
obsolete: more BC drop
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:32:54 +0200] rev 433
obsolete: move version checks at the start of the file
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:19:18 +0200] rev 432
obsolete: some more comment
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:08:20 +0200] rev 431
obsolete: add and use templatekw decorator
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:00:39 +0200] rev 430
obsolete: move old format stuff at the end
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 07 Aug 2012 14:08:31 +0200] rev 429
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.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 07 Aug 2012 11:35:45 +0200] rev 428
obsolete: remove 2.2 compat hack
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 19:34:24 +0200] rev 427
merge with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 19:31:52 +0200] rev 426
Added tag 0.7 for changeset 1b2757c1bd91
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 19:31:15 +0200] rev 425
changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 19:16:30 +0200] rev 424
enable: update check to ensure people use 2.3
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 06 Aug 2012 17:02:38 +0200] rev 423
obsolete: remove unused BC code
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 16:56:17 +0200] rev 422
hgignore: ignore the "common" tests/easy_run.sh file
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 06 Aug 2012 17:15:00 +0200] rev 421
test: drop old BC clause
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 05 Aug 2012 12:02:45 +0200] rev 420
merge
Patrick Mezard <patrick@mezard.eu> [Sat, 04 Aug 2012 12:44:51 +0200] rev 419
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu> [Sun, 05 Aug 2012 11:34:21 +0200] rev 418
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu> [Sat, 04 Aug 2012 12:48:20 +0200] rev 417
evolve: avoid duplication in graft wrapper
Patrick Mezard <patrick@mezard.eu> [Sat, 04 Aug 2012 12:28:21 +0200] rev 416
obsolete/evolve: fix grammar in prerequisite messages
Patrick Mezard <patrick@mezard.eu> [Sat, 04 Aug 2012 12:06:34 +0200] rev 415
obsolete: fix doc, rebase no longer aborts with --keep
Patrick Mezard <patrick@mezard.eu> [Fri, 03 Aug 2012 17:48:21 +0200] rev 414
evolve: tweak and add EOL to kill warning
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 14:30:00 +0200] rev 413
nopushpublish: add license en copyright notice
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 14:26:41 +0200] rev 412
obsolete: simplify obsolete feature enabling
We don't need setattr here
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 02 Aug 2012 18:52:15 +0200] rev 411
merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 30 Jul 2012 22:45:06 +0200] rev 410
amend: wrap the whole process in a single transaction.
David Douard <david.douard@logilab.fr> [Tue, 31 Jul 2012 15:23:01 +0200] rev 409
pushkey: properly handle abort during obsolete markers push
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 15:04:59 +0200] rev 408
hook: work around insanely huge value in obsolete pushkey call
The value is not that useful and make shell call explode.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 12:47:56 +0200] rev 407
merge with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 12:45:45 +0200] rev 406
Added tag 0.6 for changeset 4a5488c01a66
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 12:45:24 +0200] rev 405
obsolete: enable obsolete feature
The feature is now disabled by default in core.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 11:53:41 +0200] rev 404
obsolete: improve compat with new core dump%i scheme
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jul 2012 14:45:42 +0200] rev 403
add nopushpublish extension.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jul 2012 14:45:08 +0200] rev 402
move the extension to contrib to prepare merge with mutable history
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jul 2012 14:42:02 +0200] rev 401
some doc
David Douard <david.douard@logilab.fr> [Fri, 25 May 2012 11:21:43 +0200] rev 400
initial import
Simple extension that prevent from pushing in a publishing remote repo.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jul 2012 12:37:33 +0200] rev 399
merge with stable
Patrick Mezard <patrick@mezard.eu> [Sun, 29 Jul 2012 17:25:47 +0200] rev 398
obsolete: fix hidden() revset
The hiddenrevs set was moved from changelog to localrepository in
hg@62c56c94c77e.
Patrick Mezard <patrick@mezard.eu> [Sun, 29 Jul 2012 17:10:43 +0200] rev 397
obsolete: improve revset online help
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 27 Jul 2012 15:04:55 +0200] rev 396
make compat server both compatible with "dump" and "dump%i" version
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 26 Jul 2012 15:23:05 +0200] rev 395
merge
David Douard <david.douard@logilab.fr> [Wed, 18 Jul 2012 12:40:41 +0200] rev 394
qsync: ignore unexistent nodes
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 26 Jul 2012 15:17:34 +0200] rev 393
backout 97b75bbfacc5. Use cached version of obsolete, unstable and extinct
The core version are far too slow
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 26 Jul 2012 15:09:08 +0200] rev 392
backout temporary fix for clone
Now fixed into core
Patrick Mezard <patrick@mezard.eu> [Thu, 26 Jul 2012 13:42:12 +0200] rev 391
.hgignore: ignore vi swap files
Patrick Mezard <patrick@mezard.eu> [Thu, 26 Jul 2012 13:40:32 +0200] rev 390
obsolete: fix typos, improve messages
Patrick Mezard <patrick@mezard.eu> [Thu, 26 Jul 2012 13:45:09 +0200] rev 389
test-obsolete: handle local clones copying obsolete markers
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:36:02 +0200] rev 388
obsolete: rely on core for context and reveset which exist there
(this means loosing the cache :-( )
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:28:46 +0200] rev 387
obsolete: rely on core for rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:26:01 +0200] rev 386
obsolete: rely on core to hide extinct changeset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:23:43 +0200] rev 385
obsolete: Stop turning obsolete secret changesets secret
Extinct changeset are not properly excluded by core.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:14:18 +0200] rev 384
obsolete remove unused module
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:13:43 +0200] rev 383
obsolete: drop outdated doc
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:07:20 +0200] rev 382
Use the core check heads mecanism to prevent zaelous warning
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 19:08:45 +0200] rev 381
obsolete: rely on core to filter extinct changeset out
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 26 Jul 2012 11:44:05 +0200] rev 380
[temp] fix obsolete marker cloning broken in core.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 18:18:38 +0200] rev 379
Wider triggering of the debug marker abort
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 18:09:11 +0200] rev 378
obsolete: fix visibleheads/branchmap wrapping
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 17:53:17 +0200] rev 377
merge with stable fix and preparation
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 17:43:38 +0200] rev 376
obsolete: move hint punching to push
Core does not raise the warning in check heads
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Jul 2012 17:40:50 +0200] rev 375
obsolete: doc punch the hint about hg stabilize into the push error message.
The goal is to ease the transposition of to default where half of the message
may be raised by core directly.
Patrick Mezard <patrick@mezard.eu> [Wed, 25 Jul 2012 17:28:32 +0200] rev 374
obsolete: change warning output to match mercurial core on
The new messages were introduced by hg@12fdaa30063a.
Patrick Mezard <patrick@mezard.eu> [Thu, 19 Jul 2012 16:16:08 +0200] rev 373
doc: fix weird quote in from-mq.rst
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 17 Jul 2012 19:49:08 +0200] rev 372
merge with 0.5
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 17 Jul 2012 19:47:54 +0200] rev 371
Added tag 0.5 for changeset 7ef8ab8c6fea
Pierre-Yves.David@ens-lyon.org [Mon, 16 Jul 2012 16:57:17 +0200] rev 370
some more fix
Pierre-Yves.David@ens-lyon.org [Mon, 16 Jul 2012 03:59:39 +0200] rev 369
marmoute N+2 pass
Alain Leufroy <alain.leufroy@logilab.fr> [Sun, 15 Jul 2012 16:19:02 +0200] rev 368
[docs] obsolete: fix some typos
Pierre-Yves.David@ens-lyon.org [Sun, 15 Jul 2012 14:51:52 +0200] rev 367
merge with doc fix
Pierre-Yves.David@ens-lyon.org [Sun, 15 Jul 2012 14:42:21 +0200] rev 366
grmlgm edit
Pierre-Yves.David@ens-lyon.org [Sun, 15 Jul 2012 13:07:54 +0200] rev 365
evolve: switch the official name for "kill" to prune
doc have been updated too
Pierre-Yves.David@ens-lyon.org [Sun, 15 Jul 2012 12:57:22 +0200] rev 364
doc: cleanup in caveat and 2.1 compat
Pierre-Yves.David@ens-lyon.org [Sun, 15 Jul 2012 12:49:25 +0200] rev 363
doc: big update of terms and summary of the concept
This is intended to be sent to the mailing list for discussion.
Pierre-Yves.David@ens-lyon.org [Sat, 14 Jul 2012 18:10:24 +0200] rev 362
evolve: add the solve alias to obsolete
Pierre-Yves.David@ens-lyon.org [Fri, 13 Jul 2012 13:07:42 +0200] rev 361
obsolete: adapt to core: marker are written in transaction now
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 11 Jul 2012 21:07:02 +0200] rev 360
obsolete: ctx.obsolete in core is not buggy anymore
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 11 Jul 2012 15:20:22 +0200] rev 359
merge with conflicting detection
Pierre-Yves.David@ens-lyon.org [Sat, 14 Jul 2012 17:58:08 +0200] rev 358
merge with doc fix
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Wed, 11 Jul 2012 13:59:06 -0400] rev 357
doc: English proofreading
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 11 Jul 2012 13:59:02 +0200] rev 356
Move obserror warning into the obsolete extension.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 11 Jul 2012 13:38:48 +0200] rev 355
evolve: warn on conflicting changeset too
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 11 Jul 2012 12:38:05 +0200] rev 354
obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 10 Jul 2012 16:14:29 +0200] rev 353
merge with stable fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 10 Jul 2012 16:14:03 +0200] rev 352
Added tag 0.4.1 for changeset 4ecbaec1d664
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 10 Jul 2012 16:07:48 +0200] rev 351
Ignore buggy marker in newerversion
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 10 Jul 2012 16:03:29 +0200] rev 350
[convert] properly exclude null successors from convertion
Old remain of the old way to kill changeset.
Patrick Mezard <patrick@mezard.eu> [Tue, 10 Jul 2012 15:14:58 +0200] rev 349
obsolete: remove unused add2set/markerid functions
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 10 Jul 2012 01:05:13 +0200] rev 348
Merge with debugconvertobsolete update
Patrick Mezard <patrick@mezard.eu> [Sun, 08 Jul 2012 19:18:07 +0200] rev 347
docs: improve recent updates
Patrick Mezard <patrick@mezard.eu> [Sun, 08 Jul 2012 19:02:36 +0200] rev 346
tests: update graphlog output after hg@2e13c1bd34dc
2e13c1bd34dc displays obsolete changesets as 'x' instead of 'o'.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 06 Jul 2012 18:43:25 +0200] rev 345
Added tag 0.4.0 for changeset 9bbcd2746898
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 06 Jul 2012 18:32:10 +0200] rev 344
obsolete: fix bug in detection of remote obsolete support
We were checking again local...
Pierre-Yves.David@ens-lyon.org [Tue, 03 Jul 2012 11:35:31 +0200] rev 343
adapt for new mercurial
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 03 Jul 2012 14:18:33 +0200] rev 342
merge with new binary format
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 06 Jul 2012 17:15:30 +0200] rev 341
obsolete: harden convertion from first format
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 06 Jul 2012 16:32:53 +0200] rev 340
obsolete: better lookuperror handling during convert
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 06 Jul 2012 16:25:06 +0200] rev 339
[obsolete] convert json unicode into string before creating an obsolete marker
David Douard <david.douard@logilab.fr> [Fri, 06 Jul 2012 15:39:01 +0200] rev 338
obsolete: we are not compatible with 2.1 any more
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 04 Jul 2012 18:00:43 +0200] rev 337
obsolete: convert try to guess what invalid node id are
invalid input are probably short version of node
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 04 Jul 2012 17:51:33 +0200] rev 336
obsolete: Only warn on bad obsolete marker
Older version probably created invalide one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 04 Jul 2012 16:27:08 +0200] rev 335
obsolete: fix obsolete marker creation error message
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 03 Jul 2012 12:58:55 +0200] rev 334
obsolete: move to official binary format
Pierre-Yves.David@ens-lyon.org [Sat, 30 Jun 2012 03:25:25 +0200] rev 333
merge with stable fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 17:21:24 +0200] rev 332
obsolete: public changeset are no longer latecomer.
They are plain duplicate.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:29:25 +0200] rev 331
merge back with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:28:35 +0200] rev 330
more README changes (oops)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:14:35 +0200] rev 329
Added tag 0.3.0 for changeset c046b083a5e0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:14:17 +0200] rev 328
README: minor changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:12:19 +0200] rev 327
Merge default new feature in stable
0.3.0 planned
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 15:10:59 +0200] rev 326
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 14:48:44 +0200] rev 325
doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 12:48:16 +0200] rev 324
readme: explain "instalation process"
if it may be called like that.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 12:44:54 +0200] rev 323
merge with stable doc update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 12:43:57 +0200] rev 322
setup: update alias with new wording
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 27 Jun 2012 12:30:10 +0200] rev 321
obsolete: add an hidden revset
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 27 Jun 2012 12:30:16 +0200] rev 320
obsolete: basic commit --amend support
commit --amend still strip. but lay obsolete marker down anyway
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 27 Jun 2012 03:53:44 +0200] rev 319
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`
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 27 Jun 2012 03:51:54 +0200] rev 318
evolve: warn when uncommit leave an empty changeset
This is intended to replace the proposed --delete flag.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 27 Jun 2012 03:37:49 +0200] rev 317
evolve: improve kill testing
show than uncommited changes are properly merged