branching: merge stable back into default New version has been released, hooray.

packaging: mark stable change as bugfix dev version This help reduce confusion when installing non-tagged changeset.

Added tag 7.1.0 for changeset 06a3cb594956

packaging: prepare release 7.1.0

branching: revert "stable" change into default The expected output for "default" is still the same.

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

test: backed out test change from changeset a18ca224e812 The related mercurial changeset, ad5f2b923b0d, is not in the stable branch yet.

test: backed out output change from 85ab7d2d9fd6 Mercurial core default branch does not have the related changeset yet (a7e49a5b3e6f).

branching: merge with stable

obsnote: warn if user try to store a note in obsmarker on an older hg Support to store a note in obsmarker is from hg>=4.4. We have added notes support to all the evolve commands but we do support versions which don't support storing note in obsmarker. Warn if user tries to store a note in older hg.

topic: use 'hookargs' over 'tr.changes' for flow control The 'tr.changes' attribute do not exists until 4.2.

topic: move function wrapping from reposetup to uisetup Having the function un reposetup means they get wrapped over and over again for long lived process.

test: publish the root of the repo in flow reject-untopiced The lack of default branch confuses older version

genericcaches: handle the lack of util.timer in 4.1 We do the same trick as usual.

topics: fix `hg stack` in case of split This patch fixes the behaviour of hg stack which throws an error in some cases when there are multiple successors. The case of divergence is not handled yet.

tests: add a test showing traceback on `hg stack` in case of split The traceback will be fixed in the next patch.

branching: merge stable into default

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

changelog: add an entry for the split+branch fix The world needs to know.

branching: merge with stable

split: force the branch to fix the split bug Also restore it after the split

split: add a test demonstrating that split doesn't take the right branch Also add a test to check that the dirstate is in the right state in case the user abort the split.

stablerange: compute the subrange closure on an unfiltered repository This avoid various overhead from filtering.

stablesort: write a flat version of the algorithm This new version never needs to iterate over the full repository even when merge are encountered. Having the algorithm flat also prepare caching works since the iteration sequence can we expressed with a couple of flat loop.

stablesort: simplify processing of non-merge changesets As long as a changeset as only one parent, the next element in the sort (starting from the head) has to be that parent. We detect and take advantage of that shortcut in the non-merge case.

stablesort: extract a '_revsfrom' method Walking from the revision is usually simple unless the revision is a merge. Having this walking logic isolated will help us refine it.

stablerange: use the new cache object in the 'mergepoint' version Every improvement to the cache should reflect on the stable range from there. Since we no longer use the basic sort function, we can simplify the inheritance by dropping one layer.

stablesort: introduce a cache object The object is not caching anything yet, but the API are getting into place.

stablesort: start implementing more advanced version of headstart sorting Now that we can validate the sort with a basic implementation, we can start implementing a version that will support caching and other goodies.

stablerange: make use of the limit argument in 'mergepoint' This will eventually avoid doing full iteration on ancestors of the head when retrieving the range content.

stablerange: introduce a smarte version of stablerange for 'mergepoint' This implementation will using caching and smarter algorithm based on these cache. For now it inherit most of it code from the dummy version for convenience. The inheritance to the dummy version should be dropped eventually.

stablerange: introduce an intermediary abstract class for caching The 'branchpoint' and 'mergepoint' based stablerange class will need similar cache, we introduce an abstract class to take care of that first.

stablerange: introduce a basic-mergepoint method This method use the new 'mergepoint' based stable sorting. It is expected to be eventually better than branch point to stable range: more stable, easier to cache, etc. Having a basic implementation will allow use to validate more advanced implementation.

stablesort: add a new test to check for fully independant branches Apparently, this was not covered.

stablesort: add a --limit argument This will be useful when using stable sort within stable range.

stablesort: introduce a mergepoint based method focused on head The things we needs for stable range is head centric. So we simplify the issue by focussing on head.

stablesort: introduce a "mergepoint" method The mergepoint method decide order from merge. This allow to directly reuse a the full sort of one of the parent, and should simplify caching.

