##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

revsetlang: do not pass in non-bytes to parse()...
revsetlang: do not pass in non-bytes to parse() Since parse() isn't a simple function, we shouldn't expect it would raise TypeError or ValueError for invalid inputs. Before, TypeError was raised at 'if pos != len(spec)', which was quite late to report an error. This patch also makes tokenize() detect invalid object before converting it to a py3-safe bytes. Spotted while adding the 'revset(...)' hack to _parsewith().
Boris Feld - - Load All Authors

File last commit:

r33542:b11e8c67 default
r37793:03d7f885 default
Show More
test-push-checkheads-superceed-A8.t
82 lines | 1.9 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-superceed-A8.t
History | Source | Raw |Copy content |Copy permalink
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case A8...
 r31981 ====================================
Testing head checking code: Case A-8
====================================
Mercurial checks for the introduction of new heads on push. Evolution comes
into play to detect if existing branches on the server are being replaced by
some of the new one we push.
This case is part of a series of tests checking this behavior.
Category A: simple case involving a branch being superceeded by another.
TestCase 8: single-changeset branch indirect rewrite
.. old-state:
..
.. * 1-changeset branch
..
.. new-state:
..
.. * 1-changeset branch succeeding to A, through another unpushed changesets
..
.. expected-result:
..
.. * push allowed
..
.. graph-summary:
..
.. A'
.. A ø⇠ø⇠◔ A''
.. |/ /
.. | /
.. |/
.. ●
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir A8
$ cd A8
$ setuprepos
creating basic server and client repo
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd client
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A1
created new head
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A2
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
 r33542 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case A8...
 r31981 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
 r33542 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case A8...
 r31981 $ hg log -G --hidden
@ c1f8d089020f (draft): A2
|
| x f6082bc4ffef (draft): A1
|/
| x 8aaa48160adc (draft): A0
|/
o 1e4be0697311 (public): root
Actual testing
--------------
$ hg push
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pushing to $TESTTMP/A8/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case A8...
 r31981 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
marmoute
obsolete: reports the number of local changeset obsoleted when unbundling...
 r33249 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case A8...
 r31981
$ cd ../..