debian: fix 6.5.0-1 changelog entry

packaging: update version to .dev This avoid misleading version number when investigating.

branching: merge back with stable

packaging: mark the stable branch as bugfix version in development

Added tag 6.6.0 for changeset cc3e09e033a3

test-compat: merge with mercurial-3.9

test-compat: merge with mercurial-4.0

test-compat: merge with mercurial-4.1

test-compat: merge with mercurial-4.2

test-compat: merge with stable

packaging: prepare version 6.6.0

readme: mention the documentation update

topic: make command names valid as expected, even if ui.strict=true Before this patch, "hg topics" and "hg stack" cause unintentional "unknown command" failure, if ui.strict=true. In such case, "topics [TOPIC]" and "stack [TOPIC]" are required as a canonical name, because synopsis-like string is used as command name pattern of @command annotation for them. This patch also specifies additional "synopsis" for @command annotation, for intentional output in online help of these commands.

readme: mention the work on API deprecated in 4.3

next: use the utility to retrieve the current topic

test-compat: merge with mercurial-3.9

test-compat: merge with mercurial-4.0

test-compat: merge with mercurial-4.1

test-compat: merge with mercurial-4.2

test-compat: merge mercurial-4.2 with the new stable branch content

branching: default into stable It is time for a new release

compat: handle pre-4.2 compatibility for accessing vfs The vfs module is quite new.

compat: avoid using configoveride This not supported before mercurial 4.1.

compat: use old style method to update bookmark The '_del' and '_set' method are new additions in 4.3 we should not use them in the compatibility layers.

topic: wrap 'update' in a more flexible way This ensure compatibility with mercurial 4.1 and below

branching: open the mercurial 4.2 compatibility branch The freeze as started.

readme: add an entry about the unified message

touch: use precheck to validate revision This gives us standard check and standard error message.

prune: use precheck to validate revision This gives us standard check and standard error message.

uncommit: use precheck to validate revision This gives us standard check and standard error message.

amend: use precheck to validate revision This gives us standard check and standard error message.

split: use precheck to validate revision This gives us standard check and standard error message.

precheck: handle rewrite attempt of nullrev This is a common breaking case, so we handle and test it in the generic code.

precheck: update the orphan message to something me generic This will help to reuse it for other commands.

precheck: point to the instability doc when aborting This will help user to understand what is going on.

evolve: document the various instability/troubles We need something to point people at.

precheck: also check for unstability creation

prefetc: point at the offending changeset when aborting We do our best to display comptact but usable information.

precheck: point to 'phase' help when aborting some of the error message already does that. It seems a good idea.

precheck: use 'changesets' in the message instead of 'revisions' This match the message `hg commit --amend` issue in core.

rewriteutil: add a precheck function to validate rewrite beforehand For now this only checks for changeset mutability and this is only used by 'checkfold'. We'll expand the checking and usage as we go.

test: remove reference to the graphlog extension The feature is in core for ages.

test: use common setup for test-split.t This make things cleaner.

split: compute revision to split after locking This would avoid strange behavior from race condition.

split: basic code cleanup We remove a useless extra variable since another one already hold the same value.

commands: rewrite the 'evocommands' module to 'cmdrewrite' The remaining commands should get their own module, so we rename the module for clarity. We update the module comments to better fits its purpose.

split: add support for the -D and -U option

split: fix the --user option The option ended up being ignored.

metaedit: add support for the -D and -U options

fold: add support for the -D and -U options

test: extract most fold testing into a test-fold module

commands: move 'prune' to the 'evocommands' module

rewriteutil: move 'deletebookmark' to the module

rewriteutil: move 'reachablefrombookmark' to the module

commands: move the touch to the 'evocommands' module

commands: move split to the 'evocommands' module

commands: move fold to the 'evocommands' module

commands: move metaedit to the 'evocommands' module

rewriteutil: move the 'rewrite' function

rewriteutil: move 'foldcheck' to the new module

rewriteutil: move disallowednewunstable in the new module

rewriteutil: create a rewriteutil module to host utility function The ultimate goal of this module is to gather basic building block for rewriting changesets. This is aimed at moving into core and being use by the core extension.

interactive: fix the interractive option import The move made in e6bc6eaa17c5 was buggy.

test: update test output to match b11e8c67fb0f hg debugobsolete now issues a message about the obsoleted changesets.

test: update test output from b47fef6d2365 We run this check for bundle1 too now.

compat: add a compatibility layer for bookmark move The API was updated in 4.3 (712a85b3677f) we adapt to that.

compat: use 'safehasattr' over 'hasattr' 'hasattr' is broken in python 2.

stack: show short node of changesets in `hg stack -v` After this patch, hg stack -v shows short nodes for changesets which have topic index, i.e. excluding the bases except t0.

compat: use 'repo.cachevfs' when available In 4133c0b0fcd7 (core), the repository gained a new vfs dedicated to caches. We update the code to follow this new pattern.

debugobsconvert: take the lock when writing the obsstore file We were upgrading the store unprotected.

topics: add a test demonstarting sorting of topics by time using --age

branching: merge with stable

prev: allow to update to 't0' from 't1' When on the first changeset of a topic, one can move back one changeset to end up on t0. The new working copy parent to not belong to the topic, but the topic is still active. The next commit will create a new root to the active topic. You can get the same result using `hg up t0`

topic: add a 'topicidx()' to context This will be useful for the `t0` logic in `hg prev`

prev: retrieve the 'no-topic' result is a clear and reusable option We'll use it more, so let us make it pretty first.

prev: add '_getcurrenttopic' helper and use it We'll add more spot where this information is used.

prev: explicitly use 'p1' as a variable name This make the code clearer.

topic: rename the internal topic option we'll use it more widely so I give it a more generic name. It is an internal option so not wories regarding compatibility.

prev: extract the code computing the destination This make the handling of the result simpler. The test agree as one return code is fixed.

prev: issue a proper error when reaching repository root (and adds the associated test)

prev: stop creating a repository at the root of 'test-repo.t' We run the test in a subdirectory now, this usually avoid various kind of future issue.

prev: extract the function performing the update That code is fairly independant so let us isolate it to simplify the rest of the code.

prev: simplify the bookmark preserving logic We can use 'None' as a special value and have a simpler code.

prev: rename 'p' to 'target' This makes the code clearer.

topics: check for topic on commit before a user enters message We have a enforce-topic cofig which can forbid user to commit without a topic on it. We used to check topic on a commit after the user enters message, but we should fail early.

packaging: update readme I forgot again.

topics: add a new flag --age which will show last touched time for topics This adds a new flag `--age` to `hg topic` command which will show topics sorted by their last touched time and will also show the last touched time for them. This patch also adds a simple test to make sure the flag does not breaks by future changes. Adding more tests showing output like "3 hours ago", "2 minutes ago" etc will change as the code takes time.time() into account which will increase with time, and hence the output will change, so we need some static output like a date.