stablerange: fallback to a more naive approach to find subrange As suspected, using "bheads" was bit good enough in some case and we have to fall back to the approach used in "basic". On the evolve repo (about 3K changeset) this approach is about 60% slower than the previous (wrong) code.

stablebranch: avoid overlap between subrange Subrange overlap make things more complicated and less efficient. We fix the computation done in the "cached" version of the stablerange cache. This bring things in line with the result produced by the basic version. Since we already bumped the format version since the last release, I don't things we need to do anything else.

stablerange: introduce an 'basicstablerange' This class hold all the basic of stable range but the part specific to the sorting. This allow to clearly express what is expected from each method and to generate tests output to be validated against the more complex implementation. While writing this, we spotted a bug in the current stable range implementation. Fix coming.

stablerange: extract the core API into a 'stablerangecore' class To clarify what the code is doing without all the caching and algorithmic improvement, we extract a core class that highlight the basic API expected from the class.

stable-branch: setup tests to use a specific method by default This will make future test simpler.

stablerange: rework the debug command to allow for multiple method Similar to what we did for the other debug command related to sorting, we prepare for the arrival of multiple method to produce the result (including simple implementation that are easy to read but do not scale).

deptcache: make sure we warm the dept cache before warming the obsdiscovery The depthcache need to a warmed a bit more agressively

stablesort: add a 'method' argument to the debugstablesort command Let start experimenting with other way to do stable sorting.

stablesort: rename function to stablesort_branchpoint We are about to test different approach to stable sorting. We clarify that the existing method is sorting from branch points.

stablerange: update the filename to avoid cache confusion The schema validation seems to not work as well as intended, we update the file name to make sure there will be no confusion.

stablesort: extract in its own module We are going to introduce variants, cache and more complex logic, we move that in its own repository beforehand.

compat: in depth cache, only use cachevfs when available We support older version without the new vfs.

depthcache: issue a progress bar when loading the depth cache The operation can be in the minute order of magnitude of some larger repository. We better keep the user entertain when he wait.

depthcache: move to a dedicated object and storage The SQL cache was overkill and fragile. We move to a dedicated storage using the new generic class.

cache: adds debug details about what the content of the update Having more data in debug is good, we add a small method to help providing them. This code was headed for core during the 4.3 cycle but never made it there. So we starts with a copy in the evolve repository.

cache: introduce a changelogsourcebase class This abstract class will help code that need a cache tracking the changelog content (eg: the branchmap cache). The cache key used is the same as what the branchmap uses. This code was headed for core during the 4.3 cycle but never made it there. So we starts with a copy in the evolve repository.

cache: introduce an abstract class for cache we can upgrade incrementally Right now each class implements their own mechanism for validation, and update. We start introducing abstract class to ultimately allow more unification of the cache code. The end goal of this series is to introduce a cache for some obsolescence property, not to actually implement the cache. However, taking advantage of adding a new cache to introduce the abstract class seems like a win. This code was headed for core during the 4.3 cycle but never made it there. So we starts with a copy in the evolve repository.

depth: basic debugdepth implementation and test This will come very handy to validate more advanced implementation later.

topics: add a config to reject draft changeset without topic on a server This patch adds a new config option experimental.topic-mode.server which if sets to True, the server won't accept any draft changeset without topic on it. In case both `experimental.topic-mode.server` and `experimental.topic.publish-bare-branch` are set to True, the enforce-topic one is respected. Tests are added for it. The CHANGELOG file is also updated mentioning about the config option.

test: update output to ad5f2b923b0d A new bundle2 capabilities have been added (related to bookmark). So we have to update the test output. CORE-TEST-OUTPUT-UPDATE: ad5f2b923b0d

touch: shorten touch's docstring to make it fit into a one line This make it show completely (untruncated) in `hg help -e evolve`. This follows up on fed946edc293 where the docstring got unwrap for that purpose and thus made the line length exceed 80 columns.

branching: merge with stable

help: promote "amend" to important command Recent change to what command we advertise as "basic". It turn out "amend" was not part of one of them. Since "amend" is one of the core command of a rewriting workflow, we promote it to "basic command".

