Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-issue1306.t
author Manuel Jacob <me@manueljacob.de>
Mon, 11 Jul 2022 01:51:20 +0200
branchstable
changeset 49378 094a5fa3cf52
parent 34661 eb586ed5d8ce
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
26420
2fc86d92c4a9 urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents: 15615
diff changeset 
     1
 
https://bz.mercurial-scm.org/1306
12195
ee41be2bbf5a tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents: 8452
diff changeset 
     2
 












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




     3


Initialize remote repo with branches:












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




     4














ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




     5


  $ hg init remote












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




     6


  $ cd remote












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




     7














ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




     8


  $ echo a > a












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




     9


  $ hg ci -Ama












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    10


  adding a












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    11














ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    12


  $ hg branch br












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    13


  marked working directory as branch br







15615






41885892796e
branch: warn on branching



Matt Mackall <mpm@selenic.com>


parents: 
14162

diff
changeset




    14


  (branches are permanent and global, did you want a bookmark?)







12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    15


  $ hg ci -Amb












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    16














ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    17


  $ echo c > c












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    18


  $ hg ci -Amc












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    19


  adding c







8452






cb93eee1fbcd
tests: add missing interpreter lines



Martin Geisler <mg@lazybytes.net>


parents: 
7045

diff
changeset




    20









12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    21


  $ hg log







14162






301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 
12847

diff
changeset




    22


  changeset:   2:ae3d9c30ec50







12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    23


  branch:      br












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    24


  tag:         tip












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    25


  user:        test












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    26


  date:        Thu Jan 01 00:00:00 1970 +0000












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    27


  summary:     c












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    28


  







14162






301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 
12847

diff
changeset




    29


  changeset:   1:3f7f930ca414







12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    30


  branch:      br












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    31


  user:        test












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    32


  date:        Thu Jan 01 00:00:00 1970 +0000












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    33


  summary:     b












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    34


  












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    35


  changeset:   0:cb9a9f314b8b












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    36


  user:        test












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    37


  date:        Thu Jan 01 00:00:00 1970 +0000












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    38


  summary:     a












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    39


  












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    40














ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    41


  $ cd ..












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    42














ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    43


Try cloning -r branch:







7045






f82938c87b92
clone: honor -r even when pulling named branches



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    44









12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    45


  $ hg clone -rbr remote local1












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    46


  adding changesets












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    47


  adding manifests












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    48


  adding file changes












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    49


  added 3 changesets with 2 changes to 2 files







34661






eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)



Denis Laxalde <denis.laxalde@logilab.fr>


parents: 
26420

diff
changeset




    50


  new changesets cb9a9f314b8b:ae3d9c30ec50







12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    51


  updating to branch br












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    52


  2 files updated, 0 files merged, 0 files removed, 0 files unresolved












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    53














ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    54


  $ hg -R local1 parents







14162






301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 
12847

diff
changeset




    55


  changeset:   2:ae3d9c30ec50







12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    56


  branch:      br












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    57


  tag:         tip












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    58


  user:        test












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    59


  date:        Thu Jan 01 00:00:00 1970 +0000












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    60


  summary:     c












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    61


  












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    62














ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    63


Try cloning -rother clone#branch:







7045






f82938c87b92
clone: honor -r even when pulling named branches



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    64









12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    65


  $ hg clone -r0 remote#br local2












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    66


  adding changesets












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    67


  adding manifests












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    68


  adding file changes












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    69


  added 3 changesets with 2 changes to 2 files







34661






eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)



Denis Laxalde <denis.laxalde@logilab.fr>


parents: 
26420

diff
changeset




    70


  new changesets cb9a9f314b8b:ae3d9c30ec50







12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    71


  updating to branch default












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    72


  1 files updated, 0 files merged, 0 files removed, 0 files unresolved












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    73














ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    74


  $ hg -R local2 parents












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    75


  changeset:   0:cb9a9f314b8b












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    76


  user:        test












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    77


  date:        Thu Jan 01 00:00:00 1970 +0000












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    78


  summary:     a












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    79


  












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    80














ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    81


Try cloning -r1 clone#branch:







7045






f82938c87b92
clone: honor -r even when pulling named branches



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    82









12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    83


  $ hg clone -r1 remote#br local3












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    84


  adding changesets












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    85


  adding manifests












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    86


  adding file changes












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    87


  added 3 changesets with 2 changes to 2 files







34661






eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)



Denis Laxalde <denis.laxalde@logilab.fr>


parents: 
26420

diff
changeset




    88


  new changesets cb9a9f314b8b:ae3d9c30ec50







12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    89


  updating to branch br












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    90


  1 files updated, 0 files merged, 0 files removed, 0 files unresolved












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    91














ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    92


  $ hg -R local3 parents







14162






301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 
12847

diff
changeset




    93


  changeset:   1:3f7f930ca414







12195






ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    94


  branch:      br












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    95


  user:        test












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    96


  date:        Thu Jan 01 00:00:00 1970 +0000












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    97


  summary:     b












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    98


  












ee41be2bbf5a
tests: unify test-issue*



Adrian Buehlmann <adrian@cadifra.com>


parents: 
8452

diff
changeset




    99
















mercurial