uncommit: expose the feature with a '--extract' to amend The name of the "uncommit" feature have been an ongoing issue, but no better name have been found in the past year. We try another approach by exposing the 'uncommit' feature directly in `hg amend`. The command will not be able to do both operation a the same time (add new change to the commit + extract should change, but this is already the case with the two command today.

uncommit: add support for -U and -D

uncommit: add support for --user and --date This is also long overdue

uncommit: add support for --message and --logfile This is long overdue.

amend: drop the implementation details from the user help This is not relevant to users.

uncommit: move to the 'evocommands' module We are about to play around with a UI mixing amend and uncommit, we take advantage of this to split the __init__.py module a bit more.

amend: extract into a 'evolve.evocommands' module We are about to play around with a UI mixing amend and uncommit, we take advantage of this to split the __init__.py module a bit more.

test: handle output change in 20f533a92eda The bundle backup name has changed.

tutorial: fix grammar and spelling

tutorial: word wrap long lines

tutorial: use rm instead of 'hg rm' for an untracked temporary file

readme: update with various topic improvement

topics: add a config knob to forbid untopiced commit After this patch one can add the following to their hgrc to stop allowing new commits with no topic on it. [experimental] enforce-topic = yes

topics: update the help for `hg topics` describing ways to use the command

branching: merge with stable

obshashrange: add cache warming instruction to the documentation

evolve: explain how to disable markers discovery in the documentation This is useful for large repository.

obshashrange: add cache warming instruction to the documentation

topics: add t0 and b0 to the stack t0 or b0 will be the base of the stack and it's the parent of t1 or b1. The cool thing about this is that if you update to t0 using `hg up t0` or do `hg prev` on t1, you will be updated to t0 with the current topic preserved. This patch adds t0 to stack and implement the preserving topic case for t0 while using `hg update`.

topics: wrap the update function to check if either t0 or b0 is passed as rev t0 or b0, seriously, what's that. Do they even exist? Hold on and look for the next commits what we are trying to do.

compat: adapt to change in 53b3a1968aa6-core

merge back with stable (version updated in the process)

packaging: update versions to '.dev' one This help to spot install from unreleased source.

Added tag 6.5.0 for changeset 734c0bc066cd

packaging: prepare version 6.5.0

topic: update extensions metadata Let us assign a version number to this release and add some more data about the extensions.

readme: prepare version 6.5.0

compat: merge with mercurial-3.9

compat: merge with mercurial-4.0

compat: merge with mercurial-4.1

compat: merge with stable Nothing to report beside the drop of the obsfate related tests.

evolve: preserve the branch of the original changeset when evolving merge

merge: default into stable to prepare next version Let us prepare ourself for 6.5.0

obslog: handle patch generation for mercurial 4.1- The unidiff API changed, we detect and work around that.

topic: also have the revbranchcache during the discovery

topic: cleanup the repository wrapping logic in topic discovery We are know overriding the class so we do not need to update and restore the pushop itself.

topic: adapt to function migrate to obsutil Mercurial 4.3 has a new module "obsutil" and multiple functions moved there. We handle the move for the one we care about.

evolve: adapt to function migrate to obsutil Mercurial 4.3 has a new module "obsutil" and multiple functions moved there. We handle the move for the one we care about.

topic: directly use the '_notpublic' revset This is just more robust to achieve the same goal.

topic: drop the message about running evolve after topic change Topic change is no longer creating a mess that needs cleaning.

template: handle lack of "users" in the obsfate data This can happens when their are no markers (or the markers has no user data?)

doc: update effect flag documentation

obsfate: override the default log output Override the default log output by showing obsfate if not empty.

evolve: fix documentation formatting The config example were formatted as standard paragraph.

compat: fix topicset for mercurial 4.1 The 'getrevset' method is not available there.

obsfate: refactor obsfate data computing Refactor how obsfate data are computed in order to reuse this logic later when hooking on default log output.

topic: exclude public and topic changeset from branch stack Stack use-case is to show the current work in progress, which are symbolized by the phase draft and secret phase. Moreover showing public changesets in stack output when displaying current branch would display a lot of changesets for long-lived branches and would be quite useless. We also exclude topic changeset form the stack since they already exist on their own stack. getstack revsets didn't needed update when displaying a topic as when a changeset become public, its topic is no longer relevant.

tests: use a more portable form for new lines

topic: don't abort if there is no current topic in stack() revset Named branches support has been added and we should not abort if there is no active topic.

topics: return a parse error if stack() revset is passed with argument

tests: add test to show topics working with shelve

topics: update current topic to the topic of newly rebased commit (issue5551) The rebase code passes branchmerge equals to True while updating to the rebased commit. We need to make sure topic is preserved even after rebase and hence we need to update the topic even when branchmerge argument is set to True. But there is a twist in the tale, merge also uses this part of code and we allow to update topic when brancmerge is True, in merge cases the topic after merge will the topic of the destination commit, not the topic of working directory parent. So we need the function to have information about whether a rebase is going on, and we do it by wrapping the rebase command and storing some value in the config. This is a bit hacky but works for now. This patch fixes issue related to loosing of topic while rebase. Thanks to Boris Feld for the rigourous tests.

docs: some fixes to the help text

topics: pass 'topics' to ui.formatter instead of 'bookmarks'

topic: also insert the extra head check with using the new head checking This will get the protection in place in all cases.

topic: some document for an obscure function

topic: adjust head checking wrapping to not interfere with concurrent push In the previous form, the new topic head was detected as affected and the push was rejected. We introduce a of 'test-topic-push.t' using the new race checker as there have been many compatibility issue with this new checkers.

topic: also detect head checking using the concurrent part

test: avoid 'test-check-commit.t' complaining copied code We switch to git diff.

topic: small test cleanuo The section was repeated.

topic: move the heads data to the branch line when appropriates The topic line is dropped as it is quite confusing.

topic: add some initial support for using stack on named branch Stack is a useful command that can make sense in other context. The current support is hacky and awful, but we have something!

topic: explicitly pass topic as a keyword argument This clarify all callers before adding more logic related to bare branch in stack.

topic: makes split keep the topic Refactor split to extract the preparation of the working directory in a separate function. This helps topic wrap this function to save topic before update and restore it after preparing the working directory just before the split.

topic: add tests for fold behavior with topics Clarify the fold behavior for keeping topics.

topics: pass quietempty=True to suppress useless output while changing topics This will help in suppressing the output "0 files updated, 0 file removed, ..."

topics: return early so that other if conditions don't get execute (issue5600) We were not returning after the _changetopics() call and hence the if's below it were also executed which resulted in changing of current topic. This prevent current topic to be updated even when we only affect changeset unrelated to the working copy. Not that the rebase output change as it expose a new bug (rebased changeset gain a topic)

test: extra output to understand the next changeset better

topics: move the logic to change or clear current topic into a new function It adds a new _changecurrenttopic which changes or clears the current topic.

tests: expand output to check topic activation This will help understanding later changesets.

branching: merge stable into default

split: preserve author of the original changeset in the successors Previously, the new changesets were authored by the default user.

grab: properly quote hg executable in the alias Breakage has been reported on Windows.

topic: improve the revset used to return name->nodes mapping The 'topic' version already filters public changeset out, and skipping 'changectx' creation will helps performance.

topic: update the changectx method to respect phases The topic is no longer returned once the changeset is no longer mutable (unless explicitly requested).

topic: avoid crash when topic is loaded but not enabled for a repository

compat: update test to match core default state This output changed in 560ceb654180.

topicmap: massive rework Massively rework the way we build and use topicmap. This bring massive performance benefit. Topic map use to be a fully independant thing that we would switch on and off globaly. The caching on disk was broken so the performance were atrocious. Intead, now the topic are inherited from the 'immutable' map. We gave up on storing them on disk for now since the mutable set is usually small enough. The activation is done by hacking new "filter" on the repository and detection when they are one. This is hacky but core is hard to wrap here. Overall this whole wrapping is really scary and we should massage core API to help it.

topic: use the 'topic' revset in namespace This revset performance just got improved.

topic-revset: update the revset to no longer build changectx Atribute access is expensive, and changectx are very expensive to build, so we skip these for better performance. Before: ! wall 0.012195 comb 0.020000 user 0.020000 sys 0.000000 (best of 217) After: ! wall 0.008816 comb 0.010000 user 0.010000 sys 0.000000 (best of 303) (Before this changeset parent) ! wall 0.213261 comb 0.210000 user 0.210000 sys 0.000000 (best of 45)

topic-revset: changectx creation in the revset The current mutability filter is very expensive, we use a more direct and efficent way to do so: Before: ! wall 0.213261 comb 0.210000 user 0.210000 sys 0.000000 (best of 45) After: ! wall 0.012195 comb 0.020000 user 0.020000 sys 0.000000 (best of 217)

topics: add some noise to rewrittent changeset to prevent hash cycle If we have a changeset with topic `x`, we change it's topic to `y`, fine. When we change it's topic back again to `x`, we get the hash of the the obsoleted changeset which had the topic `x` initially. The same happens for few more cases like clearing the topic of a changeset which initially had no topic. This approach is influenced from cmdutil.amend and other commands (rebase, histedit, etc…)

topic-change: update the working copy along when changing topic of '.' This avoids leaving the working copy behind, removing another large parts of issue5441.

topic-change: cleanup the locking and transaction mechanism The previous code did not garanted we would release all lock (and was a bit more complicated than needed.

topics: use a dict for successors of changesets produced by topic change This patch adds a dictionary to store the successors of changesets which got obsoleted when we change it's topic. This is an improvement in the fix for issue5441.

topic: further simplify the clear logic We just set 'topic' to None and the rest should follow.

topics: drop the clean argument from _changetopics() After this commit, None will represent that we want to clean the topic.

topics: rename '--change' flag to '--rev' flag The --change flag was used to read a revset of which topic should be changed. In mercurial we use --rev for this type of flag. Now things will work as follows: `hg topics topicname`: It will set the current topic `hg topics topicname --rev revset`: Change topic of all the revs in the revset to topicname Further patches will try to achieve the following: `hg topics --clear --rev revset`: clear topic from all the revisions in the revset `hg topics --clear`: clear the current topic (Current behavior) `hg topics --rev revset`: show topics on the revisions in the revset

topics: factor out the logic to change topic in a new function It will help to refactor and fix bugs. Moreover we can re-use the logic.

obslog: update the readme This is release not worthy

obslog: add a comment about the final new line of descriptions

obslog: also display description patch with --patch When activating the --patch option, also display the description patch.

obslog: extra patch indentation code The code is simple and we need to reuse it.

obslog: add a patch option Add support for '--patch' option in obslog for a similar effect than "hg log --patch". The patch support is only limited to a few basic cases that will be extended in the future.

obslog: clarify some sorting code I'm not sure why Boris did it, but this belong to the next patch.

obslog: pass directly unfiltered_repo _debugobshistorydisplaynode used to create two times an unfiltered repo, makes _debugobshistoryrevs create only one unfiltered repo and pass it directly.

obslog: remove useless repo arg _debugobshistorydisplaymarker used to takes repo as an argument but it isn't needed anymore.

obslog: small renaming of _debugobshistorysingle Rename _debugobshistorysingle to _debugobshistoryrevs in order to better reflect its purpose.

refactoring: directly use 'ctx.unstable()' in showstack function This is simpler and more efficient.

packaging: flag default as version 6.5.0.dev This helps to reduce confusion when installing intermediate version.

merge: get stable change back into default

obsfate: improve obsfate output Improve obsfate output: * Remove newline and replace it by '; ' * Improve the hybrid object for making join(obsfate, '|') working.

packagin: mark stable branch as 6.4.1.dev This help prevent confusion with installing intermediate version

topics: abort if user wants to show the stack of a non-existent topic

stack: show unstable state for the current revision if it is one (issue5553) Before this patch if the current revision is unstable, hg stack does not show the unstable state. This patch fixes that by showing both current and unstable state for the current revision if that's unstable.

topics: some minute fixes to the documentation which shows up in help I am not a native but these changes are simple and obvious.

topics: make sure we commit on new parents while changing topics (issue5441) While changing topics of a set of linear commits, we used to commit our new changesets with new topic on parents of its predecessor i.e. changeset before the topic change. If the topic of parent was also changed, that parent will become obsolete and hence resulting the cnew commit in unstable state. For a set of linear commits this repeats and we end up in a tree state as mentioned in the bug. This patch fixes the bug by checking whether the parent was obsoleted and if yes, commit on the new parent.

tests: add a test to show issue5441 in test-topic.t The issue will be fixed in the next patch and the test will be helpful to show that.

merge back with stable (test change from stable has been reverted)

Added tag 6.4.0 for changeset e60248f26f92

packaging: prepare version 6.4.0

readme: fix readme for future 6.4.0

test-compat: merge with mercurial-3.9

test-compat: merge with mercurial-4.0

test-compat: merge with mercurial-4.1

compat-test: merge with stable

test-compat: fix previous merge The merge was a bit too heavy handed in dropping some part of the test.

merge with default Integrate new development around obsfate.

obsfate: by default only display the username if differ from the current one This will will keep the output simple in the simple case.

obsfate: display more data about direct prune markers This does not handle all cases, but this should handle the most common ones.

obsfate: split markers fetch from successor set annotation This will help to improve support for pruned changesets.

obsfate: mark successorsetallmarkers public We are about to use it in another module.

obsfate: mark 'preparesuccessorset' as public It is used in another module so it is not really private.

obsfate: use 'split' as verb when appropriate

obsfate: improve prune support in _successorsetverb In the prune case, still have markers (at least the prune markers). If we want to be able to return these markers we need the underlying function to support it.

obsfate: rename 'successorsset' to 'sset' in the loop The old name make it too close to 'successorssets', and the shorter name is not ambiguous in the context anyway.

template: use hex node in the obsmarkers used in the obsfate template This was pointed by Yuya and yuya is right.

template: use hex successors in obsfate This was spotted by Yuya.

template: use hex-node in successors AS pointed by yuya on the list, the raw data for the template should be hex and not binary.

template: update successors doc I'm not very happy about it, but at lease there is a show description now

template: fix precursors documentation

template: used hex-node for the precursors underlying data As pointed by yuya on mercurial-dev we should not use binary node here.

compat-test: merge with mercurial-3.9

test-compat: merge with mercurial-4.0 branch Minor merge conflict.

compat-test: merge with mercurial-4.1

compat-test: merge with stable * Blackbox format seems to have change when displaying config CLI options. * As obsfate template is now only compatible with hg 4.2+, remove all references to it in test files.

merge with stable

changelog: announce that obsfate is hg > 4.2 now Update changelog to announce the fact that obsfate has been improved and is now only compatible with mercurial version greater than 4.2.

compat: make obshistory._getdifflines compatible with mercurial 4.1 On Mercurial version 4.1 and lower, patch.diff seems to returns an empty list when there is no change. Mercurial 4.2 returns None so we add a if for this case.

obsfate: add a new obsfate template The obsfate template display for each obsolete changeset a line summarizing what changed between the changeset and its successors. This dict is computed in obshistory._preparesuccessorset. It uses obshistory.FORMATSSETSFUNCTIONS which is a list of function that individually compute a part of each dict. You can override fields or add new ones by adding your own function in this list. The format of obsfate is computed in templatekw.obsfatedefaulttempl and can be wrapped if necessary, the code is not quite extendable for the moment but can be refactored later.

obsfate: prepare fatelog tests Prepare obsfate venue by adding new blank output, it will helps clarify which are the new output due to obsfate or not.

obsfate: build more advanced markers for tests Prepare obsfate venue by building more advanced markers by varying obs markers users and dates.

readme: fix entry for 6.4.0 some data were missing and some were in the wrong spot

test: drop now useless config about effect flag The experiment is on by default now.

effectflag: activate effect flag by default Remove forcing effect-flag in test files

effectflag: activate effect flag on test-evolve-obshistory test file Prepare activation of effect flag by default by activating it on test-evolve- obshistory.t test file first.

effectflag: activate effect flag on test-wireproto.t test file Prepare activation of effect flag by default by activating it on test- wireproto.t test file first.

effectflag: activate effect flag on test-uncommit.t test file Prepare activation of effect flag by default by activating it on test- uncommit.t test file first.

effectflag: activate effect flag on test-stabilize-order.t test file Prepare activation of effect flag by default by activating it on test- stabilize-order.t test file first.

effectflag: activate effect flag on test-obsconvert.t test file Prepare activation of effect flag by default by activating it on test- obsconvert.t test file first.

effectflag: activate effect flag for obsmarkers-case-*.t test files Prepare activation of effect flag by default by activating it on test- exchange-obsmarkers-case-*.t test file first.

effectflag: activate effect flag on test-drop.t test file Prepare activation of effect flag by default by activating it on test-drop.t test file first.

effectflag: activate effect flag on test-amend.t test file Prepare activation of effect flag by default by activating it on test- amend.t test file first.

effectflag: activate effect flag on test-stabilize-result.t test file Prepare activation of effect flag by default by activating it on test- stabilize-result.t test file first.

effectflag: activate effect flag on test-split.t test file Prepare activation of effect flag by default by activating it on test-split.t test file first.

effectflag: activate effect flag on test-evolve-cycles.t test file Prepare activation of effect flag by default by activating it on test-evolve- cycles.t test file first.

effectflag: activate effect flag on test-evolve-obshistory-complex.t test file Prepare activation of effect flag by default by activating it on test-evolve- obshistory-complex.t test file first.

effectflag: activate effect flag on test-prune.t test file Prepare activation of effect flag by default by activating it on test-prune.t test file first.

effectflag: activate effect flag on test-evolve.t test file Prepare activation of effect flag by default by activating it on test-evolve.t test file first.

effectflag: activate effect flag on test-obsolete test file Prepare activation of effect flag by default by activating it on test- obsolete.t test file first.

obscache: directly allocate zeroed bytearray This is much faster that incrementally appending to it. On mozilla central without obsolescence markers this move full cache building from 0.3s to nothing visible.

obscache: plug on core 'update cache' method if available I was planning to have this implemented in core but since things are not getting in I'm updating evolve.

obscache: pre-indent code This will make the next changeset clearer.

fix: fix _headssummary call to orig 65cf338258d2 one of two orig call wasn't compatible with mercurial version < 4.3, fix it.

test-update: update hg update output in test files Following hg revision 1b5c61d38a52, hg update now show the commit to which we updated in case of multiple heads. test-obsolete.t and test-sharing.t falls in these situations, acknowledge the new outputted line.

test-drop: all obsmarkers are now dropped Previously, hg drop may leave some obsmarkers behind, like with temporary amend commit. Following mercurial revision 71eb6a098315, strip now correctly remove the associated obsmarkers and as drop is also calling strip, the bug is now resolved.

test-evolve: garbage collection changeset only, not obsmarkers

test-inhibit: adapt to 4.3 version 4.3 introduce markers stripping with strip. We adapt the test output to the (harmless) consequence.

test-exchange-case-D3: avoid stripping obsolescence marker The test needs to have changeset unknown locally with obsolescence markers still applying to them. So we make sure the markers are not stripped (future 4.3 strip markers by default).

test-exchange-case-D2: avoid stripping obsolescence marker The test needs to have changeset unknown locally with obsolescence markers still applying to them. So we make sure the markers are not stripped (future 4.3 strip markers by default).

test-exchange-case-D1: avoid stripping obsolescence marker The test needs to have changeset unknown locally with obsolescence markers still applying to them. So we make sure the markers are not stripped (future 4.3 strip markers by default).

test: fix test-discovery-obshashrange.t new output Update test-discovery-obshashrange.t test file with new mercurial dev output.

fix: fix _headssummary api _headssummary now takes directly the pushop, update the topic extension wrapping to fix the API.

url: update url to point to https://www.mercurial-scm.org/repo/evolve

doc: document the evolve templates

test: fix template condition for obsfate

obscache: add a missing "new line" at the end of a debug message

default: merge back with stable

obscache: shortcut the attribute access for testing The attribute access adds a significant overhead. we can gain -20% performance by doing so.

obshashrange: add an option to protect from accidental activation The new 'obshashrange.max-revs' option is meant to help large installation like bitbucket to avoid impact on repositories that cannot handle it.

obshashrange: basic proof reading of the documentation Nothing major but this should be a bit better.

proofread

effectflag: fix content change detection for filtered revs In some cases (like amended an obsolete changeset), computing the diff and comparing them need to work with filtered revisions. We need to use unfiltered change contexts to safely compute diffs.

debugobsstorestat: adds static about actually obsolete changeses

evolve: fix typo: -list -> --list

Added tag 6.3.1 for changeset e358c0263e46

prepare release 6.3.1

merge with stable

packaging: bump to 6.4.0.dev

serveronly: also backport the fixes from 5adb8bdb935e The fixes to the computation of "relevant" markers. Was missing for server only.

merge stable back into default

readme: merge 6.2.2 and 6.3.0 changelog 6.2.2 never happened.

packaging: mark as version 6.3.1.dev This reduce confusion when installing version from source.

readme: clarify the branch policy

Added tag 6.3.0 for changeset 6da4ca7b3e4f

packaging: prepare release 6.3.0

test-compat: merge with mercurial-3.9

test-compat: merge with mercurial-4.0 branch The new 'olog' command is not working with 3.9 so we skill all mentions of it in the tests. This also apply to the topic extensions.

test-compat: merge with mercurial-4.1 hg log has no trouble field in mercurial 4.0, output fixed.

test-compat: merge with stable Nothing special to report, minor test-metaedit.t output change.

merge with default

compat: fix stablerange for mercurial 3.9 Lrudict.get change of api between mercurial 3.9 and mercurial 4.2. Bypass this limitation by using lrudict.__getitem__ and catch the KeyError directly.

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.

lint: remove double newline in test file Test file test-stablesort-criss-cross.t contained two double newline, I remove them.

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.

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.

evolve: fix import order

compat: adapt to buildobsmarkerspart move The function has been moved in e70d6dbde713 so we must we search in both location.

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.

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.

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.

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.

test: fix test-evolve-effectflags dates Mercurial < 4.3 don't have default date so add globs in the test-metaedit.t file.

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.

test: split test-stablesort.t in two This is the longest running test so we split it in two to help with parallel execution.

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.

obsdiscovery: extract push-obshashtree discovery in a function This will help use to simplify the code.

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.

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'.

obsdiscovery: merge two distinct if statement It did not made any sense for them to be split.

obsdiscovery: extract '_canobshashtree' having this as a simple function will help use to generalise the obsdiscovery algorithm we use.

obsdiscovery: move code inserting discovery at the end of the file This makes it easier to reuser function defined earlier in the file.

obsdiscovery: trust core to do the right thing if no discovery is available This is fixed for a long time now.

obsdiscovery: factor the "do we push markers" check out This clarify the code a bit.

stablerange: also respect the 'warm-cache' config This will help large install to enable obshashrange as "opt-in" without impacting other repositories.

debugstablerange: cleanly "Abort" when no revision are specified Previously we had a traceback from a max on an empty sequence.

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.

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.

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.

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.

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.

template: skip "fate" in test output when empty This should clarify the test output a bit.

template: skip "successors" in test output when empty This should clarify the test output a bit.

template: make the template definition more manageable Readable config is readable

template: skip "Precursors" in test output when empty This should clarify the test output a bit.

template: move each template on its own line during tests This will clarify the various coming changes around template.

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.

doc: add documentation about effectflag experiment

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.

tests: update missing amend (I need a hook)

template: update obsfate to be more human friendly Approach the obslog output for the moment.

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.

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.

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.

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.

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.

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.

merge with stable

readme: update changelog for 6.2.2

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.

test: split evolve cycle tests in a separate test file

evolve: fix --rev with --list This was untested and never worked.

test: improve the globing for obsmarker date If we force the date of obsmarkers, they will no longer include "20".

test: rename all olog references Replace them by hg obslog which is more explicit.

test: improve the globing for obsmarker date If we force the date of obsmarkers, they will no longer include "20".

documentation: recomment using blackbox with the obshashrange experiment

merge with stable

packaging: update the development version number This helps catch non-tagged version installed with pip.

Added tag 6.2.1 for changeset 0af99106b075

packaging: prepare release 6.2.1

compat: merge with stable Stable has multiple changeset that solve deprecation warning for the future Mercurial 4.3.

test-compat: merge with mercurial-3.9

test-compat: merge with mercurial-4.0 branch

test-compat: merge with mercurial-4.1 Nothing to report

test-compat: merge with stable Nothing special to report, minor blackbox output update and color extensions was needed for test-prune.t

deprecation: fix dirstate.beginparentchange deprecation warning Replace calls to dirstart.beginparentchange and dirstate.endparentchange to dirstate.parentchange context manager.

deprecation: fix cmdutil.command deprecation warning

obshistory: be more flexible about createmarkers API The API got touched in core.

inhibit: be more flexible on createmarkers API This API got touched in core.

merge with stable

obshashrange: document the experiment This should help people jump in.

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.

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.

effectflag: simplify meta data change testing Let us just do one larger test. G: changed hgext3rd/evolve/obshistory.py

effectflag: add a small comment to suggest improvement The code run but we will likely need something easier to extend.

effectflag: handle invalid data If we get a marker with an invalid input we should not crash the whole process.

effetflag: move the flag back with the test of the creation logic Previous changeset was published by mistake.

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).

test: add (glob) to globed line Ingloriously forgot to amend.

effectflag: add test combining multiple flag We check that multiple changes might be detected a the same time.

effectflag: basic diff change detection We adds some basic diff detection.

effectflag: detect parent change Add the detection of parent changes.

effectflag: detect meta changes Add the detection of known meta field changes. The known meta fields that we check are: - user - date - branch

effect-flag: rework existing test to prepare for mor tests

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.

merge back with stable

readme: fix version number

next: prevent a color related crash when evolve This was not caught by test because they run color less.

prune: prevent a color related crash when the working copy is moved This was not caught by test because they run color less.

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.

debugobsstorestat: add markers size information We adds some extra information about markers size in all known format.

packaging: bump version to 6.3.0.dev

merge back with stable (post-release)

packaging: bump version to 6.2.1.dev

Added tag 6.2.0 for changeset d4ee0274a8ef

merge back with stable

merge with future 6.2.0 No extra change were needed compared to 3.9.

merge with future 6.2.0 The new 'olog' command is not working with 3.9 so we skill all mentions of it in the tests. This also apply to the topic extensions.

merge with future 6.2.0 Minor unrelated output adjustements were needed.

merge with future 6.2.0 There are been (multiple) minor output changes.

packaging: prepare release 6.2

debian: fix email

topic: update 'tested with' and readme We are compatible with Mercurial 4.0 and above

readme: rearrange readme before release There won't be a bugfix release (and other cleanup)

test: reduce output size to fight unstability Until `hg touch` can be more stable, we have to do this :-/

tests: disable blackbox for 'getid' This will significantly simplify the blackbox log.

compat: handle lack of 'util.timer' for pre 4.2 version We keep compatibility with previous Mercurial version by redefining the timer when needed.

test: enforce color to be enabled 4.2 enable color by default and start to get used in test. So we add this to the test for previous version.

merge with default

tests: add a test about strip with obshashrange enable I've seen some traceback but I cannot reproduce them. This tests seems useful anyway.

obshistory: add a json test with cycles

tests: glob an absolute path The ssh command path was in full and pointing the mercurial checkout of the last one who touched the test.

olog: document the default value We actually display the log for '.' which is useful.

readme: rearrange changelog content blackbox is more important than the various caches changes.

obshistory: rename the command to "olog" The command start to look good enough to be handed out to user. We replace the old and useless "olog" alias in favor of the new command.

obshistory: move the command into the obshistory module The root module is far too large already.

obshistory: add docstring to cmddebugobshistory Add debugobshistory command documentation based on the log command documentation.

obshashrangecache: make sure we re-warm the cache after a reset This will "mitigate" the effect of dropping existing entries when new markers affect existing range.

obshashrangecache: precisely track affected revs when adding new markers This will be useful when we start doing finer grained invalidation (instead of dropping all data).

debugobshistory: handle multiple cycles We previously handled up to one cycle only. This is now fixed.

test: clean the debugobshistory cycle test Use 'desc(...)' instead of revision numbers. Also blank lines between commands in the same test

obsdiscovery: add more debug output we add a summary debug output to help gathering data.

discovery: log information about obshashrange We augment the blackbox output to help with data gathering.

obshistory: add a graph option on the debugobshistory command Add a graph option (--graph) to the debugobshistory. The output is like the 'hg log -G' output. The option is activated by default but can be deactivated with '--no-graph' option. There are various issue with the current implementation (multiple cycles handling, N² complexity) but this can be fixed later.

obshistory: import 'node' as 'nodemod' This simplify the next changeset.

label: add a label for the node in the "wc now at" message MOAR COLOR FOR THE COLOR GOAD!

label: rename 'evolve.short_node' to 'evolve.node' A wider labelk will helps compatibility.

obshistory: refactor debugobshistory Rename the function and extract the heavy work of the command in a separate module named obshistory.py

test: adapt to change in cache warming in core Core Mercurial has a more rational cache warming strategy now. 24f55686a63d stopped warming of the cache after every changegroup application (in favor of end of transaction warming). This reflect in the blackbox test output.

test: adapt to change in cache warming in core Core Mercurial has a more rational cache warming strategy now. 2b6692df1bdf stopped warming of the cache after every commit (in favor of end of transaction warming). This reflect in the blackbox test output.

stablerangecache: avoid crash when 'cache/' directory is missing If the directory is missing, we create it.

obshashrange: avoid crash when 'cache/' directory is missing If the directory is missing, we create it.

tests: apply output changes from core fix Mercurial core fixed a bug were the obsolete set (and all depending data) stayed invalid after markers were merged. Fixing this bug is fixing some bad output on the evolve side so we apply the output change.

packaging: mention 'dev' status in the version number

color: update the shorttemplate to use colors

merge with stable

obshashrange: cleanup 'valid' life cycle - reset is only called when we detect a strip, the on disk data are invalid, - after a reset, we should not keep using the data base connection, - after a write, the on disk data are valid.

obsrangecache: raise programming error when using an unwarmed cache This will provide a better experience for developer using this the cache.

obshashrange: stop marking on-disk data as invalid on clear This was abusing and prevent proper use of the on disk cache.

obshashcache: purge the meta line before writing a new one Otherwise we get multiple lines and this gets messy.

obshashrange: drop spurious whitespace

obshashcache: invalidate affected cache entries on side Calling reset during upgrade is screwing up the cache key update.

obshashcache: properly break out of all loops

dualsourcecache: simplify cachekey.clear We do not needs the super call anymore and we can make the reset case more explicit. So we do.

tests: small test update This is a bit clearer.

dualsourcecache: fix obskey return by _checkkey The function was returning the old key instead of the new one. This is now fixed.

test: update test-obsolete.t to use common.sh The definition of getid() in the test file was wrong, use the one from common.sh instead

obshashrange: log reset from new markers This will help tracking performance impact from current limitation.

dualsourcecache: log cache reset

stablerange: log time spent updating the stable range

cache: track time spend updating various cache This produce more useful blackbox log.

obshashrange: adds blackbox usage in tests This will help track the validation of the cache.

obshashrange: test behavior in case of rollback The cache should be properly invalidated.

obshashrange: extend tests We test more situations.

dualsourcecache: add a cache name This will be used to automatically log message for blackbox

obscache: stop definition of the empty key

obshashrange: keep value fetched from sql in memory This will reduce the number of roundtrip to the data base we need.

obshashrange: stop inheriting from 'dict' A simple dictionary attribute seems more simpler.

merge with stable

obshashrange: to not overwrite the list with the set We reusing the list variable lower in the code.

obshashrange: properly break out of the two loops Otherwise we would continue to iterate even after we reseted the cache.

obshashrange: fix reset conditional If the revision is in "revs" we should not reset the cache. The old code was wrong (Thanks goes to new tests for catching this).

cache: ensure we warm stablerange cache before the obshashrange cache I've been seeing traceback that seems to be happening because of issues in this area.

evolve: fixing obscache invalidation This was missing a call to the parent's destroyed(), such that any transaction after stripping some nodes would result in a crash (by attempting to read nodes which were stripped).

obshashrange: warm the cache at the end of each transaction This will help having warmed cache for read only client. The warming is still imperfect in case of markers that trigger a reset, but we are in a better place than what we used to be.

obshashrange: warm cache outside of loops The performance impact will be lower

obshashrange: "update" the cache on each transaction close Right now the "update" does not really file the cache, but it will detect invalid situation and clean them.

obshashrange: properly invalidate the cache on destroyed Copy paste is the scurge of code source.

obshashrange: properly drop the current connection on clear

obshashrange: exit early if nothing to write

obshashrange: use the dualsourcecache as a base for the cache This will easily open the way to incrementally updated obshashrange cache. Small update are needed to the data base schema so be bump the version Currently the update function is not warming the cache (but details case where it is invalidated).

obscache: makes dualsourcecache compatible with obshashrange cache needs The goal of the abstract method is to be reusable. So we make sure it is reusable.

readme: add a changelog entry about the more efficient obscache

obscache: extract a data agnostic class We now have an independent class that we can reuse for other purpose (eg: obshashrange cache)

obscache: extract the actual data update in a dedicated function This will help extract a data agnostic class.

obscache: move an assert to a lower level

obscache: use 'nullid' as the hash of an empty obsstore This align this result with what we use for 'emptykey'

obcache: move empty on the class We'll extract a smaller data agnostic class but we need to gather all method on it first.

obcache: move _checkkey on the class We'll extract a smaller data agnostic class but we need to gather all method on it first.

obcache: move updateneeded on the class We'll extract a smaller data agnostic class but we need to gather all method on it first.

obshistory: only display each revision once in debugobshistory When using a revision range, the same precursor could have been displayed more than once. Use a cache to display each revision only once. It's a fix until we found the nicest way to display obs history.

obshistory: display a message when one marker node has no change ctx When exchanging obs markers, there is some change contexts referencing change contexts that are not available locally. As we cannot display informations about them, instead print a message saying so.

ui: hg topic now display if current revision is in bad state (issue5533) Previously, hg topic didn't showed the state of the current revision. Now if show both informations.

obsstore: also guard agains changing object in '_checkkey' The 'upgradeneeded' function needs to be able to pass the object it fetched once.

obscache: guard from changing changelog or obsstore object We access these object once to make sure they will never change through the function (and their content will be fixed).

obscache: return the new data along-side the upgrade needs (and cache key) Having one function returning consistent data will help prevent race.

obscache: use the smaller scope function This make the function simpler and allow larger update on the 'upgradeneeded' one.

obscache: extract the cache key validation in its own function This help keep the "up to date logic" simpler and prepare a more complex version of the "upgradeneeded" logic that would return the full data needed for the upgrade.

obshistory: use formatter instead of ui.write in the debugobshistory command Replace ui.write with a formater to have template support and json output. Update tests to assert json outputs.

ui: Fix hg stack json output Previously 'hg stack -Tjson' generated invalid output like: [ { "isentry": true, "topic.stack.desc": "...", "topic.stack.index": 1, "topic.stack.state": "current", "topic.stack.state.symbol": "@" } ] , { "isentry": true, "topic.stack.desc": "...", "topic.stack.index": 1, "topic.stack.state": "current", "topic.stack.state.symbol": "@" }, { "isentry": false, "topic.stack.desc": "...", "topic.stack.state": "base", "topic.stack.state.symbol": "^" } ] I de-indented the fmt.end() to generate this output: [ { "isentry": true, "topic.stack.desc": "...", "topic.stack.index": 1, "topic.stack.state": "current", "topic.stack.state.symbol": "@" }, { "isentry": false, "topic.stack.desc": "...", "topic.stack.state": "base", "topic.stack.state.symbol": "^" } ] I've also added a test case.