help: fix output for `hg help -e evolve` wrt 'touch' command Currently, when running `hg help -e evolve`, the output looks like this on my screen: touch create successors that are identical to their predecessors except With this change, it looks like this: touch create successors that are identical to their predecessors except for the changeset ID

help: remove a few commands from `hg` (no args) command list According to `hg help -e evolve`, the following commands come from the evolve extension: amend evolve fold metaedit next obslog pdiff previous prune pstatus split touch uncommit If one runs `hg` without arguments, commands that are prefixed with a ^ character are shown. From the previous list, this includes: evolve fold metaedit next previous prune split touch uncommit It feels several of these commands are not "basic commands" that someone who has never used hg before might care about. They probably also do not come close to passing the "toothbrush test": things that users are likely to use every day. This commit removes these items from the list: metaedit, touch, uncommit This means the following are kept: evolve fold next previous prune split

typos: fix typos in several locations A user at Google attempted to fix our local copy because they had noticed a typo (accross instead of across), but this will just get overwritten on our next import. This commit fixes that case and a few others that my editor found. Most of the typos were in comments, but user-visible output is changed in a few cases: - accross -> across - splitted -> split - ambigious -> ambiguous - evolvestte -> evolvestate (this is in a ui.debug, so not often seen) There is another typo that I wanted to fix, but didn't: 'supercede' is spelled 'superseed' in a few locations. I believe this is only internal to the extension, instead of being user-visible, so while it could probably be fixed easily, I wasn't 100% sure it didn't end up in a file on disk or something and might cause problems, so I left it alone.

topic: use more protective code to access current topic There are some code path where the operation is not properly initialized and lack the new attributes. While the lack of initialization, is suspicious and I've not be able to pin point case where this happens. Currently the code crash when it encounter this situation. So we make the code more resistant to this case to prevent bad user experience.

topic: use more protective code to access publishing code There are some code path where the operation is not properly initialized and lack the new attributes. While the lack of initialization, is suspicious and I've not be able to pin point case where this happens. Currently the code crash when it encounter this situation. So we make the code more resistant to this case to prevent bad user experience.

typos: fix typos in several locations A user at Google attempted to fix our local copy because they had noticed a typo (accross instead of across), but this will just get overwritten on our next import. This commit fixes that case and a few others that my editor found. Most of the typos were in comments, but user-visible output is changed in a few cases: - accross -> across - splitted -> split - ambigious -> ambiguous - evolvestte -> evolvestate (this is in a ui.debug, so not often seen) There is another typo that I wanted to fix, but didn't: 'supercede' is spelled 'superseed' in a few locations. I believe this is only internal to the extension, instead of being user-visible, so while it could probably be fixed easily, I wasn't 100% sure it didn't end up in a file on disk or something and might cause problems, so I left it alone.

tests: add a test for newline in obsnote

obsnote: don't add '' to note while showing it in obslog

obsnote: add an entry in CHANGELOG about it

amend: add support for storing a note in obsmarker

uncommit: add support for storing a note in obsmarker

fold: add support for storing a note in obsmarker

metaedit: add support for storing a note in obsmarker

prune: add support for storing a note in obsmarker

split: add support for storing a note in obsmarker

touch: add support for storing a note in obsmarker

obslog: add initial support for showing note in obslog This add a very basic and initial support for showing the note stored in the obsmarker in obslog to test the upcoming changes which adds support. The UI is not finalised and will be improved in the patches after support is added and we have tests with the current output.

cmdrewrite: add a utility function to make sure note is of valid format Upcoming patches will add support to store a note on various evolution related commands by storing that in obsmarker. Since the obsmarker metadata field can't store things above 255 bytes, this patch introduces a function which will be used to make sure note is under 255 bytes and does not contain newlines. We don't want notes to be multilines.

branching: merge with stable

test: remove dangling --config in test-metaedit.t

tests: fix previously accidentally matching regexes in test-touch.t Before Mercurial commit 6d5718e39657 (run-tests: make "| foo (re)" not match everything, 2017-11-29), regexes like "| foo", which are common in graphlog output, would incorrectly match anything. After that commit, they match as they should, meaning that either "" or " foo" would match, but not a "| foo". This commit fixes the test by replacing the "|" by "." rather than escaping with "\|" since that would make the graph harder to read.

