[PATCH 4 of 9 hglib] hgclient: add update function

[Idan Kamara]

# HG changeset patch
# User Idan Kamara <idankk86 at gmail.com>
# Date 1311450939 -10800
# Node ID 6b7230607731fd92604e77408bd3dd08cf96c916
# Parent  6d82d657acd9aaf73b681f0a4c7933c78530496e
hgclient: add update function

diff -r 6d82d657acd9 -r 6b7230607731 hglib/error.py
--- a/hglib/error.py	Sat Jul 23 22:55:39 2011 +0300
+++ b/hglib/error.py	Sat Jul 23 22:55:39 2011 +0300
@@ -8,6 +8,10 @@
     def __str__(self):
         return ' '.join(self.args) + ': %r' % self.err
 
+class UncommittedLocalChangesError(CommandError):
+    def __init__(self, *args, **kwargs):
+        CommandError.__init__(self, *args, **kwargs)
+
 class ServerError(Exception):
     pass
 
diff -r 6d82d657acd9 -r 6b7230607731 hglib/hglib.py
--- a/hglib/hglib.py	Sat Jul 23 22:55:39 2011 +0300
+++ b/hglib/hglib.py	Sat Jul 23 22:55:39 2011 +0300
@@ -316,6 +316,29 @@
         if not output:
             return out
 
+    def update(self, rev=None, clean=False, check=False):
+        if clean and check:
+            raise ValueError('clean and check cannot both be True')
+
+        args = util.commandlinebuilder('update')
+        args.argif(rev, '-r', rev)
+        args.argif(clean, '-C')
+        args.argif(check, '-c')
+
+        ret, out, err = self.outputruncommand(args, raiseonerror=False)
+        if ret in (0, 1):
+            # filter out 'merging ...' lines
+            out = util.skiplines(out, 'merging ')
+
+            counters = out.split('\n')[0].split(', ')
+            assert len(counters) == 4
+            return tuple(int(s.split(' ', 1)[0]) for s in counters)
+        else:
+            if check and 'uncommitted local changes' in err:
+                raise error.UncommittedLocalChangesError(args, ret, out, err)
+            else:
+                raise error.CommandError(args, ret, out, err)
+
     def parents(self, rev=None):
         args = util.commandlinebuilder('parents')
         args.arg('--template', [templates.changeset])
diff -r 6d82d657acd9 -r 6b7230607731 tests/test-update.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-update.py	Sat Jul 23 22:55:39 2011 +0300
@@ -0,0 +1,74 @@
+import common
+from hglib import hglib, error
+
+class test_update(common.basetest):
+    def setUp(self):
+        common.basetest.setUp(self)
+        self.append('a', 'a')
+        self.rev0 = self.client.commit('first', addremove=True)
+        self.append('a', 'a')
+        self.rev1 = self.client.commit('second')
+
+    def test_basic(self):
+        u, m, r, ur = self.client.update(self.rev0)
+        self.assertEquals(u, 1)
+        self.assertEquals(m, 0)
+        self.assertEquals(r, 0)
+        self.assertEquals(ur, 0)
+
+    def test_unresolved(self):
+        self.client.update(self.rev0)
+        self.append('a', 'b')
+        u, m, r, ur = self.client.update()
+        self.assertEquals(u, 0)
+        self.assertEquals(m, 0)
+        self.assertEquals(r, 0)
+        self.assertEquals(ur, 1)
+        self.assertEquals(self.client.status()['M'][0], 'a')
+
+    def test_merge(self):
+        self.append('a', '\n\n\n\nb')
+        rev2 = self.client.commit('third')
+        self.append('a', 'b')
+        self.client.commit('fourth')
+        self.client.update(rev2)
+        old = open('a').read()
+        open('a', 'w').write('a' + old)
+        u, m, r, ur = self.client.update()
+        self.assertEquals(u, 0)
+        self.assertEquals(m, 1)
+        self.assertEquals(r, 0)
+        self.assertEquals(ur, 0)
+        self.assertEquals(self.client.status()['M'][0], 'a')
+
+    def test_tip(self):
+        self.client.update(self.rev0)
+        u, m, r, ur = self.client.update()
+        self.assertEquals(u, 1)
+        self.assertEquals(self.client.p1(), self.rev1)
+
+        self.client.update(self.rev0)
+        self.append('a', 'b')
+        rev2 = self.client.commit('new head')
+        self.client.update(self.rev0)
+
+        self.client.update()
+        self.assertEquals(self.client.p1(), rev2)
+
+    def test_check_clean(self):
+        self.assertRaises(ValueError, self.client.update, clean=True, check=True)
+
+    def test_check(self):
+        self.append('a', 'b')
+        self.assertRaises(error.UncommittedLocalChangesError,
+                          self.client.update, self.rev0, check=True)
+
+    def test_clean(self):
+        old = open('a').read()
+        self.append('a', 'b')
+        self.assertRaises(error.UncommittedLocalChangesError,
+                          self.client.update, check=True)
+
+        u, m, r, ur = self.client.update(clean=True)
+        self.assertEquals(u, 1)
+        self.assertEquals(old, open('a').read())