##// END OF EJS Templates
manifest: delay import of `typing.ByteString` for py 3.14 support (issue6940)...
manifest: delay import of `typing.ByteString` for py 3.14 support (issue6940) Since Python 2.7 and 3.5, `typing.ByteString` was defined as an alias for `bytes | bytearray | memoryview`, and `bytes` was also accepted as a shorthand for this, so we have `bytes` sprinkled all over the codebase. But then PEP-688 reversed all of that by deprecating `typing.ByteString` and its successor `collections.abc.ByteString` in Python 3.12 (as well as the `bytes` shorthand)[1], and removing it completely in Python 3.14. That leaves us with a couple of problems, namely defining something useful that spans py3.8-py3.13 and keeps pytype happy, and finding all of the instances where `bytes` doesn't really mean `bytes`. The current successor to all of this is `collections.abc.Buffer` in Python 3.12 (or `typing_extensions.Buffer` in previous versions). However, the current CI does type checking using Python 3.11 (so the former is not avaiable), and pytype has issues with importing `typing_extensions.Buffer`[2]. The good news is we don't need to deal with this mess immediately, since the type annotation evaluation is delayed to the type checking phase, and we're making no effort at supporting it in all supported versions of Python. So by delaying the import of this particular symbol, we can still use it for type checking purposes, but can start assessing Python 3.14 problems without doing a lot of extra work. Putting this on stable will allow people interested in 3.14 to work on it 4-5 extra months earlier (and apparently there's some interest). [1] https://peps.python.org/pep-0688/#no-special-meaning-for-bytes [2] https://github.com/google/pytype/issues/1772

File last commit:

r26804:61250290 default
r53224:0851d94b stable
Show More
editmerge
58 lines | 1.4 KiB | text/plain | TextLexer
Olle Lundberg
contrib: don't hardcode path to bash interpreter...
r20831 #!/usr/bin/env bash
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010 # A simple script for opening merge conflicts in the editor.
# Use the following Mercurial settings to enable it.
#
# [ui]
# merge = editmerge
#
# [merge-tools]
# editmerge.args=$output
# editmerge.check=changed
# editmerge.premerge=keep
Ryan McElroy
editmerge: properly quote variables...
r26771 FILE="$1"
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010
getlines() {
Ryan McElroy
editmerge: properly quote variables...
r26771 grep -n "^<<<<<<" "$FILE" | cut -f1 -d:
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010 }
Matt Mackall
urls: bulk-change primary website URLs
r26421 # editor preference loosely based on https://mercurial-scm.org/wiki/editor
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010 # hg showconfig is at the bottom though, since it's slow to run (0.15 seconds)
Ryan McElroy
editmerge: properly quote variables...
r26771 ED="$HGEDITOR"
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010 if [ "$ED" = "" ] ; then
Ryan McElroy
editmerge: properly quote variables...
r26771 ED="$VISUAL"
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010 fi
if [ "$ED" = "" ] ; then
Ryan McElroy
editmerge: properly quote variables...
r26771 ED="$EDITOR"
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010 fi
if [ "$ED" = "" ] ; then
Ryan McElroy
editmerge: properly quote variables...
r26771 ED="$(hg showconfig ui.editor)"
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010 fi
if [ "$ED" = "" ] ; then
echo "merge failed - unable to find editor"
exit 1
fi
if [ "$ED" = "emacs" ] || [ "$ED" = "nano" ] || [ "$ED" = "vim" ] ; then
Ryan McElroy
editmerge: properly quote variables...
r26771 FIRSTLINE="$(getlines | head -n 1)"
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010 PREVIOUSLINE=""
# open the editor to the first conflict until there are no more
# or the user stops editing the file
while [ ! "$FIRSTLINE" = "" ] && [ ! "$FIRSTLINE" = "$PREVIOUSLINE" ] ; do
Ryan McElroy
editmerge: dequote other use of $ED...
r26804 $ED "+$FIRSTLINE" "$FILE"
Ryan McElroy
editmerge: properly quote variables...
r26771 PREVIOUSLINE="$FIRSTLINE"
FIRSTLINE="$(getlines | head -n 1)"
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010 done
else
Ryan McElroy
editmerge: properly quote variables...
r26771 $ED "$FILE"
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010 fi
# get the line numbers of the remaining conflicts
Ryan McElroy
editmerge: properly quote variables...
r26771 CONFLICTS="$(getlines | sed ':a;N;$!ba;s/\n/, /g')"
Durham Goode
contrib: add editmerge script for editor conflict prompts...
r20010 if [ ! "$CONFLICTS" = "" ] ; then
echo "merge failed - resolve the conflicts (line $CONFLICTS) then use 'hg resolve --mark'"
exit 1
fi
exit 0