test: update test-discovery-obshashrange.t

test: remove dangling --config in test-metaedit.t

serverminitopic: also avoid reading Avoiding to write cache for filter where topic applies is a good step, but we need to also avoid reading it. Existing branchmap cache might exists before the turned the feature on.

topic: introduce a minimal extensions to enable topic on the server This small extensions simply expose topic in the branch. This should help getting minimal support for topic from various hosting solution (eg: bitbucket maybe ?) See extensions help for details.

branching: merge stable into default

pusoperation: wrap pushoperation __init__ directly This is how remote names does it. Using the same method should helps with compatibility when mixing the two extensions.

hgignore: fix .err matching patterns We don't want to ignore .err file outside of the 'tests/' directory.

changelog: fix 7.0.0 release date We date was the same as 6.8.0 for some unkown reason. We now use the date of the tag.

changelog: mention the improved verbosity handling

branching: merge with stable

changelog: update missing release date

summaryhook: respect -q flag There's no test coverage, but it seems pretty obvious and I don't care enough to write a test.

summaryhook: remove unused function

evolve: make prev/next respect --quiet flag (issue5742)

packaging: merge 7.0.1 into default

packaging: mark version as development version. This helps reduce confusion when installing non tagged version.

Added tag 7.0.1 for changeset e7a2a6158077

packaging: prepare version 7.0.1

packaging: update tested-with version Mercurial 4.4.1 is out.

changelog: mention the --publish bugfix

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

compat: fix comp ability of the new phase logic for Mercurial < 4.4

config: clarify that config is only enabled on the repository is it setup for This changeset change nothing but clarify a few thing. The ui passed to 'reposetup' is the same as 'repo.ui'. However we would like to clarify things a bit.

branching: merge with an old and strange head

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

topic: fix new head detection when using --publish on a topic I suspected a bug lurking around there and I found one.

effect-flag: fix obsfate verb hooking Mercurial core commit b81ad5b78a81 renamed a the function we hooked on and update its signature. Update the code to detect that, which fixes tests errors.

test: update test output for effect flag by default Now that effect flag is in core and turned on by default, this affect topic test that did not had the evolve extension turned on all the time. CORE-TEST-OUTPUT-UPDATE: a7e49a5b3e6f

tests: add more testing of pulling with various setting We checks for client/server with various combination: * extensions enabled, * extensions enabled but exchange disabled, * extensions disabled,

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

branching: merge stable into default

changelog: add details about the pushkey related fix

wireproto: gracefully fail on http when trying to use older pushkey method Previously the HTTP server would return a 500. It now returns a 410.

wireproto: avoid exposing pushkey abort for server without evolution Client with evolution enabled will query the 'obsolete' pushley namespace if no other way to request obsmarkers have been found. They will do this unconditionally as long as no other obsolescence related capabilities have been advertised by the server. The call is "harmless" since the namespace will be empty if obsmarkers exchange is disabled. However, since we forbid the use of pushkey for obsmarkers this lead to unexpected crash report for up to date client talking to a server with the evolve extensions but exchange disabled. We fix the issue by serving the expected empty namespace in this case. We keep forbidding the query if obsmarker exchange is enabled since new client should have picked another more effective was to fetch the data first. We also add some tests for this logic.

obsdiscovery: enforce the config on the server too Right now, setting 'experimental.evolution.obsdiscovery=no' disable obsolescence markers discovery on client only. The server still advertise discovery related capabilities. We now also honor the config on the server side.

packaging: mark default branch as development version This help avoid confusion when installing version from the repository.

branching: merge back stable back into default

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

packaging: mark as development version This help avoid confusion when installing non tagged version.

Added tag 7.0.0 for changeset c56c028f3802

packaging: prepare version 7.0.0

debian: drop outdate part of the description

debian: update Mercurial version dependencies The debian package now reflect the actual requirement of the extension in its current version.

branching: merge with stable to prepare version 7.0.0

push: add a --publish flag The new flag turns all element in the push to public changeset. This will help experiment with diverse publishing workflow.

