openstack/deb-python-pygit2
Code Issues Proposed changes

support setting a detatched HEAD

Browse Source
This commit is contained in:
Jack O'Connor
2014-05-30 23:50:41 +09:00
parent a063867fe0
commit b190169f5e
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/repository.c
View File

@@ -179,21 +179,31 @@ Repository_head__get__(Repository *self)
}
int
Repository_head__set__(Repository *self, PyObject *py_refname)
Repository_head__set__(Repository *self, PyObject *py_val)
{
int err;
const char *refname;
PyObject *trefname;
if (PyObject_TypeCheck(py_val, &OidType)) {
git_oid oid;
py_oid_to_git_oid(py_val, &oid);
err = git_repository_set_head_detached(self->repo, &oid, NULL, NULL);
if (err < 0) {
Error_set(err);
return -1;
}
} else {
const char *refname;
PyObject *trefname;
refname = py_str_borrow_c_str(&trefname, py_refname, NULL);
if (refname == NULL)
return -1;
refname = py_str_borrow_c_str(&trefname, py_val, NULL);
if (refname == NULL)
return -1;
err = git_repository_set_head(self->repo, refname, NULL, NULL);
Py_DECREF(trefname);
if (err < 0) {
Error_set_str(err, refname);
return -1;
err = git_repository_set_head(self->repo, refname, NULL, NULL);
Py_DECREF(trefname);
if (err < 0) {
Error_set_str(err, refname);
return -1;
}
}
return 0;

9
test/test_repository.py
View File

@@ -70,6 +70,15 @@ class RepositoryTest(utils.BareRepoTestCase):
self.assertFalse(self.repo.head_is_unborn)
self.assertFalse(self.repo.head_is_detached)
def test_set_head(self):
# Test setting a detatched HEAD.
self.repo.head = Oid(hex=PARENT_SHA)
self.assertEqual(self.repo.head.target.hex, PARENT_SHA)
# And test setting a normal HEAD.
self.repo.head = "refs/heads/master"
self.assertEqual(self.repo.head.name, "refs/heads/master")
self.assertEqual(self.repo.head.target.hex, HEAD_SHA)
def test_read(self):
self.assertRaises(TypeError, self.repo.read, 123)
self.assertRaisesWithArg(KeyError, '1' * 40, self.repo.read, '1' * 40)