Merge remote-tracking branch 'carlos/push-url'

Author: jdavid

src/remote.c

@@ -505,7 +505,13 @@ PyDoc_STRVAR(Remote_url__doc__, "Url of the remote");
 PyObject *
 Remote_url__get__(Remote *self)
 {
-    return to_unicode(git_remote_url(self->remote), NULL, NULL);
+	const char *url;
+
+    url = git_remote_url(self->remote);
+    if (!url)
+        Py_RETURN_NONE;
+
+    return to_unicode(url, NULL, NULL);
 }
 
 
@@ -529,6 +535,42 @@ Remote_url__set__(Remote *self, PyObject* py_url)
     return -1;
 }
 
+PyDoc_STRVAR(Remote_push_url__doc__, "Push url of the remote");
+
+
+PyObject *
+Remote_push_url__get__(Remote *self)
+{
+	const char *url;
+
+    url = git_remote_pushurl(self->remote);
+    if (!url)
+        Py_RETURN_NONE;
+
+    return to_unicode(url, NULL, NULL);
+}
+
+
+int
+Remote_push_url__set__(Remote *self, PyObject* py_url)
+{
+    int err;
+    char* url = NULL;
+
+    url = py_str_to_c_str(py_url, NULL);
+    if (url != NULL) {
+        err = git_remote_set_pushurl(self->remote, url);
+        free(url);
+
+        if (err == GIT_OK)
+            return 0;
+
+        Error_set(err);
+    }
+
+    return -1;
+}
+
 
 PyDoc_STRVAR(Remote_refspec_count__doc__, "Number of refspecs.");
 
@@ -702,6 +744,7 @@ PyMethodDef Remote_methods[] = {
 PyGetSetDef Remote_getseters[] = {
     GETSET(Remote, name),
     GETSET(Remote, url),
+    GETSET(Remote, push_url),
     GETTER(Remote, refspec_count),
     {NULL}
 };

test/test_remote.py

@@ -51,6 +51,7 @@ def test_remote_create(self):
         self.assertEqual(type(remote), pygit2.Remote)
         self.assertEqual(name, remote.name)
         self.assertEqual(url, remote.url)
+        self.assertEqual(None, remote.push_url)
 
         self.assertRaises(ValueError, self.repo.create_remote, *(name, url))
 
@@ -75,6 +76,10 @@ def test_remote_set_url(self):
 
         self.assertRaisesAssign(ValueError, remote, 'url', '')
 
+        remote.push_url = new_url
+        self.assertEqual(new_url, remote.push_url)
+        self.assertRaisesAssign(ValueError, remote, 'push_url', '')
+
 
     def test_refspec(self):
         remote = self.repo.remotes[0]