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-partial-C1.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:
32330
ab5f5429e3d2 tests: add missing 'test-push-checkheads-partial-C1.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset 
     1
 
====================================
ab5f5429e3d2 tests: add missing 'test-push-checkheads-partial-C1.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset 
     2
 
Testing head checking code: Case C-2
ab5f5429e3d2 tests: add missing 'test-push-checkheads-partial-C1.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset 
     3
 
====================================
ab5f5429e3d2 tests: add missing 'test-push-checkheads-partial-C1.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset 
     4
 












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




     5


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












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




     6


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












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




     7


some of the new one we push.












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




     8














ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




     9


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












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    10














ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    11


Category C: checking case were the branch is only partially obsoleted.












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    12


TestCase 1: 2 changeset branch, only the head is rewritten












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    13














ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    14


.. old-state:












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    15


..












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    16


.. * 2 changeset branch












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    17


..












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    18


.. new-state:












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    19


..







49168






5996640fc6fe
tests: fix misspelling of supersede



Anton Shestakov <av6@dwimlabs.net>


parents: 
46119

diff
changeset




    20


.. * 1 new changesets branches superseding only the head of the old one







32330






ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    21


.. * base of the old branch is still alive












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    22


..












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    23


.. expected-result:












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    24


..












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    25


.. * push denied












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    26


..












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    27


.. graph-summary:












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    28


..












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    29


..   B ø⇠◔ B'












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    30


..     | |












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    31


..   A ○ |












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    32


..     |/












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    33


..     ○












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    34














ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    35


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












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    36














ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    37


Test setup












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    38


----------












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    39














ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    40


  $ mkdir C1












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    41


  $ cd C1












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    42


  $ setuprepos












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    43


  creating basic server and client repo












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    44


  updating to branch default












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    45


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












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    46


  $ cd server












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    47


  $ mkcommit B0












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    48


  $ cd ../client












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    49


  $ hg pull







35393






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



Matt Harbison <matt_harbison@yahoo.com>


parents: 
34661

diff
changeset




    50


  pulling from $TESTTMP/C1/server







32330






ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    51


  searching for changes












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    52


  adding changesets












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    53


  adding manifests












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    54


  adding file changes












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    55


  added 1 changesets with 1 changes to 1 files







39480






89630d0b3e23
phase: report number of non-public changeset alongside the new range



Boris Feld <boris.feld@octobus.net>


parents: 
35393

diff
changeset




    56


  new changesets d73caddc5533 (1 drafts)







32330






ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    57


  (run 'hg update' to get a working copy)












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    58


  $ hg up 0












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    59


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












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    60


  $ mkcommit B1












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    61


  created new head












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    62


  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`







42893






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



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


parents: 
39480

diff
changeset




    63


  1 new obsolescence markers







33542






b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets



Boris Feld <boris.feld@octobus.net>


parents: 
32330

diff
changeset




    64


  obsoleted 1 changesets







32330






ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    65


  $ hg log -G --hidden












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    66


  @  25c56d33e4c4 (draft): B1












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    67


  |












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    68


  | x  d73caddc5533 (draft): B0












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    69


  | |












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    70


  | o  8aaa48160adc (draft): A0












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    71


  |/












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    72


  o  1e4be0697311 (public): root












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    73


  












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    74














ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    75


Actual testing












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    76


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












ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    77














ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    78


  $ hg push







35393






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



Matt Harbison <matt_harbison@yahoo.com>


parents: 
34661

diff
changeset




    79


  pushing to $TESTTMP/C1/server







32330






ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    80


  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




    81


  abort: push creates new remote head 25c56d33e4c4







32330






ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    82


  (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




    83


  [20]







32330






ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    84














ab5f5429e3d2
tests: add missing 'test-push-checkheads-partial-C1.t'



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


parents: 

diff
changeset




    85


  $ cd ../..














mercurial