# HG changeset patch # User Idan Kamara # Date 1313092718 -10800 # Node ID b4e5c8745ef3d2418787b809e697422572069e14 # Parent 85ae94b98324da4cf1a39b8a22cbd78a5542a4bb client: add missing options to outgoing diff -r 85ae94b98324 -r b4e5c8745ef3 hglib/client.py --- a/hglib/client.py Thu Aug 11 22:58:17 2011 +0300 +++ b/hglib/client.py Thu Aug 11 22:58:38 2011 +0300 @@ -340,9 +340,14 @@ return self._parserevs(out) - def outgoing(self, revrange=None, path=None): + def outgoing(self, revrange=None, path=None, force=False, newest=False, + bookmarks=False, branch=None, limit=None, nomerges=False, + subrepos=False): args = cmdbuilder('outgoing', - path, template=templates.changeset, rev=revrange) + path, + template=templates.changeset, r=revrange, + f=force, n=newest, B=bookmarks, + b=branch, S=subrepos) def eh(ret, out, err): if ret != 1: diff -r 85ae94b98324 -r b4e5c8745ef3 tests/test-outgoing-incoming.py --- a/tests/test-outgoing-incoming.py Thu Aug 11 22:58:17 2011 +0300 +++ b/tests/test-outgoing-incoming.py Thu Aug 11 22:58:38 2011 +0300 @@ -2,23 +2,33 @@ import hglib 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='other') + self.other = hglib.open('other') + + self.assertEquals(self.other.incoming(), []) + self.assertEquals(self.other.outgoing(), []) + def test_basic(self): self.append('a', 'a') self.client.commit('first', addremove=True) self.append('a', 'a') self.client.commit('second') - self.client.clone(dest='bar') - bar = hglib.open('bar') + self.client.clone(dest='other') + other = hglib.open('other') - self.assertEquals(self.client.log(), bar.log()) - self.assertEquals(self.client.outgoing(path='bar'), bar.incoming()) + self.assertEquals(self.client.log(), other.log()) + self.assertEquals(self.client.outgoing(path='other'), other.incoming()) self.append('a', 'a') rev, node = self.client.commit('third') - out = self.client.outgoing(path='bar') + out = self.client.outgoing(path='other') self.assertEquals(len(out), 1) self.assertEquals(out[0].node, node) - self.assertEquals(out, bar.incoming()) + self.assertEquals(out, other.incoming())