D12609: obsolete: remove two unused constants

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I'm not sure what these constants were intended for, but they have no users so it's time to say goodbye. REPOSITORY rHG Mercurial BRANCH default REVISION

D12608: node: manually implement Debug

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I got too irritated today with the default Debug implementation of hg::revlog::Node while playing with a new parser. This isn't quite what I wanted, but it

D12603: diff: graduate merge diffs from experimental and add to tweakdefaults

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I've been using this functionality for two years without incident and it's been outstanding. In my opinion it's time to both remove the experimental warning

D12279: cleanup: directly use concurrent.futures instead of via pycompat

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Python 2 is gone. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12279

D12283: rust: jettison Python 2 support

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12283 AFFECTED FILES rust/Cargo.lock

D12282: setup: always decode xcode version

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Not decoding was a Python 2 thing. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D12281: setup: remove Rust support for Python 2

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12281 AFFECTED FILES setup.py CHANGE DETAILS

D12280: cleanup: stop bundling concurrent.futures on Python 2

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We no longer support Python 2. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D12277: setup: remove pygit2 Python 2 logic

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12277 AFFECTED FILES setup.py CHANGE DETAILS

D12278: imports: allow importing futures from concurrent

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12278 AFFECTED FILES contrib/import-checker.py

D12276: setup: inline now-constant list

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This varied when we supported Python 2. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D12275: setup: unconditionally do this python 3 step

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12275 AFFECTED FILES setup.py CHANGE DETAILS

D12274: setup: remove Python 2 support code for determining dylib suffix

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12274 AFFECTED FILES setup.py CHANGE DETAILS

D12273: setup: inline os.fsdecode now that we're done with Python 2

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12273 AFFECTED FILES setup.py CHANGE DETAILS

D12272: setup: inline encoding constant that is only used once

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This was variable back when we supported Python 2. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D12271: setup: remove printf trampoline

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12271 AFFECTED FILES setup.py CHANGE DETAILS

D12270: setup: remove more Python 2 support code

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I'll inline print() etc in future patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D12269: setup: remove ssl check that only matters on 2.7

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12269 AFFECTED FILES setup.py CHANGE DETAILS

D12268: setup: remove block that tries to help Python 2.6 users

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY It's time to move on folks. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D12266: setup: drop statement of support for Python before 3.5.3

durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY  REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12266 AFFECTED FILES

D12186: sparse: add timing block for parsing sparse configs

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This was showing up in an operation I was doing today, and I'd like to be able to get trace spans for it instead of just profiler samples. REPOSITORY rHG

D12185: narrowspec: add timing block for validating narrowspec

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This was showing up in an operation I was doing today, and I'd like to be able to get trace spans for it instead of just profiler samples. REPOSITORY rHG

D11958: git: add opener attribute to gitstore

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11958 AFFECTED FILES hgext/git/__init__.py CHANGE DETAILS diff --git

D11233: dirstate: fix typo in docstring

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Spotted while repairing git extension tests. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11233 AFFECTED

D11234: git: restore basic functionality (issue6545)

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY It looks like a big refactor happened on dirstate, and the git extension was just ignored. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D11232: rewriteutil: fix crash when a rewritten message references f{6, 64}

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Without this, the rewriteutil logic thinks it's found a reference to the wdir pseudo-revision, and then tries to look it up and rewrite it. Stop it from doing

D11231: tests: add explicit coverage for update_hash_refs from rewriteutil

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I couldn't find any evidence this is covered by tests in core (but there's a good chance I missed it). We've seen a cute bug in that code, but first let's

D11092: pyoxidizer: add hooks to inject extra python packages and install files

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We need this type of hook to inject our internal extension and resource files at Google. Presumably this could be useful to others, so instead of trying to

D11093: packaging: add command line flag to add extra vars to pyoxidizer

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This felt simpler than the previous incarnation of injecting content into the WiX build. I decided the easiest way to pass an arbitrary map into the process

D11030: parsers: move DirstateItem to attr.s

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11030 AFFECTED FILES mercurial/pure/parsers.py CHANGE DETAILS diff --git

