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-push-checkheads-superceed-A8.t
author Manuel Jacob <me@manueljacob.de>
Mon, 11 Jul 2022 01:51:20 +0200
branchstable
changeset 49378 094a5fa3cf52
parent 49168 5996640fc6fe
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:
31981
259f4e02533b obsolescence: add test for the "branch replacement" logic during push, case A8
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset 
     1
 
====================================
259f4e02533b obsolescence: add test for the "branch replacement" logic during push, case A8
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset 
     2
 
Testing head checking code: Case A-8
259f4e02533b obsolescence: add test for the "branch replacement" logic during push, case A8
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset 
     3
 
====================================
259f4e02533b obsolescence: add test for the "branch replacement" logic during push, case A8
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset 
     4
 












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




     5


Mercurial checks for the introduction of new heads on push. Evolution comes












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




     6


into play to detect if existing branches on the server are being replaced by












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




     7


some of the new one we push.












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




     8














259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




     9


This case is part of a series of tests checking this behavior.












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    10









49168






5996640fc6fe
tests: fix misspelling of supersede



Anton Shestakov <av6@dwimlabs.net>


parents: 
42893

diff
changeset




    11


Category A: simple case involving a branch being superseded by another.







31981






259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    12


TestCase 8: single-changeset branch indirect rewrite












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    13














259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    14


.. old-state:












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    15


..












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    16


.. * 1-changeset branch












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    17


..












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    18


.. new-state:












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    19


..












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    20


.. * 1-changeset branch succeeding to A, through another unpushed changesets












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    21


..












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    22


.. expected-result:












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    23


..












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    24


.. * push allowed












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    25


..












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    26


.. graph-summary:












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    27


..












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    28


..       A'












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    29


..   A ø⇠ø⇠◔ A''












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    30


..     |/ /












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    31


..     | /












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    32


..     |/












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    33


..     ●












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    34














259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    35


  $ . $TESTDIR/testlib/push-checkheads-util.sh












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    36














259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    37


Test setup












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    38


----------












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    39














259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    40


  $ mkdir A8












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    41


  $ cd A8












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    42


  $ setuprepos












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    43


  creating basic server and client repo












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    44


  updating to branch default












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    45


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












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    46


  $ cd client












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    47


  $ hg up 0












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    48


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












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    49


  $ mkcommit A1












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    50


  created new head












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    51


  $ hg up 0












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    52


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












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    53


  $ mkcommit A2












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    54


  created new head












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    55


  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`







42893






34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage



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


parents: 
35393

diff
changeset




    56


  1 new obsolescence markers







33542






b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets



Boris Feld <boris.feld@octobus.net>


parents: 
33252

diff
changeset




    57


  obsoleted 1 changesets







31981






259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    58


  $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`







42893






34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage



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


parents: 
35393

diff
changeset




    59


  1 new obsolescence markers







33542






b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets



Boris Feld <boris.feld@octobus.net>


parents: 
33252

diff
changeset




    60


  obsoleted 1 changesets







31981






259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    61


  $ hg log -G --hidden












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    62


  @  c1f8d089020f (draft): A2












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    63


  |












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    64


  | x  f6082bc4ffef (draft): A1












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    65


  |/












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    66


  | x  8aaa48160adc (draft): A0












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    67


  |/












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    68


  o  1e4be0697311 (public): root












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    69


  












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    70














259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    71


Actual testing












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    72


--------------












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    73














259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    74


  $ hg push







35393






4441705b7111
tests: remove (glob) annotations that were only for '\' matches



Matt Harbison <matt_harbison@yahoo.com>


parents: 
33542

diff
changeset




    75


  pushing to $TESTTMP/A8/server







31981






259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    76


  searching for changes












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    77


  adding changesets












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    78


  adding manifests












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    79


  adding file changes












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    80


  added 1 changesets with 1 changes to 1 files (+1 heads)












259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    81


  2 new obsolescence markers







33252






53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling



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


parents: 
31981

diff
changeset




    82


  obsoleted 1 changesets







31981






259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    83














259f4e02533b
obsolescence: add test for the "branch replacement" logic during push, case A8



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 

diff
changeset




    84


  $ cd ../..














mercurial