procutil: make stream detection in make_line_buffered more correct and strict In make_line_buffered(), we don’t want to wrap the stream if we know that lines get flushed to the underlying raw stream already. Previously, the heuristic was too optimistic. It assumed that any stream which is not an instance of io.BufferedIOBase doesn’t need wrapping. However, there are buffered streams that aren’t instances of io.BufferedIOBase, like Mercurial’s own winstdout. The new logic is different in two ways: First, only for the check, if unwraps any combination of WriteAllWrapper and winstdout. Second, it skips wrapping the stream only if it is an instance of io.RawIOBase (or already wrapped). If it is an instance of io.BufferedIOBase, it gets wrapped. In any other case, the function raises an exception. This ensures that, if an unknown stream is passed or we add another wrapper in the future, we don’t wrap the stream if it’s already line buffered or not wrap the stream if it’s not line buffered. In fact, this was already helpful during development of this change. Without it, I possibly would have forgot that WriteAllWrapper needs to be ignored for the check, leading to unnecessary wrapping if stdout is unbuffered. The alternative would have been to always wrap unknown streams. However, I don’t think that anyone would benefit from being less strict. We can expect streams from the standard library to be subclassing either io.RawIOBase or io.BufferedIOBase, so running Mercurial in the standard way should not regress by this change. Py2exe might replace sys.stdout and sys.stderr, but that currently breaks Mercurial anyway and also these streams don’t claim to be interactive, so this function is not called for them.

     1

#!/usr/bin/env bash

     2

# A simple script for opening merge conflicts in the editor.

     3

# Use the following Mercurial settings to enable it.

     4

#

     5

# [ui]

     6

# merge = editmerge

     7

#

     8

# [merge-tools]

     9

# editmerge.args=$output

    10

# editmerge.check=changed

    11

# editmerge.premerge=keep

    12

    13

FILE="$1"

    14

    15

getlines() {

    16

  grep -n "^<<<<<<" "$FILE" | cut -f1 -d:

    17

}

    18

    19

# editor preference loosely based on https://mercurial-scm.org/wiki/editor

    20

# hg showconfig is at the bottom though, since it's slow to run (0.15 seconds)

    21

ED="$HGEDITOR"

    22

if [ "$ED" = "" ] ; then

    23

  ED="$VISUAL"

    24

fi

    25

if [ "$ED" = "" ] ; then

    26

  ED="$EDITOR"

    27

fi

    28

if [ "$ED" = "" ] ; then

    29

  ED="$(hg showconfig ui.editor)"

    30

fi

    31

if [ "$ED" = "" ] ; then

    32

  echo "merge failed - unable to find editor"

    33

  exit 1

    34

fi

    35

    36

if [ "$ED" = "emacs" ] || [ "$ED" = "nano" ] || [ "$ED" = "vim" ] ; then

    37

  FIRSTLINE="$(getlines | head -n 1)"

    38

  PREVIOUSLINE=""

    39

    40

  # open the editor to the first conflict until there are no more

    41

  # or the user stops editing the file

    42

  while [ ! "$FIRSTLINE" = "" ] && [ ! "$FIRSTLINE" = "$PREVIOUSLINE" ] ; do

    43

    $ED "+$FIRSTLINE" "$FILE"

    44

    PREVIOUSLINE="$FIRSTLINE"

    45

    FIRSTLINE="$(getlines | head -n 1)"

    46

  done

    47

else

    48

  $ED "$FILE"

    49

fi

    50

    51

# get the line numbers of the remaining conflicts

    52

CONFLICTS="$(getlines | sed ':a;N;$!ba;s/\n/, /g')"

    53

if [ ! "$CONFLICTS" = "" ] ; then

    54

  echo "merge failed - resolve the conflicts (line $CONFLICTS) then use 'hg resolve --mark'"

    55

  exit 1

    56

fi

    57

    58

exit 0