topic: configure some default color for topic This makes thg usable

topic: automatically configure thg to display topic If no other config is set, we configure Tortoise-hg to display topic. This should helps usability.

readme: update readme to mention 'debugobshistory'

obshistory: add some color

obshistory: add a debugobshistory command to show obs history of a revs Add the debugobshistory command that accept a revision range and display the obsolescence containing each revision in the range. For the moment, it only displays the predecessors.

tests: add the commit style checker from Mercurial

obscache: update the cache key in place Instead of computing the key in place, we update the existing one using the data used for the incremental update of the content. This will help reaching purely incremental cache eventually. The 'getcachekey' function is dropped as it is no longer used.

obscache: distinct 'clear' and 'reset' We make a difference between basic invalidatiton (or lack of loading) and 'reset' (current cache data are invalid). We can now ensure a non-None key when we start the update. This will allow us to "update" the existing key instead of recomputing one from scratch. This is more efficient and less racy.

merge with stable

serveronly: also enable the obscache for server only setting The obscache is useful and speeds things up. So we also enable for server only setting.

obscache: document a possible way forward to skipping obsstore parsing We document a possibly viable idea for updating the cache on new revs without having to fully parse the obsstore.

obscache: update some documentation Update some data and do some proof reading.

obscache: Only access the new obsmarkers for marker update Since we know what what is the part of the file with "new" markers we can just access these. If the cache was up to date before the transaction, we'll re-parse data we just wrote. See the inline comment for details. This is good enough for now.

