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-remotefilelog-bundle2.t
author Manuel Jacob <me@manueljacob.de>
Mon, 11 Jul 2022 01:51:20 +0200
branchstable
changeset 49378 094a5fa3cf52
parent 48657 68b7faeb6ef3
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:
40722
0800d9e6e216 tests: disable remotefilelog on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 40572
diff changeset 
     1
 
#require no-windows
0800d9e6e216 tests: disable remotefilelog on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 40572
diff changeset 
     2
 







40495






3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     3


  $ . "$TESTDIR/remotefilelog-library.sh"












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     4









40571






95a079ea1e19
tests: drop obsolete "hginit" alias in remotefilelog tests



Martin von Zweigbergk <martinvonz@google.com>


parents: 
40495

diff
changeset




     5


  $ hg init master







48657






68b7faeb6ef3
tests: use debugrequires instead of grepping the file directly



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
40722

diff
changeset




     6


  $ hg debugrequires -R master | grep generaldelta







40495






3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     7


  generaldelta












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     8


  $ cd master












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     9


preferuncompressed = False so that we can make both generaldelta and non-generaldelta clones












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    10


  $ cat >> .hg/hgrc <<EOF












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    11


  > [remotefilelog]












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    12


  > server=True












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    13


  > [experimental]












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    14


  > bundle2-exp = True












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    15


  > [server]












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    16


  > preferuncompressed = False












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    17


  > EOF












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    18


  $ echo x > x












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    19


  $ hg commit -qAm x












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    20














3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    21


  $ cd ..












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    22














3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    23


  $ hgcloneshallow ssh://user@dummy/master shallow-generaldelta -q --pull --config experimental.bundle2-exp=True












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    24


  1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)







48657






68b7faeb6ef3
tests: use debugrequires instead of grepping the file directly



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
40722

diff
changeset




    25


  $ hg debugrequires -R shallow-generaldelta/ | grep generaldelta







40495






3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    26


  generaldelta












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    27


  $ hgcloneshallow ssh://user@dummy/master shallow-plain -q --pull --config format.usegeneraldelta=False --config format.generaldelta=False --config experimental.bundle2-exp=True







48657






68b7faeb6ef3
tests: use debugrequires instead of grepping the file directly



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
40722

diff
changeset




    28


  $ hg debugrequires -R shallow-plain/ | grep generaldelta







40495






3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    29


  [1]












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    30














3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    31


  $ cd master












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    32


  $ echo a > a












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    33


  $ hg commit -qAm a












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    34














3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    35


pull from generaldelta to generaldelta












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    36


  $ cd ../shallow-generaldelta












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    37


  $ hg pull -u












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    38


  pulling from ssh://user@dummy/master












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    39


  searching for changes












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    40


  adding changesets












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    41


  adding manifests












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    42


  adding file changes












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    43


  added 1 changesets with 0 changes to 0 files












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    44


  new changesets 2fbb8bb2b903












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    45


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












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    46


  1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    47


push from generaldelta to generaldelta












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    48


  $ echo b > b












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    49


  $ hg commit -qAm b












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    50


  $ hg push












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    51


  pushing to ssh://user@dummy/master












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    52


  searching for changes












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    53


  remote: adding changesets












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    54


  remote: adding manifests












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    55


  remote: adding file changes












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    56


  remote: added 1 changesets with 1 changes to 1 files












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    57


pull from generaldelta to non-generaldelta












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    58


  $ cd ../shallow-plain












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    59


  $ hg pull -u












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    60


  pulling from ssh://user@dummy/master












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    61


  searching for changes












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    62


  adding changesets












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    63


  adding manifests












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    64


  adding file changes












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    65


  added 2 changesets with 0 changes to 0 files












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    66


  new changesets 2fbb8bb2b903:d6788bd632ca












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    67


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












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    68


  1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    69


push from non-generaldelta to generaldelta












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    70


  $ echo c > c












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    71


  $ hg commit -qAm c












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    72


  $ hg push












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    73


  pushing to ssh://user@dummy/master












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    74


  searching for changes












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    75


  remote: adding changesets












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    76


  remote: adding manifests












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    77


  remote: adding file changes












3a333a582d7b
remotefilelog: import pruned-down remotefilelog extension from hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    78


  remote: added 1 changesets with 1 changes to 1 files














mercurial