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-unpushed-D6.t
author Manuel Jacob <me@manueljacob.de>
Mon, 11 Jul 2022 01:51:20 +0200
branchstable
changeset 49378 094a5fa3cf52
parent 46119 9261f6c1d39b
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:
31989
85a22bc03d58 obsolescence: add test for the "branch replacement" logic during push, case D6
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset 
     1
 
====================================
85a22bc03d58 obsolescence: add test for the "branch replacement" logic during push, case D6
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset 
     2
 
Testing head checking code: Case D-6
85a22bc03d58 obsolescence: add test for the "branch replacement" logic during push, case D6
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset 
     3
 
====================================
85a22bc03d58 obsolescence: add test for the "branch replacement" logic during push, case D6
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset 
     4
 












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




     7


some of the new one we push.












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




     8














85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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.












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    10














85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    11


Category D: remote head is "obs-affected" locally, but result is not part of the push












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    12


TestCase 6: single changeset, superseeded then pruned (on a new changeset unpushed) changeset












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    13














85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    14


This is a partial push variation of case B-6












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    15














85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    16


.. old-state:












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    17


..












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    18


.. * 1 changeset branch












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    19


..












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    20


.. new-state:












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    21


..












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    22


.. * old branch is rewritten onto another one,












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    23


.. * the new version is then pruned.












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    24


..












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    25


.. expected-result:












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    26


..












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    27


.. * push denied












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    28


..












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    29


.. graph-summary:












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    30


..












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    31


..   A ø⇠⊗ A'












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    32


..     | |












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    33


.. C ◔ | ○ B












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    34


..    \|/












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    35


..     ●












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    36














85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    37


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












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    38














85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    39


Test setup












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    40


----------












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    41














85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    42


  $ mkdir D6












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    43


  $ cd D6












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    44


  $ setuprepos












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    45


  creating basic server and client repo












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    46


  updating to branch default












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    47


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












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    48


  $ cd client












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    49


  $ hg up 0












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    50


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












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    51


  $ mkcommit B0












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    52


  created new head












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    53


  $ mkcommit A1












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    54


  $ hg up '0'












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    55


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












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    56


  $ mkcommit C0












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    57


  created new head












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    58


  $ 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




    59


  1 new obsolescence markers







33542






b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets



Boris Feld <boris.feld@octobus.net>


parents: 
31989

diff
changeset




    60


  obsoleted 1 changesets







31989






85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    61


  $ hg debugobsolete --record-parents `getid "desc(A1)"`







42893






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



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


parents: 
35393

diff
changeset




    62


  1 new obsolescence markers







33542






b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets



Boris Feld <boris.feld@octobus.net>


parents: 
31989

diff
changeset




    63


  obsoleted 1 changesets







31989






85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    64


  $ hg log -G --hidden












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    65


  @  0f88766e02d6 (draft): C0












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    66


  |












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    67


  | x  ba93660aff8d (draft): A1












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    68


  | |












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    69


  | o  74ff5441d343 (draft): B0












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    70


  |/












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    71


  | x  8aaa48160adc (draft): A0












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    72


  |/












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    73


  o  1e4be0697311 (public): root












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    74


  












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    75














85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    76


Actual testing












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    77


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












85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    78














85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    79


  $ hg push --rev 'desc(C0)'







35393






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



Matt Harbison <matt_harbison@yahoo.com>


parents: 
33542

diff
changeset




    80


  pushing to $TESTTMP/D6/server







31989






85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    81


  searching for changes







45908






122f0b59f5f0
errors: remove trailing "!" in messages about creating new heads on push



Martin von Zweigbergk <martinvonz@google.com>


parents: 
42893

diff
changeset




    82


  abort: push creates new remote head 0f88766e02d6







31989






85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    83


  (merge or see 'hg help push' for details about pushing new heads)







46119






9261f6c1d39b
errors: raise StateError when push fails because it creates new heads



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45908

diff
changeset




    84


  [20]







31989






85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    85














85a22bc03d58
obsolescence: add test for the "branch replacement" logic during push, case D6



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


parents: 

diff
changeset




    86


  $ cd ../..














mercurial