obscache: extract _updatemarkers code into its own function This split the update logic from the bit retrieving markers. That cannot be bad.

obscache: extract code to update from new revision Code cleanup and prepare upstreaming. The make the code more likely to work with the key validation returning an iterator of revs to update the cache with.

obscache: move assert earlier in the code If we are to crash, let us crash earlier.

merge back with stable

Added tag 6.1.0 for changeset 8510d3fd7c3b

packaging: prepare version 6.1.0

meta: update tested version to 4.1.2 We tested against the latest 4.1 too.

merge with future 6.1.0 No extra adjustment needed from hg-3.9 result

merge with future 6.1.0 No extra adjustment needed from hg-4.0 result

merge with future 6.1.0 In addition to the output reverted for 4.1, we also drop the "troubles:" entry from the standard log.

merge with future 6.1.0 test pass fine except for the removal of the extra data when accessing hidden revision. The better message are 4.2+ only.

compat: drop the context manager used to write the cache file Mercurial 3.8 does not supports context manager on atomic temporary file.

compat: make obscache code compatible with Mercurial version prior to 4.2 the phasecache.getrevset method is new in 4.2.

evolve: record testing with 4.2 4.2 is now a things and tests pass fine.

merge with default for 6.1.0

packaging first step toward 6.1.0

