Mercurial > public > mercurial-scm > python-hglib

annotate tests/test-pull.py @ 196:c586d02f7cda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
_readchannel: if a read failure is due to a broken server, report that We can end up in this codepath if the specified hg binary fails to start, and we're better off reporting that than the fact that we got no response.
author Augie Fackler <raf@durin42.com>
date Sun, 10 Dec 2017 12:50:57 -0500
parents c1b966866ed7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
148
c1b966866ed7 hglib: make all imports absolute (issue4520)
Brett Cannon <brett@python.org>
parents: 143
diff changeset
1 from tests import common
c1b966866ed7 hglib: make all imports absolute (issue4520)
Brett Cannon <brett@python.org>
parents: 143
diff changeset
2 import hglib
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
3 from hglib.util import b
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
4
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
5 class test_pull(common.basetest):
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
6 def test_basic(self):
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
7 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
8 self.client.commit(b('first'), addremove=True)
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
9
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
10 self.client.clone(dest=b('other'))
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
11 other = hglib.open(b('other'))
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
12
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
13 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
14 self.client.commit(b('second'))
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
15
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
16 self.assertTrue(other.pull())
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
17 self.assertEquals(self.client.log(), other.log())
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
18
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
19 def test_unresolved(self):
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
20 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
21 self.client.commit(b('first'), addremove=True)
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
22
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
23 self.client.clone(dest=b('other'))
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
24 other = hglib.open(b('other'))
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
25
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
26 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
27 self.client.commit(b('second'))
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
28
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
29 self.append('other/a', 'b')
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
30 self.assertFalse(other.pull(update=True))
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
31 self.assertTrue((b('M'), b('a')) in other.status())