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

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

context: stop catching RepoLookupError from namespace.singlenode()...
context: stop catching RepoLookupError from namespace.singlenode() As pointed out by Yuya, the RepoLookupError was there for catching errors from repo.branchtip(). However, since 885c0290f7d5 (localrepo: add ignoremissing parameter to branchtip, 2014-10-16), that should no longer happen. I think it should now be an error if a namespace raises a RepoLookupError, so we propagate the exception up and and make it easy to fix, rather than trying to interpret the changeid as nodeid prefix and raise a general "unknown revision '...'" error. I also don't think we should catch FilteredLookupError and LookupError from the changelog.rev() call, for the same reason as above: If a namespace returns a node that doesn't exist, we should provide a more helpful exception than "unknown revision '...'". Differential Revision: https://phab.mercurial-scm.org/D3145
Boris Feld - - Load All Authors

File last commit:

r33542:b11e8c67 default
r37409:3198d5a2 default
Show More
test-push-checkheads-superceed-A4.t
76 lines | 1.6 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-superceed-A4.t
History | Source | Raw |Copy content |Copy permalink
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case A4...
 r31977 ====================================
Testing head checking code: Case A-4
====================================
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 4: New changeset as children of the successor
.. old-state:
..
.. * 1-changeset branch
..
.. new-state:
..
.. * 2-changeset branch, first is a successor, but head is new
..
.. expected-result:
..
.. * push allowed
..
.. graph-summary:
..
.. ◔ B
.. |
.. A ø⇠◔ A'
.. |/
.. ●
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir A4
$ cd A4
$ 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 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 A4...
 r31977 $ mkcommit B0
$ hg log -G --hidden
@ f40ded968333 (draft): B0
|
o 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/A4/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case A4...
 r31977 searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
1 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 A4...
 r31977
$ cd ../../