auto-push: move config help in the extension help That is a better spot than the extension itself.

opening mercurial 4.1 compat branch This branch will receive test update implied by the 4.2 → 4.1 changes.

obscache: skip writing to disk if the data did not changed This will avoid rewriting the cache for every single transaction.

obscache: skip writing if the cache is empty if the cache is empty, we can just skip writing to disk.

obscache: set a valid "empty" cache key if the cache is missing This avoid detecting bad cache when it just happens to be no cache.

obscache: have the obsstore fix empty file cachekey Before this change, the missing file and empty file returned different value.

obscache: log case where the cache is not up to date This will help track performance issue

obscache: still update and use the cache during transaction Other code might access the obsolete set in the middle of a transaction. It is better to use the case in that case since the update will eventually be written when the transaction is committed.

obscache: warm the cache in all cases There are case when the obsstore have been invalidated, but we still need to update the cache.

obscache: update the format to allow negative tiprev If the changelog is empty (but the obsstore is not) the 'tiprev' will be -1.

obscache: load the disk data before checking is the cache is up to date This is actually required since non-loaded cache will never be up to date...

obscache: skip the cache entirely if not up to date The current update code has some race condition windows around updating. But we also ensure the cache are up to date with every transaction. So outdated cache mean another client have been mudding the repository but things will get back in place at the next transaction. So we just skip using the cache when not up to date. This is not the best we could do. But this is good enough for now.