D11006: remotefilelog: stop using RuntimeError for control flow

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We introduce a new exception to handle the various failure categories, rather than relying on RuntimeError. REPOSITORY rHG Mercurial BRANCH default

D11008: shallowutil: dedent code after the previous change

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11008 AFFECTED FILES hgext/remotefilelog/shallowutil.py CHANGE DETAILS diff

D11007: shallowutil: narrow scope of try/except block

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make this code easier to understand in the future. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D11005: remotefilelog: tweak corrupt cache test to grep more flexibly

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I'm about to fix the abuse of RuntimeError here, which breaks the test if I don't do this. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D10777: fuzz: add hg to sys.path when constructing mpatch corpus

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10777 AFFECTED FILES contrib/fuzz/mpatch_corpus.py CHANGE DETAILS diff --git

D10733: hghave: make error output easier to diagnose

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I had a typo that meant the new bash check was throwing an exception (due to a missing argument), but it was very hard to diagnose without this change.

D10732: tests: add req on bash for test-transaction-rollback-on-sigpipe (issue6429)

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I think we could work around this by rewriting the helper scripts in Python, but I don't want to deal with that now and this should prevent failures due to a

D6594: [ABANDONED] RFC dirstatemap

Herald added a subscriber: mercurial-patches. durin42 added a comment. durin42 added subscribers: muxator, gracinet. (+ infra list, some folks that I think volunteered in the past) REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6594/new/ REVISION

D10669: debugcommands: fix some plural-agreements I noticed

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10669 AFFECTED FILES mercurial/debugcommands.py CHANGE DETAILS diff --git

D10185: black: merge config into main pyproject.toml now that we have it

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This means that naive contributors who just run `black` on a source file will get reasonable behavior as long as they have a recent black. Yay! This was

D10184: pyproject: add config file

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will tell pip et al to call our setup.py for the majority of packaging concerns, but also gives us a place to put standard config stuff like black.

D10066: fuzz: if the caller of our makefile sets CC and CXX, trust them

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This should fix the broken fuzzing build, because we've been explicitly using clang++ but are now being given a CXX=afl++, which does extra stuff. REPOSITORY

D9944: relnotes: add entry for `hg diff --merge -c`

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9944 AFFECTED FILES relnotes/next CHANGE DETAILS diff --git a/relnotes/next

D9939: diff: suppress `merging foo` output lines when performing a merge diff

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9939 AFFECTED FILES mercurial/commands.py tests/test-diff-change.t CHANGE

D9908: context: add missing manifest invalidation after write in overlayworkingctx

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This was breaking my merge-diff logic that will be in the next patch. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D9855: histedit: rip out mysterious catch-all ignore curses.error handler

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I have no idea why this was here, and ripping it out doesn't obviously break anything for me (tests all pass, I can poke around chistedit UI a bit without

D9854: histedit: notice when the main window underflows height and abort

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY If you try to have a 13-line-tall terminal and use curses histedit, it fails by spinning in an infinite loop due to the catch-all ignore of curses errors on

D9853: histedit: don't assign to _ for unused values

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I don't know what this ignored value is, but we need to not clobber the _() function from gettext, or we get mysterious crashes instead of internationalizing

D9834: black: merge config into main pyproject.toml now that we have it

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This means that naive contributors who just run `black` on a source file will get reasonable behavior as long as they have a recent black. Yay! REPOSITORY

D9833: pyproject: add config file

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will tell pip et al to call our setup.py for the majority of packaging concerns, but also gives us a place to put standard config stuff like black.

D9791: revlog: migrate from PyEval_CallObject to PyObject_Call

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The former was deprecated in 3.9.0. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9791 AFFECTED FILES

D9790: fuzz: fix Makefile default PYTHON_CONFIG_FLAGS to be modern

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is actually what we already do on oss-fuzz, so it's more correct as tests go. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D9752: fuzz: try and ensure fuzzer tests run against the right python-config

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Also only under python 3. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9752 AFFECTED FILES

D9561: histedit: adjust comment describing `edit` action for clarity

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9561 AFFECTED FILES hgext/histedit.py tests/test-histedit-arguments.t

