Tue, 30 May 2017 22:09:28 +0200 template: fix successors and precursors templates
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 22:09:28 +0200] rev 2528
template: fix successors and precursors templates In mercurial 4.1-, the gen argument is expected to be an iterator and not an iterable, fix successors and precursors templates.
Tue, 30 May 2017 19:59:57 +0200 lint: remove double newline in test file
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 19:59:57 +0200] rev 2527
lint: remove double newline in test file Test file test-stablesort-criss-cross.t contained two double newline, I remove them.
Tue, 30 May 2017 19:43:14 +0200 template: fix precursors template for older mercurial version
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 19:43:14 +0200] rev 2526
template: fix precursors template for older mercurial version In mercurial 4.1 and below templatekw._hybrid require the gen argument to be different than None. Manually compute the same default output for these older mercurial versions.
Tue, 30 May 2017 13:16:43 +0200 compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 13:16:43 +0200] rev 2525
compatibility: backport mercurial 176d1a0ce385 Backport obsstore.relevantmarkers change for including previously forgotten pruned obs markers. Target mercurial version lesser than 4.3. This impact multiple tests. All test changes has been manually checked. Since the computation of relevant obsmarkers have changed, we are bumping the cache schema version. So that caches get recomputed.
Tue, 30 May 2017 17:39:00 +0200 evolve: fix import order
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 17:39:00 +0200] rev 2524
evolve: fix import order
Fri, 26 May 2017 14:47:33 +0200 compat: adapt to buildobsmarkerspart move
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 26 May 2017 14:47:33 +0200] rev 2523
compat: adapt to buildobsmarkerspart move The function has been moved in e70d6dbde713 so we must we search in both location.
Tue, 30 May 2017 11:06:24 +0200 effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 11:06:24 +0200] rev 2522
effetflag: detect other meta (extra) changes Check other changeset meta other than branch and *_source and if there is a change, set the METACHANGED effect flag. Add a test for this scenario with a topic change.
Tue, 30 May 2017 17:32:39 +0200 obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 17:32:39 +0200] rev 2521
obsdiscovery: add an option to disable all obsdiscovery On large repository, computing the obshashtree can we as slow as resending everything. We give the option for people to opt out.
Tue, 30 May 2017 11:39:45 +0200 effectflag: better diff detection
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 11:39:45 +0200] rev 2520
effectflag: better diff detection Improve the diff detection algorithm to have less false positive like in the case of a rebase that move the hunk in the file but the hunk stays the same.
Tue, 30 May 2017 11:38:30 +0200 effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 11:38:30 +0200] rev 2519
effectflag: add a test for content detection Add a test for diff detection when the diff is different but only because of line numbers. The test is a append at the end of the file and we try to rebase it. We shouldn't detect a content change, it will be done in the next patch.
Tue, 30 May 2017 14:46:36 +0200 test: fix test-evolve-effectflags dates
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 14:46:36 +0200] rev 2518
test: fix test-evolve-effectflags dates Mercurial < 4.3 don't have default date so add globs in the test-metaedit.t file.
Tue, 30 May 2017 14:43:20 +0200 test: fix metaedit tests by forcing dates
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 14:43:20 +0200] rev 2517
test: fix metaedit tests by forcing dates Mercurial < 4.3 don't have default date so restore aliases forcing date in the test-metaedit.t file.
Tue, 30 May 2017 16:39:59 +0200 test: split test-stablesort.t in two
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 16:39:59 +0200] rev 2516
test: split test-stablesort.t in two This is the longest running test so we split it in two to help with parallel execution.
Tue, 30 May 2017 13:01:11 +0200 obsdiscovery: automatically pick protocol in a list
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 13:01:11 +0200] rev 2515
obsdiscovery: automatically pick protocol in a list This makes the code cleaner, clearer and more flexible. This also prepare the ability to disable obsmarkers discover entirely.
Tue, 30 May 2017 14:35:40 +0200 obsdiscovery: extract push-obshashtree discovery in a function
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 14:35:40 +0200] rev 2514
obsdiscovery: extract push-obshashtree discovery in a function This will help use to simplify the code.
Tue, 30 May 2017 14:27:26 +0200 obsdiscovery: directly use the 'only' revset for obshashtree
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 14:27:26 +0200] rev 2513
obsdiscovery: directly use the 'only' revset for obshashtree The revset now exists and is fast. This remove the needs to hold a reference to "revs" in that code.
Tue, 30 May 2017 14:21:10 +0200 obsdiscovery: extract push-obshashrange discovery in a function
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 14:21:10 +0200] rev 2512
obsdiscovery: extract push-obshashrange discovery in a function This will help us to simplify the code. The code is updated to directly use 'outgoing' missing so that is no longer needs to access 'futureheads'.
Tue, 30 May 2017 14:09:06 +0200 obsdiscovery: merge two distinct if statement
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 14:09:06 +0200] rev 2511
obsdiscovery: merge two distinct if statement It did not made any sense for them to be split.
Tue, 30 May 2017 12:32:14 +0200 obsdiscovery: extract '_canobshashtree'
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 12:32:14 +0200] rev 2510
obsdiscovery: extract '_canobshashtree' having this as a simple function will help use to generalise the obsdiscovery algorithm we use.
Tue, 30 May 2017 12:26:57 +0200 obsdiscovery: move code inserting discovery at the end of the file
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 12:26:57 +0200] rev 2509
obsdiscovery: move code inserting discovery at the end of the file This makes it easier to reuser function defined earlier in the file.
Tue, 30 May 2017 12:15:52 +0200 obsdiscovery: trust core to do the right thing if no discovery is available
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 12:15:52 +0200] rev 2508
obsdiscovery: trust core to do the right thing if no discovery is available This is fixed for a long time now.
Tue, 30 May 2017 12:13:14 +0200 obsdiscovery: factor the "do we push markers" check out
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 12:13:14 +0200] rev 2507
obsdiscovery: factor the "do we push markers" check out This clarify the code a bit.
Tue, 30 May 2017 11:55:58 +0200 stablerange: also respect the 'warm-cache' config
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 11:55:58 +0200] rev 2506
stablerange: also respect the 'warm-cache' config This will help large install to enable obshashrange as "opt-in" without impacting other repositories.
Tue, 30 May 2017 11:49:00 +0200 debugstablerange: cleanly "Abort" when no revision are specified
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 11:49:00 +0200] rev 2505
debugstablerange: cleanly "Abort" when no revision are specified Previously we had a traceback from a max on an empty sequence.
Tue, 30 May 2017 11:12:02 +0200 stablerange: use last recently used caching for revisions associated to ranges
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 11:12:02 +0200] rev 2504
stablerange: use last recently used caching for revisions associated to ranges This does not make things faster but at least it make them able to finish on large repositories.
Tue, 30 May 2017 11:12:12 +0200 stablerange: report progress more often in slow case
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 11:12:12 +0200] rev 2503
stablerange: report progress more often in slow case For small repositories the time spent in progress was problematic. However on large repository it quickly becomes negligible, so we add a way to detect this case and report more often in this case.
Mon, 29 May 2017 14:03:31 +0200 template: update successors template output
Boris Feld <boris.feld@octobus.net> [Mon, 29 May 2017 14:03:31 +0200] rev 2502
template: update successors template output Use templatekw._hybrid as return value for precursor template, it's nicer and easier to play with than returning a formatted string.
Mon, 29 May 2017 17:54:14 +0200 test: extract metaedit tests into test-metaedit.t test file
Boris Feld <boris.feld@octobus.net> [Mon, 29 May 2017 17:54:14 +0200] rev 2501
test: extract metaedit tests into test-metaedit.t test file The metaedit command deserver it own test file and this shave of 15% of the runtime of test-evolve.t one of our longest tests.
Mon, 29 May 2017 12:15:47 +0200 template: update precursors template output
Boris Feld <boris.feld@octobus.net> [Mon, 29 May 2017 12:15:47 +0200] rev 2500
template: update precursors template output Use templatekw._hybrid as return value for precursor template, it's nicer and easier to play with than returning a formatted string.
Mon, 29 May 2017 17:16:15 +0200 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 29 May 2017 17:16:15 +0200] rev 2499
template: skip "fate" in test output when empty This should clarify the test output a bit.
Mon, 29 May 2017 17:13:21 +0200 template: skip "successors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 29 May 2017 17:13:21 +0200] rev 2498
template: skip "successors" in test output when empty This should clarify the test output a bit.
Mon, 29 May 2017 17:10:45 +0200 template: make the template definition more manageable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 29 May 2017 17:10:45 +0200] rev 2497
template: make the template definition more manageable Readable config is readable
Mon, 29 May 2017 17:07:23 +0200 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 29 May 2017 17:07:23 +0200] rev 2496
template: skip "Precursors" in test output when empty This should clarify the test output a bit.
Mon, 29 May 2017 16:59:59 +0200 template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 29 May 2017 16:59:59 +0200] rev 2495
template: move each template on its own line during tests This will clarify the various coming changes around template.
Mon, 29 May 2017 11:03:13 +0200 refactoring: rename obsfate template to obsfate_quiet
Boris Feld <boris.feld@octobus.net> [Mon, 29 May 2017 11:03:13 +0200] rev 2494
refactoring: rename obsfate template to obsfate_quiet As I don't know how to handle templates arguments, create different templates for each verbosity level wanted.
Mon, 29 May 2017 16:39:32 +0200 doc: add documentation about effectflag experiment
Boris Feld <boris.feld@octobus.net> [Mon, 29 May 2017 16:39:32 +0200] rev 2493
doc: add documentation about effectflag experiment
Fri, 26 May 2017 18:27:59 +0200 effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net> [Fri, 26 May 2017 18:27:59 +0200] rev 2492
effectflag: split effect flag meta Split effect flag meta into 3 separate flags: - USERCHANGED - DATECHANGED - BRANCHCHANGED Also display them separately for the moment, they could be grouped back together if we want later.
Fri, 26 May 2017 21:31:07 +0200 tests: update missing amend
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 26 May 2017 21:31:07 +0200] rev 2491
tests: update missing amend (I need a hook)
Fri, 26 May 2017 19:21:36 +0200 template: update obsfate to be more human friendly
Boris Feld <boris.feld@octobus.net> [Fri, 26 May 2017 19:21:36 +0200] rev 2490
template: update obsfate to be more human friendly Approach the obslog output for the moment.
Fri, 26 May 2017 13:28:49 +0200 template: add the obsfate template
Boris Feld <boris.feld@octobus.net> [Fri, 26 May 2017 13:28:49 +0200] rev 2489
template: add the obsfate template Reuse _getobsoletefate and nextvisiblesuccessors to easily get the obsolescence fate of any node. The limitation is that obsfate is as precise as these two functions, which is not great for nextvisiblesuccessors.
Fri, 26 May 2017 13:18:26 +0200 refactor: extract obs fate algorithm from _getobsoletereason
Boris Feld <boris.feld@octobus.net> [Fri, 26 May 2017 13:18:26 +0200] rev 2488
refactor: extract obs fate algorithm from _getobsoletereason Refactor _getobsoletereason to extract the obs fate computation into a separate function, it will be used later and put it in obshistory as it will be needed in other files. Rename _getobsoletereason to _getobsoletefateandsuccessors.
Fri, 26 May 2017 10:05:37 +0200 template: add successors template
Boris Feld <boris.feld@octobus.net> [Fri, 26 May 2017 10:05:37 +0200] rev 2487
template: add successors template The successors templates display the closest visible successors of each changeset, we may have gap, like in this case: A -> B -> C -> D If we display A, C and D but not B, we can't display than B is the closest successor of A because it's not displayed. We display C as the closest successor of A instead.
Fri, 26 May 2017 10:05:27 +0200 template: add precursors template
Boris Feld <boris.feld@octobus.net> [Fri, 26 May 2017 10:05:27 +0200] rev 2486
template: add precursors template The precursors templates display the closest visible precursors of each changeset, we may have gap, like in this case: A -> B -> C If we display A and C but not B, we can't display than B is the closest precursor of C because it's not displayed. We display A as the closest precursor of C instead. Add a new test file as we will need to generate theses gaps and modifying test-evolve-obshistory.t will lead to many unrelated lines changes.
Fri, 26 May 2017 16:00:05 +0200 refactor: extract templates into a new file
Boris Feld <boris.feld@octobus.net> [Fri, 26 May 2017 16:00:05 +0200] rev 2485
refactor: extract templates into a new file Extract evolve template from evolve/__init__.py to evolve/templatekw.py as more templates will come in the future.
Tue, 23 May 2017 19:48:04 +0200 obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net> [Tue, 23 May 2017 19:48:04 +0200] rev 2484
obshistory: add the all option to obslog to show the while obs tree Add a --all option to obslog in order to display also the successors of each obs markers. It has the effect of showing a more comprehensive graph when a split or a divergence happened.
Fri, 26 May 2017 16:12:07 +0200 merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 26 May 2017 16:12:07 +0200] rev 2483
merge with stable
Fri, 26 May 2017 15:57:17 +0200 readme: update changelog for 6.2.2 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 26 May 2017 15:57:17 +0200] rev 2482
readme: update changelog for 6.2.2
Fri, 26 May 2017 15:01:21 +0200 test: fix test-evolve.t stable
Boris Feld <boris.feld@octobus.net> [Fri, 26 May 2017 15:01:21 +0200] rev 2481
test: fix test-evolve.t Metaedit take the current date when no date is given. When we added default- date, the date ended up to be the same and the behavior changed. Fix the text by disabling default-date in the metaedit call and update the comment about what is needed to fix correctly the test; take the changeset date when metaediting only one changeset.
Fri, 26 May 2017 10:25:16 +0200 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net> [Fri, 26 May 2017 10:25:16 +0200] rev 2480
test: split evolve cycle tests in a separate test file
Thu, 25 May 2017 21:14:04 +0200 evolve: fix --rev with --list stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 25 May 2017 21:14:04 +0200] rev 2479
evolve: fix --rev with --list This was untested and never worked.
Wed, 24 May 2017 18:17:01 +0200 test: improve the globing for obsmarker date stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 24 May 2017 18:17:01 +0200] rev 2478
test: improve the globing for obsmarker date If we force the date of obsmarkers, they will no longer include "20".
Tue, 23 May 2017 19:21:43 +0200 test: rename all olog references
Boris Feld <boris.feld@octobus.net> [Tue, 23 May 2017 19:21:43 +0200] rev 2477
test: rename all olog references Replace them by hg obslog which is more explicit.
Wed, 24 May 2017 18:17:01 +0200 test: improve the globing for obsmarker date
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 24 May 2017 18:17:01 +0200] rev 2476
test: improve the globing for obsmarker date If we force the date of obsmarkers, they will no longer include "20".
Wed, 24 May 2017 16:43:04 +0200 documentation: recomment using blackbox with the obshashrange experiment stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 24 May 2017 16:43:04 +0200] rev 2475
documentation: recomment using blackbox with the obshashrange experiment
Tue, 23 May 2017 10:50:56 +0200 merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 23 May 2017 10:50:56 +0200] rev 2474
merge with stable
Tue, 23 May 2017 10:49:59 +0200 packaging: update the development version number stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 23 May 2017 10:49:59 +0200] rev 2473
packaging: update the development version number This helps catch non-tagged version installed with pip.
Tue, 23 May 2017 10:48:21 +0200 Added tag 6.2.1 for changeset 0af99106b075 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 23 May 2017 10:48:21 +0200] rev 2472
Added tag 6.2.1 for changeset 0af99106b075
Tue, 23 May 2017 10:48:14 +0200 packaging: prepare release 6.2.1 stable 6.2.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 23 May 2017 10:48:14 +0200] rev 2471
packaging: prepare release 6.2.1
Mon, 22 May 2017 16:01:59 +0200 compat: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 22 May 2017 16:01:59 +0200] rev 2470
compat: merge with stable Stable has multiple changeset that solve deprecation warning for the future Mercurial 4.3.
Mon, 22 May 2017 15:45:42 +0200 test-compat: merge with mercurial-3.9 mercurial-3.8
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 22 May 2017 15:45:42 +0200] rev 2469
test-compat: merge with mercurial-3.9
(0) -1000 -300 -100 -60 +60 +100 +300 +1000 tip