readme: mention that some improvement are enabled for 4.2 only

perf: use the cache to compute the obsolete set. The official "obsolete" computation is switch to using the cache. This provide noticable speed for operation that does not need to actually access the obs markers. The part relating to obsolete changeset computation disappear from the execution profile when it is used.

perf: warm the cache after all transactions This is the simplest way to ensure the data are up to date.

perf: adds a cache to know if obsmarkers might affect a revision Phase information still needs to be thrown in the mix to compute the final information, but skipping reading the obsstore for most operation is a large win. Usage of this cache arrives in the next changeset.

perf: adds cachekey utility to validate changelog+obsstore content We adds more helper about cache key to prepare the arrival of a cache that can be updated iteratively (similar to branchmap cache)

perf: adds some cache key helper on the obsstore class This will be useful to allow validating cache depending on obsstore without parsing the whole obsstore.

compat: only install the better filtered message for mercurial 4.2 and above The helper function does not exist in earlier version.

evolve: update extension help I'm pretty sure there are some missing bits, but this cannot be worse than before.

merge with stable

ui: change the hidden revision error message It now display the same details than the warning when the working directory parent become obsolete like: $ hg update 0 abort: hidden revision '0' (successor: f301a99bd857)! $ hg up 1 abort: hidden revision '1' (pruned)! $ hg update 0 abort: hidden revision '0' (successors: 91311af6da10, 70653776ec4c)!

ui: add better messages when the working copy become obsolete.

topic: directly use "super" call That is how one is supposed to do it.

repo: properly progate "destroyed" call to super class The propagation of the 'destroyed' call was dropped. I'm not certain of the consequences of having a partially broken "destroyed" call, but this can't be good.

safeguard: add an option to disable automatic publishing Pushing to publishing server by mistake is a bit too common in the current state of evolve. Especially when the lack of good feature branch story make the use of -f a bit too common. So we add a very simple experimental option to allow warning (or abort) when changeset are pushed to a publishing server. This is unlikely to survive as is, but this is useful now.

merge back with stable

Added tag 6.0.1 for changeset 5ef112a6eb87

pkg: prepare release 6.0.1

debian: finalize 6.0.0 entry

readme: fix 6.0.0 release date It was March, not February.

merge with future 6.0.1 Nothing special to report

merge with future 6.0.1 Nothing special to report

merge with future 6.0.1 Nothing special to report

checkheads: update tests to match the one in core These test now exists in core, so we update the evolve version.

serveronly: fix reposetup The local 'reposetup' function was shadowing the extension helper one. We add a test for obshashrange using 'serveronly' since this is the item that made use discover the issue.

extension: simplify the extensions helper hierarchy If one mode depends on the other, its extensions helper is merged.

checkheads: do not overwrite code for Mercurial 4.2 and above The fix has been ported to Mercurial core as c6cb21ddf74a.

legacy: fix debugrecordpruneparents to call obsstore.create() with keywords It appears the API was changed twice in Mercurial at - 570f87422f54 "obsstore: add an explicit `date` argument to obsstore.create" - adb3798dce49 "obsstore: add a `parents` argument to obsstore.create" and metadata would be changed to a list of (key, value) pairs. Convert it back to a dict as expected by create().

template: adapt to new showlist() API introduced by hg e5eab0fe69ee

template: pass all mapping data to showlist() Otherwise a keyword depending on repo or ctx couldn't be rendered.

make: merge recipes for help

make: fix indent of ifeq-endif ifeq() can't be a recipe.

tests: update test to match upstreamable version Name have been clarified, documentation has been updated and some test-case have been updated to match the intended test.

tests: fix directory names in exchange-D4 test The test is based on another one and the directory name had not been updated.

tests: fix directory names in exchange-D3 test The test is based on another one and the directory name had not been updated.

merge back with default

Added tag 6.0.0 for changeset 165ad227993d

packaging: prepare version 6.0.0

merged with future 6.0 No output changed.

test-compat-hg-3.9: merge with future 6.0

merge with future 6.0.0

merge with default We are getting close to cutting a 6.0.0

readme: mention the fix for issue4354

checkheads: add a small debug message in case were we give up fast When node is unknown we assume it will stay. Yet, we might have markers to it that are going to be pushed. However, we do not have branch (ancestors) information unless we are very lucky an all of them are pruned. So for now we do not do anything assuming this will be rare. We still add a small debug message to help detecting such situation in the future.

checkheahds: switch algorithm to use pushed markers instead We now checks if markers involved in the push are relevant to nodes in the branch we try to replace. The approach is simpler and more robust. A test showing the limitation of the previous approach is added.

