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.
Path conflict checking is currently disabled by default because of issue5716.
Turn it on for this test.
$ cat >> $HGRCPATH << EOF
> [experimental]
> merge.checkpathconflicts=True
> EOF
$ hg init repo
$ cd repo
$ echo base > base
$ hg add base
$ hg commit -m "base"
$ hg bookmark -i base
$ mkdir a
$ echo 1 > a/b
$ hg add a/b
$ hg commit -m "file"
$ hg bookmark -i file
$ echo 2 > a/b
$ hg commit -m "file2"
$ hg bookmark -i file2
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
#if symlink
$ mkdir a
$ ln -s c a/b
$ hg add a/b
$ hg commit -m "link"
created new head
#else
$ hg import -q --bypass - <<EOF
> # HG changeset patch
> link
>
> diff --git a/a/b b/a/b
> new file mode 120000
> --- /dev/null
> +++ b/a/b
> @@ -0,0 +1,1 @@
> +c
> \ No newline at end of file
> EOF
$ hg up -q
#endif
$ hg bookmark -i link
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkdir -p a/b/c
$ echo 2 > a/b/c/d
$ hg add a/b/c/d
$ hg commit -m "dir"
created new head
$ hg bookmark -i dir
Merge - local file conflicts with remote directory
$ hg up file
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(activating bookmark file)
$ hg bookmark -i
$ hg merge --verbose dir
resolving manifests
a/b: path conflict - a file or link has the same name as a directory
the local file has been renamed to a/b~0ed027b96f31
resolve manually then use 'hg resolve --mark a/b'
moving a/b to a/b~0ed027b96f31
getting a/b/c/d
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg status
M a/b/c/d
A a/b~0ed027b96f31
R a/b
$ hg debugmergestate
local (working copy): 0ed027b96f31a2560c8abe689ba59876409a2b8e
other (merge rev): 9049d9534d5c5d16264aab02b4b9e20d03faabef
file: a/b (state "pu")
rename side: l
renamed path: a/b~0ed027b96f31
$ hg resolve --all
a/b: path conflict must be resolved manually
$ hg forget a/b~0ed027b96f31 && rm a/b~0ed027b96f31
$ hg resolve --mark a/b
(no more unresolved files)
$ hg commit -m "merge file and dir (deleted file)"
Merge - local symlink conflicts with remote directory
$ hg up link
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(activating bookmark link)
$ hg bookmark -i
$ hg merge dir
a/b: path conflict - a file or link has the same name as a directory
the local file has been renamed to a/b~2ea68033e3be
resolve manually then use 'hg resolve --mark a/b'
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg status
M a/b/c/d
A a/b~2ea68033e3be
R a/b
$ hg resolve --list
P a/b
$ hg resolve --all
a/b: path conflict must be resolved manually
$ hg mv a/b~2ea68033e3be a/b.old
$ hg resolve --mark a/b
(no more unresolved files)
$ hg debugmergestate
local (working copy): 2ea68033e3be03a560471c1fc9e5704fbedb9b4b
other (merge rev): 9049d9534d5c5d16264aab02b4b9e20d03faabef
file: a/b (state "pr")
rename side: l
renamed path: a/b~2ea68033e3be
$ hg resolve --list
R a/b
$ hg commit -m "merge link and dir (renamed link)"
Merge - local directory conflicts with remote file or link
$ hg up dir
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(activating bookmark dir)
$ hg bookmark -i
$ hg merge file
a/b: path conflict - a file or link has the same name as a directory
the remote file has been renamed to a/b~0ed027b96f31
resolve manually then use 'hg resolve --mark a/b'
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg status
A a/b~0ed027b96f31
$ hg resolve --all
a/b: path conflict must be resolved manually
$ hg mv a/b~0ed027b96f31 a/b/old-b
$ hg resolve --mark a/b
(no more unresolved files)
$ hg commit -m "merge dir and file (move file into dir)"
created new head
$ hg merge file2
merging a/b/old-b and a/b to a/b/old-b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ cat a/b/old-b
2
$ hg commit -m "merge file2 (copytrace tracked rename)"
$ hg merge link
a/b: path conflict - a file or link has the same name as a directory
the remote file has been renamed to a/b~2ea68033e3be
resolve manually then use 'hg resolve --mark a/b'
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg mv a/b~2ea68033e3be a/b.old
#if symlink
$ readlink.py a/b.old
a/b.old -> c
#else
$ cat a/b.old
c (no-eol)
#endif
$ hg resolve --mark a/b
(no more unresolved files)
$ hg commit -m "merge link (rename link)"