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