checkheads: add test where the rewrite of the other branch is not direct This will help testing that our logic is properly transitive.

check-heads: add tests about old heads indirectly pruned

checkheads: add more complexe case where a branch is split on multiple ones We extend case A-6 and A-7 with partial counterpart. These case are interesting because some of the partial pushing will (rightfully) works and some other won't.

checkheads: add a test of partially pushing a branch spread on multiple other If a branch is fully obsolete but is result are spread on multiple branch, pushing only one of them should detect we create new branches.

checkheads-tests: add missing parents recording for prune markers It is a bit too easy to forget about theses :/ If they are missing, the markers are not going to be exchanged on push.

checkheads: add some extra tests about "partial push" This adds a couple of test that checks that the head replacement code is properly ignored replacement not relevant to the push.

checkheads: handle partial obsolescence We now properly detects situations were only parts of the remote branch is obsoleted. To do so, we process children in the branch recursively to see if they will be obsolete. The current code has some trouble when the remote branch in unknown locally, or when the prune happened on a successors that is not relevant to the push. These case will be handled later. The processing code is becoming more and more complex, a lighter approach would be to check for the obsolescence markers that are relevant to the pushed set, but I prefer to stick with the current approach until more test cases are written.

test: force a push in inhibit's test Our checkheads detection code is becoming better and will prevent that push. As we do not care about this for inhibit, we simply force the push.

checkheads: basic handling of pruned heads (and associated tests) We now detect that heads was pruned and stop warning about it. Note that this has the same shortcoming as the existing code and only looks at the heads.

checkheads: give up on processing locally unknown changeset There are too many issue with locally unknown changesets, we ignore them for now while we get the core feature of the detection working.

checkheads: import our own copy of the checkheads code I expect enough change and experimental will be made that is it worthwhile having them done in evolution close to the rest of the exchange tests make sense.

compat: work around some filecache bug in 3.8 We are still compatible with this version.

obshashrange: have an half descent wireprotocol command The previous implementation was extremely hacky. The new version is based on the other discovery function and work!

obshashrange: improve message issued during discovery This is a minor new message that help to understand what is going on.

obshashrange: introduce basic sqlite caching Same as for stablerange, this is far from perfect but already a win. The cache is currently extremely volatile, but that will still be a win when doing multiple consecutive request during discovery. Better cache invalidation will happens "in the future".

stablerange: warm cache before using it server side We make sure the cache is fully up to date before starting to use it. Updating all value is more efficient and this give us a single point where we update and write on disk. Hopefully the cache have been kept up to date as we go anyway.

stablerange: warm cache before using it in findrangemissing We make sure the cache is fully up to date before starting to use it. Updating all value is more efficient and this give us a single point where we update and write on disk. Hopefully the cache have been kept up to date as we go anyway.

stablerange: warm cache on transaction (if obshashrange is enabled) If we plan to use it (obshashrange is enabled) we better keep it up to date. If a transaction adds node, we update the cache (this should also update the on disk version).

stablerange: introduce ondisk caching through sqlite There is many short cut and limitation with this first version of a cache but this allow use to envision some actual usage of the stablerange thingy so let us got for it.

stablerange: drop the cache on 'destroyed' if the repository have been strip, the cache is not usable as is. We could be smarter in the invalidation but that is a prototype anyway. G: changed hgext3rd/evolve/stablerange.py

stablerange: support loading the cache iteratively We record how far we loaded so that we can resume from this point.

stablerange: add some basic documentation about the cache

stablerange: warmup all upto a revision Let us start doing more systemic warming of the cache before we start writing things out. This prepare on disk caching.

debugstablerange: add a --verify flag to the command This should help us finding bugs.

stablerange: add a proper debugstablerange commands This commands allows to inspect the standard stable range of a range. That should come handy.

debugobshashrange: add a --subranges option We stop displaying -everything- by default, since is is usually very large. This will help getting better timing when measuring cache effect too, since we won't need to dig out deep cache value that real life usage would not touch.

debug: rename 'debugstablerange' to 'debugobshashrange' The command is more about the 'obshashrange' computation.

debugstablerange: improve output spacing On repo with a descent amount of changeset the number where overflowing in all directions. We give use more room now.

subranges: add a utility function to set the cache This is preparing on disk persistence for the value in this cache.

subranges: add a utility function to access the cache This is preparing on disk persistence for the value in this cache.

depth: add a utility function to set the cache This is preparing on disk persistence for the value in this cache.

depth: add a utility function to access the cache This is preparing on disk persistence for the value in this cache.

stablerange: add warming of the subrange Note that this means we build standard stable subrange for all changesets in the repository this is significantly more than what we were computing before and result is significantly more ranges being computed.

stablerange: fix merge slicing when range has multiple roots The first element in the bottom set is not necessarly the one with the lowest revision. We now properly compute and use the minimum value.

stablerange: small style fix

merge-slicing: introduce and use "inheritance point" for merge The first part of the stable sorted list of revision of a merge will shared with the one of others. This means we can reuse subranges computed from that point to compute some of the subranges from the merge. That point is latest point in the stable sorted list where the depth of the revisions match its index (that means all revision earlier in the stable sorted list are its ancestors, no dangling unrelated branches exists). This is a bit expensive to find since we have to walk all the revision, but being able to reuse subranges in all case (not just regular changesets) provide a massive speedup so the cost is worth it.

stablerange: rearrange the code picking subrange to warm Same logic, as the previous changesets, we prepare the code before adding merge support.

stablerange: rearrange the reusing logic to prepare to merge We'll soon be able to reuse some lower range when dealing with merge too. So we prepare the code for this in advance for clarity.

merge-slicing: explain an alternative implementation in a comments It has a better time complexity so a C implementation would likely out perform the current implementation

merge-slicing: use reachable roots to filter the various branches Reachable roots does what we want and have a quite fast C implementation.

merge-slicing: simplify various aspect of the code Especially the case were the bottom have single heads is not more efficiently handled.

stablerange: soon it will not provide any benefit and it gets in the way This was a bit strange and memory consuming anyway.

revsfromrange: reuse information from the stablesort We collaborate with the stablesort to store the order that led to a merge. That way, when we needs to retrieve revision from that merge we can reuse that order. We might need to filter to only retains ancestors of the merge we care about but skipping the stablesort safe a large amount of time.

stablesort: allow a callback to be triggered on merge Storing some information as we sort is going to be useful to avoid performing multiple sort while computing the stablerange.

minor simplification around rangelength

more explicite name in revsfromrange

stablerange: cache parents We happens to be doing and awful amount of parent call. We cache them locally for efficiency.

merge-slicing: avoid doing the same work twice We have already computed the list of revision in that bottom slice as 'hrevs' so we do not need to compute it a second time.

stablerange: fix a bug when a top slice ended on a merge Our "smart" detection of merge was buggy if the top slice ended on a merge. This is not fixed and tested.

slicesrangeat: stop double setting the revsinranges cache The cache should have already been filled by the logic warming the cache for the parent.

subranges: remove the recursivity of the call to isubranges(parentrange) We add some logic to ensure we'll have hot cache for the parent ranges when that matters, the cache is filled from ancestors to descendant to ensure this. The range are still 'created from descendant to ancestors to fill the revsfromrange cache since it important.

subranges: detach cache logic from computation logic Having both the logic around cache checking and setting makes is a bit harder to follow. In addition, this allow to gather the computation logic next to the other related function.

findmissingrange: properly queue new subrange for slicing The previous code was buggy and used the wrong variable leading to no extra slicing being performed to file the sample at the requested size.

findmissingrange: fix reversed value in debug output "oops"

stablecache: warmup on unfiltered repository We only looks at ancestors revision so filtering will not have any effect. This reduce overhead from the filtering.

stablerange: rename the class This is much more than just a cache now.

stablerange: do not inherit from dict This seems like and old cargo cult that when unnoticed.

stablerange: move a utility function around It make more sense to have this small function earlier in the series

stablerange: remove the now unused individual range class That class is now longer necessary, we dropped its usage for performance reason.

stablerange: directly use tuple to refer to a stable range Now that all advance logic lives in the unified class we no longer needs the individual class. Creating and operating on this cache introduce a significant overhead that we can not stop having. From now on, a range a is pair tuple '(headrev, index)'. Long live the tuple.

obshash: properly cache obshash value The code was buggy and only cached non-nullid/non-inherited value. This was previous hidden because we were using a 'propertycache' to cache the value on the range object. This fixes it and restore a lot of performance.

stablerange: directly use 'self' when possible Code movement introduced multiple silly case were we where accessing 'self' though 'repo.stablerange' for no good reasons.

