D9558: run-tests: configure the environment to expand `~` properly with Windows py38+

mharbison72 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This was causing tests to point to the actual home path on the system, not the test defined one. REPOSITORY rHG Mercurial BRANCH default REVISION DETA

D9557: run-tests: fix `HGTESTEXTRAEXTENSIONS` with py3

mharbison72 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Since `extensions` was a str and `section` bytes, it never populated anything. If it had, it would have put bytes into the environment dictionary that is all

D9559: windows: continue looking at `%HOME%` for user config files with py3.8+

mharbison72 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The `%HOME%` variable is explicitly called out in `hg help config` as a location that is consulted when reading user files, but python stopped looking at it

mercurial-devel | Pipeline #14250 has failed for branch/default | 53491919

Your pipeline has failed. Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/default ) Commit: 53491919 ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/53491919

D9554: diff: add --from and --to flags as clearer alternative to -r -r

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I think it was mistake to let the `-r` flag accept two revisions in `hg diff` in 98633e60067c

D9555: docs: prefer `hg diff --from/--to` over `-r`

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This patch includes updating away from the broken `hg diff -r 'date(...)'` (see not in previous patch). REPOSITORY rHG Mercurial BRANCH default REVISIO

D9556: docs: avoid `hg diff -r` in documentation about revsets

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I don't think `hg diff -r a::b` is a good use case for revsets because it's not clear what it's supposed to do (as evidenced by the comment we had there to

D9553: treemanifest: stop storing full path for each item in manifest._lazydirs

spectral created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This information is obtainable, if needed, based on the lazydirs key (which is the entry name) and the manifest's `dir()` method. Performance ---

D9552: share: remove unexpected heading from "verbose" container in help test

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY `test-gendoc-*.t` have been failing for me since 91425656e2b1 (share: add docum

mercurial@46081: 43 new changesets (3 on stable)

43 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/b9ebe0bfed4e changeset: 46039:b9ebe0bfed4e user:Yuya Nishihara date:Tue Dec 01 19:46:01 2020 +0900 summary: scmutil: document that bookmarkrevs() ignores non-head bookmark branch https:

Re: [PATCH 1 of 5 chg-tests-fix V2] procutils: don't try to get `.buffer` if sys.stdin is None

On Tue, 08 Dec 2020 19:12:20 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1606897517 -19800 > # Wed Dec 02 13:55:17 2020 +0530 > # Node ID 13496bf926221a034c890135954fdc72c895f6d7 > # Parent 8b20d469a0c819c2ade8635c25e9fcf0af553796 >

D9551: mergetools: add new conflict marker format with diffs in

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I use 3-way conflict markers. Often when I resolve them, I manually compare one the base with one side and apply the differences to the other side. That can

D9548: simplemerge: work with opts as native strings instead of bytes

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY There was little reason to use `pycompat.byteskwargs()` in `simplemerge()` as far as I could tell. REPOSITORY rHG Mercurial BRANCH default REVISION DET

D9550: simplemerge: write output only once it's complete

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY `simplemerge()` can write either to `ui.fout` or to the file context (for in-memory merge). This patch simplifies the code a bit by making it build the outp

D9549: simplemerge: avoid quadratic concatenation when building output text

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I haven't checked if the difference is measurable, but the new version is no less readable or idiomatic, so I don't think performance numbers are needed. R