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.