revsfromrange: set the cache for the multiple bottom ranges in merge slicing We no longer rely on the object magic here.

revsfromrange: set the cache for the single bottom range in merge slicing We no longer rely on the object magic here.

revsfromrange: set the cache for the top range in merge slicing We no longer rely on the object magic here.

revsfromrange: remove reference to '_revs' in merge slicing Given '_revs' is a property from the cache, we use the official method of the object we are on instead. That method should be using the same cache than the property if available.

revsfromcache: update cache for the top slice if possible Same logic, we update the cache if have the data.

revsfromrange: skip setting the cache for length-1 top entry The content of the range is trivial to compute.

revsfromrange: update cache for parentrange directly in the code We update it where it matters if we detect that we have the data.

revsfromramge: hard code the single changeset range case That case is trivial and triggering and full stable sort for it seems a bit silly.

stablerange: introduce caching for the full revision in a set Such cache proved handy in the "per-range" class so we carry it along to the unified class. cf documentation for details.

stablerange: add a cache for stablesort ordering This will be very handy for merge, cf inline documentation for details.

stablerange: move revs computation within the main class We still need to compute the revision withing a range when we slice a merge. This is the last large logic that remains in the individual class and we migrate is on the main class.

stablerange: minor method reorders on the main class We put the public method first for clarify.

stablerange: drop "key" and "id" logic form the class We can restrict to the bare minimun for equality and hashing now.

stablerange: drop length from the class There is not remaining user.

stablerange: drop _depth Nothing uses it anymore.

stablerange: drop __repr__ IT was used for debug and the class is on it way out.

stablerange: drop the subranges method on the small class Nobody use it anymore.

stablerange: use subranges from the main class in subrangesclosure This is the last method used on the class.

stablerange: use subranges from the main class in _obshashrange This is the last method used on the class.

stablerange: use subranges from the main class in findrangemissing This is the last method used on the class.

stablerange: make sure nobody use '.depth' anymore

stablerange: use depthrevs in range slicing We stop using the property from the class to get us closer to tuple.

stablerange: use depthrevs in debugstablerange We stop using the property from the class to get us closer to tuple.

stablerange: use rangelength inside the class itself We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in '_slicesatrange' We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in '_slicepoint' We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in subrangesclosure We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in _obshashrange We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in debugstablerange We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in findmissingrange We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: make sure nobody use '.index' anymore We rename the attribute for good measure.

stablerange: stop using '.index' inside the class itself We now access '[1]' as we'll do with the future tuple.

stablerange: stop using '.index' in '_slicesrangeat' We now access '[1]' as we'll do with the future tuple.

stablerange: stop using '.index' in '_slicepoint' We now access '[1]' as we'll do with the future tuple.

stablerange: stop using '.index' in 'rangelength' We now access '[1]' as we'll do with the future tuple.

stablerange: stop using '.index' in '_queryrange' We now access '[1]' as we'll do with the future tuple.

stablerange: stop using '.index' in debugstablerange We now access '[1]' as we'll do with the future tuple.

stablerange: make sure nobody use the 'stablekey' property outside the class

stablerange: make sure nobody use '.head' anymore We rename the attribute for good measure.

stablerange: stop using '.head' inside the class We now access '[0]' as we'll do with the future tuple.

stablerange: stop using '.head' in '_slicesrangeat' We now access '[0]' as we'll do with the future tuple.

stablerange: stop using '.head' in '_slicepoint' We now access '[0]' as we'll do with the future tuple.

stablerange: stop using '.head' in rangelength We now access '[0]' as we'll do with the future tuple.

stablerange: stop using '.head' in debugstablerange We now access '[0]' as we'll do with the future tuple.

stablerange: remove node unused 'node' property Close to killing that object.

stablerange: stop using '.node' in __repr__ This remove the last user to this method.

stablerange: change the key to use the revision number Using node is more stable but for now do not have on disk caching and revision number should be find in memory. This makes the data used for the file cache closer to what it will be when we use tuple. We might reintroduce node in the future but let us keep it simple for now.

stablerange: stop using '.node' in _queryrange We access the range-head revision number by index and convert it on site.

stablerange: stop using '.node' in debugstablerange We access the range-head revision number by index and convert it on site.

stablerange: stop using '.node' in findmissingrange We access the range-head revision number by index and convert it on site.

stablerange: stop using '.node' in obshashrange We access the range-head revision number by index and convert it on site.

stablerange: stop using '.node' in subrangesclosure We access the range-head revision number by index and convert it on site.

stablerange: have the class behave as a tuple If we want people to use a tuple, we should offer them a tuple. This should help update most of the code iteratively.

obshashrange: extract computation back into the discovery module This obshash is related to discovery and it seems more appropriate to have to live there. This remove the last large piece of logic from the class. We'll now be able to slowly turn it into a tuple.

obshashrange: use a small utility function to access the obshash If we want the object to disappear we needs the top level code to stop accessing its attribute.

debugstablerange: minor code reformat The content of that list will become more complex as we drop the object so we make sure to have one value per line for clarity.

stablerange: move the subrangesclosure inside the module This seems more suitable and open the way to simple update of how we build things without too much impact outside the module. The debug command is still in the 'obsdiscovery' module because it also deal to obshash and I'm not sure of were this should live yet.

stablerange: compute subranges from parent when possible Unless we are a merge, we can infer the standard subranges of a range by reusing the subranger of its parent. We update the implementation to do so. We still needs the "old way" for merge. We move that code in a dedicated function for the sake of simplicity.

stablerange: add an official warmup function The function is responsible for making sure we have the necessary data for a sets of heads. For now this only warm the depth cache. More will follow soon. Such explicite warmup will be usefull for on disck caching as an early point of writing will be easier.

stablerange: remove now unnecessary setter The class is handling all computations and cache access by itself now. So we can drop this method.

stablerange: directly perform slicing in the getting method Now that all necessary functions are available, we simply apply the standard slicing on cache miss and proceed.

stablerange: move standard slice point definition in main class More migration of code away from the doomed individual class.

stablerange: move the slicing method on the central class We migrate code away for the individual range class.

stablerange: move the range class in the new module Our ultimate goal is to remove this class for performance reason. however for now, it contains most of the code we care about so we migrate it as a block first.

stablesort: move into the stablerange module The stable range rely on the stable sort so it make senses to move it there. Will need direct access to it in the future.

subranges: migrate handling of single element range This is the simplest case by far, so we start with that one. We still use the rich object as an argument, but we'll do our best to not relying on that. This is important for performance reason.

stablerange: move the subrange cache into our new class This is the first step toward having more logic in that class

depth: extract code dedicated to depth of a merge in its own function The merge case is more complicated than the regular one, we extract is for the sake of clarity.

stablerange: move 'depth' inside a new 'stablerange' module The stablerange used for discovery requires significant amount of code. There is algorithme, cache, cache persistence, etc. So we create a dedicated module for it. The function is directly moved into a rich class handling cache (for now in memory) because we know we will need it.

obsdiscovery: document the status of the module I figured i would be useful to document what we expect from the code in each module.

split: move the debugcommand into a dedicated module The code related to debugobsstorestat is fairly independant, we move it into its own module.

legacy: move 'debugrecordpruneparents' in the extensions The transition is a couple of year old now, repository with the old format must be quite hard to find by now.

checks: correct the shebang line filtering for python files As it is, the only related file is docs/test2rst.py, which was covered by **.py. Not sure if it matters, but most patterns in core tests are for "#!.*?python". (Though there are a couple "#!.*python" tests.)

tests: add glob for Windows

tests: adds simple test case for heads checking This is the start of some systemic testing of the head superceeding detection mechanism.

tests: move exchange utility in testlib We have a testlib directory now lets use it.

exchange: fix some wrong reference to serveronly The function have all moved into 'obsexchange' now, so we do not need (and actually cannot) seek them in 'evolve.serveronly'.

checks: add a test that check MANIFEST.in content This make sure we keep the things updated.

README: add a link to mercurial devel This will help people to find the mailing list details.

README: tries to improve the title about server only This seems a bit better.

README: remove mention of make Using pip in all cases seems a better direction.

version: mark the current source as development version for 6.0.0 This is useful to distinguish the development version from the latest tagged version. In this particular case, this will allow us to publish a pre-version on pypi.

mercurial-3.8: merge with future evolve-6.0.0 We introduces the new code on the compat branch to check the tests.

mercurial-3.9: merge with hg-4.0 branch We merge with the code for the future evolve 6.0.0 code to check for compatibility. Only minor test output change (" -> ') have been noted.

mercurial-4.0: merge with future 6.0.0 A new version will be released soon, we start handling mismatch in test output to make the actual release time smoother.