From bf060aeceb84f390117c633672e281097feb81e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Rodri=CC=81guez=20Troitin=CC=83o?=
 <drodrigueztroitino@yahoo.es>
Date: Fri, 17 May 2013 22:56:38 +0200
Subject: [PATCH] Implement Branch.rename.

---
 src/branch.c        | 27 +++++++++++++++++++++++++++
 src/branch.h        |  1 +
 test/test_branch.py | 30 ++++++++++++++++++++++++++++--
 3 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/src/branch.c b/src/branch.c
index 579c253..a3b4c78 100644
--- a/src/branch.c
+++ b/src/branch.c
@@ -79,9 +79,36 @@ Branch_is_head(Branch *self)
 }
 
 
+PyDoc_STRVAR(Branch_rename__doc__,
+  "rename(name, force=False)\n"
+  "\n"
+  "Move/rename an existing local branch reference. The new branch name will be "
+  "checked for validity.\n"
+  "Returns the new branch.");
+
+PyObject* Branch_rename(Branch *self, PyObject *args)
+{
+    int err, force = 0;
+    git_reference *c_out;
+    const char *c_name;
+
+    CHECK_REFERENCE(self);
+
+    if (!PyArg_ParseTuple(args, "s|i", &c_name, &force))
+        return NULL;
+
+    err = git_branch_move(&c_out, self->reference, c_name, force);
+    if (err == GIT_OK)
+        return wrap_branch(c_out, self->repo);
+    else
+        return Error_set(err);
+}
+
+
 PyMethodDef Branch_methods[] = {
     METHOD(Branch, delete, METH_NOARGS),
     METHOD(Branch, is_head, METH_NOARGS),
+    METHOD(Branch, rename, METH_VARARGS),
     {NULL}
 };
 
diff --git a/src/branch.h b/src/branch.h
index 2c42b76..ee1185e 100644
--- a/src/branch.h
+++ b/src/branch.h
@@ -34,6 +34,7 @@
 
 PyObject* Branch_delete(Branch *self, PyObject *args);
 PyObject* Branch_is_head(Branch *self);
+PyObject* Branch_move(Branch *self, PyObject *args);
 
 PyObject* wrap_branch(git_reference *c_reference, Repository *repo);
 
diff --git a/test/test_branch.py b/test/test_branch.py
index 6f3f2d1..eebf1e0 100644
--- a/test/test_branch.py
+++ b/test/test_branch.py
@@ -38,6 +38,7 @@ LAST_COMMIT = '2be5719152d4f82c7302b1c0932d8e5f0a4a0e98'
 I18N_LAST_COMMIT = '5470a671a80ac3789f1a6a8cefbcf43ce7af0563'
 ORIGIN_MASTER_COMMIT = '784855caf26449a1914d2cf62d12b9374d76ae78'
 
+
 class BranchesTestCase(utils.RepoTestCase):
     def test_lookup_branch_local(self):
         branch = self.repo.lookup_branch('master')
@@ -87,6 +88,28 @@ class BranchesTestCase(utils.RepoTestCase):
         branch = self.repo.lookup_branch('i18n')
         self.assertFalse(branch.is_head())
 
+    def test_branch_rename_succeeds(self):
+        original_branch = self.repo.lookup_branch('i18n')
+        new_branch = original_branch.rename('new-branch')
+        self.assertEqual(new_branch.target.hex, I18N_LAST_COMMIT)
+
+        new_branch_2 = self.repo.lookup_branch('new-branch')
+        self.assertEqual(new_branch_2.target.hex, I18N_LAST_COMMIT)
+
+    def test_branch_rename_fails_if_destination_already_exists(self):
+        original_branch = self.repo.lookup_branch('i18n')
+        self.assertRaises(ValueError, lambda: original_branch.rename('master'))
+
+    def test_branch_rename_not_fails_if_force_is_true(self):
+        original_branch = self.repo.lookup_branch('master')
+        new_branch = original_branch.rename('i18n', True)
+        self.assertEqual(new_branch.target.hex, LAST_COMMIT)
+
+    def test_branch_rename_fails_with_invalid_names(self):
+        original_branch = self.repo.lookup_branch('i18n')
+        self.assertRaises(ValueError,
+                          lambda: original_branch.rename('abc@{123'))
+
 
 class BranchesEmptyRepoTestCase(utils.EmptyRepoTestCase):
     def setUp(self):
@@ -96,10 +119,13 @@ class BranchesEmptyRepoTestCase(utils.EmptyRepoTestCase):
         remote.fetch()
 
     def test_lookup_branch_remote(self):
-        branch = self.repo.lookup_branch('origin/master', pygit2.GIT_BRANCH_REMOTE)
+        branch = self.repo.lookup_branch('origin/master',
+                                         pygit2.GIT_BRANCH_REMOTE)
         self.assertEqual(branch.target.hex, ORIGIN_MASTER_COMMIT)
 
-        self.assertTrue(self.repo.lookup_branch('origin/not-exists', pygit2.GIT_BRANCH_REMOTE) is None)
+        self.assertTrue(
+            self.repo.lookup_branch('origin/not-exists',
+                                    pygit2.GIT_BRANCH_REMOTE) is None)
 
     def test_listall_branches(self):
         branches = sorted(self.repo.listall_branches(pygit2.GIT_BRANCH_REMOTE))