topic: add an option to automatically publish topic-less changeset This new option will help playing with merge based workflow.

topic: add an option to enforce a single head per name in a repository

revset: clean up some messy logic

evolve: rename --phasedivergent flag to --phase-divergent This makes the whole things easier to read.

evolve: rename --contentdivergent flag to --content-divergent This makes the whole things easier to read.

pushkey: forbid usage of pushley to exchange markers The pushkey based protocol lacks many important feature and is very slow. We disable it to prevent any usage by mistake.

changelog: add an entry for 7.0.0 with recent change

compat: drop compat code for smartrevs.first The 'first' method have been around for years.

compat: drop compatibility dance around configoverride This was introduced in hg-4.1 and we do no longer support lower versions.

compat: drop support for older exchange protocol Their have been better alternative for years. In addition they have been officially deprecated for quite some time. So we official stop support them to ease the maintainance.

compat: drop compatibility for 'streamres' prior to 4.1 We no longer support these version.

compat: drop the directaccess hacky extension The user of this extension has forked their own version. We lighten our maintenance burden and drop it.

compat: drop the inhibit hacky extension The user of this extension has forked their own version. We lighten our maintenance burden and drop it.

compat: drop 'lru.get' work-around for 3.9 We no longer support this version.

compat: stop working around 3.8 file cache limitation We no longer support this version.

compat: simply the wrapping of '_destmergebranch' All the version we support now use the same interface.

compat: drop support for 3.8's '_destrebase' function We no longer support this version.

compat: mark version 4.1 as the minimum version required We dropped compatibility for version 3.8, 3.9 and 4.0.

compat: drop compatibility for Mercurial <= 4.0 We are dropping compatibility with older mercurial version. This will help us to clean up the code base.

packaging: mark as development version This helps avoid confusion.

branching: merge with stable Prepare the 7.0.0 line.

packaging: mark version as development version This helps to avoid confusion.

branching: close mercurial-4.0 branch We are dropping support for older Mercurial version.

branching: close mercurial-3.9 branch We are dropping support for older Mercurial version.

branching: close mercurial-3.8 branch We are dropping support for older Mercurial version.

util: add a small script to help with the merging of branches We have multiple test-compat branches merging them can be a bit tedious. We add a nice script doing so for us.

test-compat: merge mercurial-3.9 into mercurial-3.8

test-compat: merge mercurial-4.0 into mercurial-3.9

test-compat: merge mercurial-4.1 into mercurial-4.0

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

Added tag 6.8.0 for changeset ec0bbf26ce7f

packaging: prepare version 6.8.0

flake8: rename some ambiguous identifier Apparently, pyflakes declared war on 'l'.

topic: instroduce a fast path when computing stack We do some stack related computation during transaction now. The current inefficiency of the revset is hurting us too much. We pre-compute a subset using native set operation to speed things up.

branching: merge stable back into default

test-compat: merge future 6.7.0 in mercurial-3.8 branch

test-compat: merge future 6.7.0 in mercurial-3.9 branch

test-compat: merge future 6.7.0 in mercurial-4.0 branch

test-compat: merge future 6.7.0 in mercurial-4.1 branch

test-compat: merge future 6.7.0 in mercurial-4.2 branch

test-compat: merge future 6.7.0 in mercurial-4.3 branch

obsfate: re-enables operation display in obsfate Now that the compatibility checks are in a good shape we can re-enable more noise in it.

changelog: update to reflect latest change

test-compat: merge with mercurial-3.9 branch

test-compat: merge with mercurial-4.0 branch

compat-test: remove topic related tests for 3.9 The extension is no longer supported for 3.9

test-compat: merge with mercurial-4.1 branch

test-compat: merge with mercurial-4.2 branch

test-compat: merge with mercurial-4.3 branch

branching: merge with mercurial-4.3 branch creation The other changeset marks the point were 'stable' is no longer about Mercurial version 4.3.

test-compat: revert output changes from phase renaming We keep using the old name for the older version. test has to reflect that.

test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.

test-compat: revert ouput change to blackbox This backed out changeset 86be70ae38b9.

test-compat: revert ouput related to operation This effectively backs out 4b951a9a6895.