--- a/.hgsigs Mon Oct 28 11:45:02 2024 +0100
+++ b/.hgsigs Mon Oct 28 16:31:49 2024 +0100
@@ -266,3 +266,4 @@
11f41248595b6dd7e0fbb434ecbf75c418785a4c 0 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
--- a/.hgtags Mon Oct 28 11:45:02 2024 +0100
+++ b/.hgtags Mon Oct 28 16:31:49 2024 +0100
@@ -282,3 +282,4 @@
11f41248595b6dd7e0fbb434ecbf75c418785a4c 6.8
11a9e2fc0caf0800625612e374139e4d825349a6 6.8.1
eae3ec345e5e62e653de32a87a70f6fa7241afde 6.8.2
+dc97e8670decc9925c2f570bdca636778184b199 6.9rc0
--- a/doc/templates/cmdheader.txt Mon Oct 28 11:45:02 2024 +0100
+++ b/doc/templates/cmdheader.txt Mon Oct 28 16:31:49 2024 +0100
@@ -1,5 +1,7 @@
.. _hg-%(cmdname)s.1:
+.. role:: config-doc
+
%(cmdtitle)s
%(cmdshortdesc)s
--- a/doc/templates/extheader.txt Mon Oct 28 11:45:02 2024 +0100
+++ b/doc/templates/extheader.txt Mon Oct 28 16:31:49 2024 +0100
@@ -1,5 +1,7 @@
.. _ext-%(extname)s:
+.. role:: config-doc
+
%(exttitle)s
.. contents::
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/relnotes/6.9 Mon Oct 28 16:31:49 2024 +0100
@@ -0,0 +1,94 @@
+= Mercurial 6.9rc0 =
+
+/!\ These are release notes for a release candidate version. Any and all points can be reverted before the final release.
+
+== New Features ==
+
+ * exchange: improve computation of relevant markers for large repos
+ * Add a Rust fast-path to speed up update (also for `clone`) from null (up to 4x faster)
+ * Introduced a new rev-branch-cache version (v2) that is mmap-resistant
+ * The branchmap's performance was improved
+ * Improved the performance of the fix for issue6528
+ * clonebundles: allow manifest to specify sha256 digest of bundles
+ * merge: improve working-copy mtime race handling
+ * profiling: add a py-spy profiling backend
+ * revlog: use an explicit config option to enable mmap usage for index
+ * revlog: use mmap by default is pre-population is available
+ * mmap: populate the mapping by default
+ * mmap: populate mapping in a background thread
+
+== Experimental features ==
+
+ * merge: add a config to allow conflict-free merge of changes on adjacent lines
+
+== Bug Fixes ==
+
+ * `config.server.validate` now also works on narrowed repositories
+ * convert: fix various leaked file descriptors
+ * stream: prefer keeping an open file handle to volatile file instead of copy
+ * dummysmtpd: fix EOF handling on newer versions of OpenSSL
+ * cext: correct the argument handling of `b85encode()`
+ * branchmap-v3: make sure we write the cache after detecting pure-topo mode
+ * rust: apply clippy lints
+ * copies: make sure deleted copy info do not overwriting unrelated ones
+ * rebase: don't call rewriteutil.precheck() with to-be-skipped commits
+ * phabricator: correct the default value of `phabhunk.corpus`
+ * linelog: correct the default value of `annotateresult.lines`
+ * largefiles: avoid a potentially undefined variable in exception case
+ * httppeer: move a variable to avoid a bad reference before assignment warning
+ * httppeer: avoid another bad reference before assignment warning
+ * tests: use packaging from setuptools instead of deprecated distutils
+ * manifest: type and fix unhexlify
+ * manifest: align some vfs option access on the fact we might not have options
+ * scmutils: read the requires file before writing to avoid unnecessary rewrite
+ * debugsparse: stop taking the store lock
+ * sparse: reliably avoid writing to store without a lock
+ * largefiles: sync up `largefilesdirstate` methods with `dirstate` base class
+ * shelve: raise an error when loading a corrupt state file in an impossible case
+ * monotone: replace %s interpolation with appropriate numeric specifiers
+ * shelve: consistently convert exception to bytes via `stringutil.forcebytestr`
+ * remotefilelog: honor the `--format` arg of the `debugindex` command
+ * remotefilelog: adapt the `debugindex` command to past API changes
+ * run-tests: add color to the progress output
+ * archive: defer opening the output until a file is matched
+ * help: add :config-doc:`section.key` shorthand to insert documentation
+ * censor: document the censor.policy option (issue6909)
+ * rust-revlog: don't try to open the data file if the index is empty
+ * bundlerepo: fix mismatches with repository and revlog classes
+ * revlog: make `clearcaches()` signature consistent with ManifestRevlog
+ * unionrepo: fix mismatches with revlog classes
+ * keepalive: fix a signature mismatch for a http.client.HTTPResponse subclass
+ * lfs: fix various signature mismatches for vfs subclasses
+ * store: fix a signature mismatch for a vfs subclass
+ * util: avoid a leaked file descriptor in `util.makelock()` exceptional case
+ * statichttprepo: fix `httprangereader.read()` for py3
+ * util: make `mmapread()` work on Windows again
+ * mdiff: tweak calls into `bdiff.fixws` to match its type hints
+ * base85: avoid a spurious use-before-initialized warning in `pure` module
+ * install: static data moved from setup.py to pyproject.toml
+ * upgrade: disable using the parallel workers optimization on macOS
+ * doc: generate separate commands/topics/extension pages
+ * extdiff: don't run gui programs when in a cli-only environment
+ * clonebundles: stop shell quoting `HGCB_BUNDLE_BASENAME` environment variable
+ * rev-branch-cache: disable mmapping by default on Windows
+
+== Backwards Compatibility Changes ==
+
+ * This release drops support for Python 3.6 and 3.7.
+
+== Internal API Changes ==
+
+ * manifest: deprecated readdelta and readfast
+
+== Miscellaneous ==
+
+ * http: reuse Python's implementation of read/readline/readinto
+ * http: use urllib's cookie handler
+ * rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
+ * rev-branch-cache: have debugupdatecache warm rbc too
+ * rev-branch-cache: reenable memory mapping of the revision data
+ * debugwireproto: redo logging to also work for https
+ * rust: use `.cargo/config.toml` instead of `.cargo/config`
+ * A whole bunch of typing improvements, which in turn found many bugs
+ * Test suite improvements
+ * Various packaging improvements