D9560: histedit: tweak `edit` message to try and guide users to our workflow

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY histedit predates evolve, so it drops you on an _uncommitted_ version of the commit you're amending/splitting, which is in contrast to git which expects you

D9471: procutil: correctly convert to bytes when shell=False

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9471 AFFECTED FILES mercurial/utils/procutil.py CHANGE DETAILS diff --git

D9430: formating: upgrade to black 20.8b1

durin42 created this revision. Herald added a reviewer: indygreg. Herald added a reviewer: martinvonz. Herald added a reviewer: martinvonz. Herald added subscribers: mercurial-patches, Kwan. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This required a couple of small tweaks to

D9428: merge: remove spurious ' and trailing whitespace from triple-quoted string

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9428 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git

D9429: osutil: reformat triple-quoted string so black doesn't confuse itself

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9429 AFFECTED FILES mercurial/pure/osutil.py CHANGE DETAILS diff --git

D9403: git: update test for hg and git output changes

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Clearly nobody is running this in their CI. :( REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9403 AFFECTED

D9402: gitlog: add tiprev() function

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Lots of stuff was broken because this was missing. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9402 AFFECTED

D9401: pyoxidizer: make sure defaultrc directory exists before trying to write to it

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY When doing some work involving one-file binaries, this line is failing for me. It seems reasonable to just make sure the destination directory exists before

D9342: pyoxidizer: run buildifier

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9342 AFFECTED FILES rust/hgcli/pyoxidizer.bzl CHANGE DETAILS diff --git

D9290: pyoxidizer: switch to modern config using run_command instead of run_mode

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9290 AFFECTED FILES rust/hgcli/pyoxidizer.bzl CHANGE DETAILS diff --git

D9289: pyoxidizer: default to one-file binary on non-Windows platforms

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Windows has some extra constraints that require a multi-file install, but we expect folks to use an MSI or similar installer there so it's less of a big deal.

D9291: make: add a pyoxidizer target

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9291 AFFECTED FILES Makefile CHANGE DETAILS diff --git a/Makefile b/Makefile ---

D9062: git: also convert timezone to int (issue6359)

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Credit to moshez for testing this in the wild. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9062 AFFECTED

D9004: hgdemandimport: bypass demandimport for _ast module (issue6407)

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is broken on Python 3.9rc1, and while it sounds like there may be a fix in Python, we probably also should have this workaround in place in hg. See the

D8999: git: fix index handling of removed files during commit (issue6398)

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Other changes in this series also changed the behavior here in positive ways, but this was the final step that actually fixed things. REPOSITORY rHG

D8998: git: make dirstate actually support listclean parameter

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY As far as I can tell listignored and listunknown should already work. I'm vexed that there doesn't seem to be a way to get clean files out of the pygit2

D8994: localrepo: use functools.wraps() in unfilteredmethod decorator

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This makes it easier to figure out what function you're holding on to when doing printf-style debugging. REPOSITORY rHG Mercurial BRANCH default REVISION

D8997: git: make dirstate status() respect matcher

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY As with other changes in this stack, we appear to have been getting lucky in the past. An upcoming change behaved _very_ oddly without this fix. REPOSITORY

D8996: git: fix up dirstate use of index

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This was super-broken before, and somehow none of the existing attempts to use this code tripped on the defects here. Sigh. REPOSITORY rHG Mercurial BRANCH

D8995: git: correctly handle "nothing changed" commits

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I guess localrepo.commit() actually returns an Optional[node], which is a bit of a surprise to me. REPOSITORY rHG Mercurial BRANCH default REVISION

D8993: git: actually copy treemanifest instances in .copy() (issue6398)

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The implementation here is so simple I honestly have no idea why I didn't do it at the time. Hopefully there's not some nuance past-me forgot to write down.

D8992: git: restore basic functionality after b3040b6739ce

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We don't yet have a formal interface for the changelog, but it's mostly specified. Sadly, b3040b6739ce

D8991: git: convert tz offset to int (issue6359)

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8991 AFFECTED FILES hgext/git/gitlog.py CHANGE DETAILS diff --git

D8975: genosxversion: don't give up if we can't find a path to hg libraries

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This doesn't work if you have a PyOxidized hg on $PATH, but everything is fine if you just ignore that problem. REPOSITORY rHG Mercurial BRANCH stable

D8353: debugcommands: create new debugantivirusrunning command

Closed by commit rHG87047efbc6a6: debugcommands: create new debugantivirusrunning command (authored by durin42). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8353?vs=21426=21955

D8374: fuzz: tell manifest fuzzer about longer node hashes

Closed by commit rHG9bedcfb4bb0e: fuzz: tell manifest fuzzer about longer node hashes (authored by durin42). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Revision". REPOSITORY rHG Mercurial

D8374: fuzz: tell manifest fuzzer about longer node hashes

durin42 added a comment. This is still valid. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8374/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8374 To: durin42, #hg-reviewers, Alphare Cc: mercurial-patches, pulkit, Alphare, mercurial-devel

D8636: pyutil: this has taken so long to fix, I'm using 3.8 now

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8636 AFFECTED FILES contrib/fuzz/pyutil.cc CHANGE DETAILS diff --git

D8637: fuzz: add config knob for PYTHON_CONFIG_FLAGS

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I'll clean this up once we get oss-fuzz to use Python 3.8 instead of 2.7, but for now we need a way to evolve the flags passed to python-config in lockstep

D8626: memctx: add mergestate method

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8626 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git

D8353: debugcommands: create new debugantivirusrunning command

durin42 added a comment. Sadly I have no idea on that. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8353/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8353 To: durin42, #hg-reviewers, marmoute Cc: mercurial-patches, marmoute, mharbison72,

D8625: git: add debug logging when there's a mismatch in the cached heads list

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The dag rebuild can be expensive, so let's try and avoid bugs where it transparently rebuilds all the time for no reason. This would have prevented the issue

D8623: rebase: add environment variable to allow forcing in-memory rebase

durin42 created this revision. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Use it in a test case where we know the rebase should proceed without incident in-memory, so we can see tracebacks rather

D8624: wip: this does not help but seems less wrong

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8624 AFFECTED FILES mercurial/mergestate.py CHANGE DETAILS diff --git

D8353: debugcommands: create new debugantivirusrunning command

durin42 added a comment. Best guess (given I've never hit an AV problem) is that the AV engine would lose its lunch on the EICAR file and alert the user. I figure if the AV engine isn't picking up on it after 2 seconds then it's probably also not a performance issue for us. REPOSITORY

D8592: filemerge: add __bytes__ for absentfilectx

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will at _least_ aid some upcoming debugging. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8592 AFFECTED

D8591: mergestate: move staticmethod _filectxorabsent to module level

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I suspect this was a static method just because it made merge.py feel less messy, but now we have a mergestate package so we can do better. REPOSITORY rHG

D8590: githelp: add some minimal help for pickaxe functionality

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Due to a conversation in work chat, I realized this is actually pretty well-hidden in Mercurial. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D8572: merge: remove special case for in-memory merge

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is now handled by the mergestate object, which knows if mergedriver works. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D8566: cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This avoids some pointless copying. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8566 AFFECTED FILES

D8570: rebase: use context to load mergestate instead of loading it directly

durin42 created this revision. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8570 AFFECTED FILES hgext/rebase.py CHANGE

D8568: overlayworkingctx: implement mergestate() using in-memory mergestate

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will allow `hg fix` to use the mergestate() method without regressing. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D8569: merge: get mergestate from context instead of directly

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This causes `hg fix` (and probably others) to use the new in-memory mergestate object instead of the on-disk one, which may incidentally correct some defects.

D8563: localrepo: get mergestate via context

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8563 AFFECTED FILES mercurial/localrepo.py CHANGE DETAILS diff --git

D8567: mergestate: implement trivial in-memory mergestate

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is the dumbest possible "mergestate" implementation: it doesn't actually handle conflict storage in the slightest, but for the current in-memory merge

D8565: mergestate: optimize unresolvedcount() a little bit

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY It struck me as wasteful to make this extra list copy of a generator. I was hoping to manage to return a bool instead of an int (and thus avoid traversing the

  1   2   3   4   5   6   7   8   9   10   >