Mercurial > public > mercurial-scm > python-hglib
view tests/test-outgoing-incoming.py @ 173:8c4d24b58c23 2.1
tests: adjust test-merge for mercurial 3.7
As of changeset 88d5db4b155c, the noninteractive handler for merge
leaves conflicting files unresolved.
author | Julien Cristau <julien.cristau@logilab.fr> |
---|---|
date | Fri, 19 Feb 2016 19:16:30 +0100 |
parents | c1b966866ed7 |
children |
line wrap: on
line source
from tests import common import hglib from hglib.util import b class test_outgoing_incoming(common.basetest): def test_no_path(self): self.assertRaises(hglib.error.CommandError, self.client.incoming) def test_empty(self): self.client.clone(dest=b('other')) self.other = hglib.open(b('other')) self.assertEquals(self.other.incoming(), []) self.assertEquals(self.other.outgoing(), []) def test_basic(self): self.append('a', 'a') self.client.commit(b('first'), addremove=True) self.append('a', 'a') self.client.commit(b('second')) self.client.clone(dest=b('other')) other = hglib.open(b('other')) self.assertEquals(self.client.log(), other.log()) self.assertEquals(self.client.outgoing(path=b('other')), other.incoming()) self.append('a', 'a') rev, node = self.client.commit(b('third')) out = self.client.outgoing(path=b('other')) self.assertEquals(len(out), 1) self.assertEquals(out[0].node, node) self.assertEquals(out, other.incoming()) def test_bookmarks(self): self.append('a', 'a') self.client.commit(b('first'), addremove=True) self.append('a', 'a') self.client.commit(b('second')) self.client.clone(dest=b('other')) other = hglib.open(b('other')) self.client.bookmark(b('bm1'), 1) self.assertEquals(other.incoming(bookmarks=True), [(b('bm1'), self.client.tip().node[:12])]) self.assertEquals(self.client.outgoing(path=b('other'), bookmarks=True), [(b('bm1'), self.client.tip().node[:12])])