forked from mirrors/gecko-dev
--HG-- rename : third_party/python/hglib/LICENSE => third_party/python/python-hglib/LICENSE rename : third_party/python/hglib/hglib/__init__.py => third_party/python/python-hglib/hglib/__init__.py rename : third_party/python/hglib/hglib/client.py => third_party/python/python-hglib/hglib/client.py rename : third_party/python/hglib/hglib/context.py => third_party/python/python-hglib/hglib/context.py rename : third_party/python/hglib/hglib/error.py => third_party/python/python-hglib/hglib/error.py rename : third_party/python/hglib/hglib/merge.py => third_party/python/python-hglib/hglib/merge.py rename : third_party/python/hglib/hglib/templates.py => third_party/python/python-hglib/hglib/templates.py rename : third_party/python/hglib/hglib/util.py => third_party/python/python-hglib/hglib/util.py rename : third_party/python/hglib/setup.py => third_party/python/python-hglib/setup.py extra : rebase_source : 552d93c9e90c04171c8b627c8f4f4fa5ec506cc3
31 lines
878 B
Python
31 lines
878 B
Python
from tests import common
|
|
import hglib
|
|
from hglib.util import b
|
|
|
|
class test_pull(common.basetest):
|
|
def test_basic(self):
|
|
self.append('a', 'a')
|
|
self.client.commit(b('first'), addremove=True)
|
|
|
|
self.client.clone(dest=b('other'))
|
|
other = hglib.open(b('other'))
|
|
|
|
self.append('a', 'a')
|
|
self.client.commit(b('second'))
|
|
|
|
self.assertTrue(other.pull())
|
|
self.assertEquals(self.client.log(), other.log())
|
|
|
|
def test_unresolved(self):
|
|
self.append('a', 'a')
|
|
self.client.commit(b('first'), addremove=True)
|
|
|
|
self.client.clone(dest=b('other'))
|
|
other = hglib.open(b('other'))
|
|
|
|
self.append('a', 'a')
|
|
self.client.commit(b('second'))
|
|
|
|
self.append('other/a', 'b')
|
|
self.assertFalse(other.pull(update=True))
|
|
self.assertTrue((b('M'), b('a')) in other.status())
|