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
Mon, 22 May 2017 15:42:13 +0200 test-compat: merge with mercurial-4.0 branch mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 22 May 2017 15:42:13 +0200] rev 2468
test-compat: merge with mercurial-4.0 branch
Mon, 22 May 2017 15:34:36 +0200 test-compat: merge with mercurial-4.1 mercurial-4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 22 May 2017 15:34:36 +0200] rev 2467
test-compat: merge with mercurial-4.1 Nothing to report
Mon, 22 May 2017 15:28:36 +0200 test-compat: merge with stable mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 22 May 2017 15:28:36 +0200] rev 2466
test-compat: merge with stable Nothing special to report, minor blackbox output update and color extensions was needed for test-prune.t
Mon, 22 May 2017 12:00:57 +0200 deprecation: fix dirstate.beginparentchange deprecation warning stable
Boris Feld <boris.feld@octobus.net> [Mon, 22 May 2017 12:00:57 +0200] rev 2465
deprecation: fix dirstate.beginparentchange deprecation warning Replace calls to dirstart.beginparentchange and dirstate.endparentchange to dirstate.parentchange context manager.
Mon, 22 May 2017 14:57:47 +0200 deprecation: fix cmdutil.command deprecation warning stable
Boris Feld <boris.feld@octobus.net> [Mon, 22 May 2017 14:57:47 +0200] rev 2464
deprecation: fix cmdutil.command deprecation warning
Sun, 21 May 2017 23:58:55 +0200 obshistory: be more flexible about createmarkers API
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 21 May 2017 23:58:55 +0200] rev 2463
obshistory: be more flexible about createmarkers API The API got touched in core.
Sun, 21 May 2017 23:56:33 +0200 inhibit: be more flexible on createmarkers API stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 21 May 2017 23:56:33 +0200] rev 2462
inhibit: be more flexible on createmarkers API This API got touched in core.
Sun, 21 May 2017 14:27:23 +0200 merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 21 May 2017 14:27:23 +0200] rev 2461
merge with stable
Sun, 21 May 2017 14:20:24 +0200 obshashrange: document the experiment stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 21 May 2017 14:20:24 +0200] rev 2460
obshashrange: document the experiment This should help people jump in.
Sun, 21 May 2017 13:55:09 +0200 obshashrange: add an option to disable local cache warming stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 21 May 2017 13:55:09 +0200] rev 2459
obshashrange: add an option to disable local cache warming The cache still a bit too volatile an costly to update. This offer a way for developer working copy to only compute it when used.
Sat, 20 May 2017 03:31:42 +0200 obshashrange: re-warm less revision after reset stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 20 May 2017 03:31:42 +0200] rev 2458
obshashrange: re-warm less revision after reset rewarming every single revision get very expensive quickly. Instead we warm few key revision and rely on the fact this will warm enough useful subrange.
Fri, 19 May 2017 20:52:09 +0200 effectflag: simplify meta data change testing
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 20:52:09 +0200] rev 2457
effectflag: simplify meta data change testing Let us just do one larger test. G: changed hgext3rd/evolve/obshistory.py
Fri, 19 May 2017 20:50:49 +0200 effectflag: add a small comment to suggest improvement
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 20:50:49 +0200] rev 2456
effectflag: add a small comment to suggest improvement The code run but we will likely need something easier to extend.
Fri, 19 May 2017 20:50:00 +0200 effectflag: handle invalid data
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 20:50:00 +0200] rev 2455
effectflag: handle invalid data If we get a marker with an invalid input we should not crash the whole process.
Fri, 19 May 2017 20:49:20 +0200 effetflag: move the flag back with the test of the creation logic
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 20:49:20 +0200] rev 2454
effetflag: move the flag back with the test of the creation logic Previous changeset was published by mistake.
Fri, 19 May 2017 20:21:10 +0200 obshistory: display informations from the obs marker effect flag
Boris Feld <boris.feld@octobus.net> [Fri, 19 May 2017 20:21:10 +0200] rev 2453
obshistory: display informations from the obs marker effect flag Leverage the effect flag to actually show what change for each obsmarker in the obslog command. (first basic version).
Fri, 19 May 2017 20:43:16 +0200 test: add (glob) to globed line
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 20:43:16 +0200] rev 2452
test: add (glob) to globed line Ingloriously forgot to amend.
Fri, 19 May 2017 19:45:04 +0200 effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 19:45:04 +0200] rev 2451
effectflag: add test combining multiple flag We check that multiple changes might be detected a the same time.
Fri, 19 May 2017 20:15:05 +0200 effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 20:15:05 +0200] rev 2450
effectflag: basic diff change detection We adds some basic diff detection.
Fri, 19 May 2017 19:52:57 +0200 effectflag: detect parent change
Boris Feld <boris.feld@octobus.net> [Fri, 19 May 2017 19:52:57 +0200] rev 2449
effectflag: detect parent change Add the detection of parent changes.
Fri, 19 May 2017 19:48:44 +0200 effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net> [Fri, 19 May 2017 19:48:44 +0200] rev 2448
effectflag: detect meta changes Add the detection of known meta field changes. The known meta fields that we check are: - user - date - branch
Fri, 19 May 2017 19:43:06 +0200 effect-flag: rework existing test to prepare for mor tests
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 19:43:06 +0200] rev 2447
effect-flag: rework existing test to prepare for mor tests
Fri, 19 May 2017 18:43:21 +0200 effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net> [Fri, 19 May 2017 18:43:21 +0200] rev 2446
effectflag: allow to save effect of change in obsmarkers Obsmarkers lack a precious information, what are the changes between the source and the destination. This could be several thing: - The description has changed, with a amend -e for example - The parent has changed, with a rebase for example - The content has changed, with a amend for example - The meta, like the user, has change, with a amend -u for example Or any combination of them. We hijack the createobsmarkers in order to compute the modification and store the effect flag which is basically a bitfield of the changes list above and we store it in the metadata for the moment. The advantage of computing the flag just before creating the obs marker is that all commands will immediately be compatible and we can start working on the UI display of the flag. As a future optimization, the commands will be able to pass the flag directly or data to help computing them, for example amend knows if the description has changed or rebase now if the parent has changed, virtually removing the overhead. To start simple, this patch add the detection and storage of the effect flag when the description has changed. And hide it behind an experimental flag disabled by default 'experimental.evolution.effect-flags'. More flag will follow.
Fri, 19 May 2017 18:07:56 +0200 merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 18:07:56 +0200] rev 2445
merge back with stable
Fri, 19 May 2017 17:48:44 +0200 readme: fix version number
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 17:48:44 +0200] rev 2444
readme: fix version number
Fri, 19 May 2017 17:34:45 +0200 next: prevent a color related crash when evolve stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 17:34:45 +0200] rev 2443
next: prevent a color related crash when evolve This was not caught by test because they run color less.
Fri, 19 May 2017 17:33:27 +0200 prune: prevent a color related crash when the working copy is moved stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 17:33:27 +0200] rev 2442
prune: prevent a color related crash when the working copy is moved This was not caught by test because they run color less.
Thu, 18 May 2017 22:40:17 -0700 evolve: adding longer aliases for olog
Rodrigo Damazio Bovendorp <rdamazio@google.com> [Thu, 18 May 2017 22:40:17 -0700] rev 2441
evolve: adding longer aliases for olog Novice users will likely find the longer versions more obvious to understand what they're doing (olog only makes sense once you already know what it does). Especially on the help page, "obslog" will be easier to find and make sense of.
Fri, 19 May 2017 11:16:22 +0200 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 11:16:22 +0200] rev 2440
debugobsstorestat: add markers size information We adds some extra information about markers size in all known format.
Fri, 19 May 2017 00:15:30 +0200 packaging: bump version to 6.3.0.dev
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 00:15:30 +0200] rev 2439
packaging: bump version to 6.3.0.dev
Fri, 19 May 2017 00:10:12 +0200 merge back with stable (post-release)
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 May 2017 00:10:12 +0200] rev 2438
merge back with stable (post-release)
(0) -1000 -300 -100 -60 +60 +100 +300 +1000 tip