Add Reference.raw_target()

Author: nabijaczleweli

src/reference.c

@@ -263,6 +263,23 @@ Reference_resolve(Reference *self, PyObject *args)
 }
 
 
+static PyObject *
+Reference_target_impl(Reference *self, const char ** c_name)
+{
+    CHECK_REFERENCE(self);
+
+    /* Case 1: Direct */
+    if (GIT_REF_OID == git_reference_type(self->reference))
+        return git_oid_to_python(git_reference_target(self->reference));
+
+    /* Case 2: Symbolic */
+    *c_name = git_reference_symbolic_target(self->reference);
+    if (*c_name == NULL)
+        PyErr_SetString(PyExc_ValueError, "no target available");
+
+    return NULL;
+}
+
 PyDoc_STRVAR(Reference_target__doc__,
     "The reference target: If direct the value will be an Oid object, if it\n"
     "is symbolic it will be an string with the full name of the target\n"
@@ -271,21 +288,35 @@ PyDoc_STRVAR(Reference_target__doc__,
 PyObject *
 Reference_target__get__(Reference *self)
 {
-    const char * c_name;
+    const char * c_name = NULL;
+    PyObject * ret;
+
+    ret = Reference_target_impl(self, &c_name);
+    if (ret != NULL)
+        return ret;
+    if (c_name != NULL)
+        return to_path(c_name);
+    return NULL;
+}
 
-    CHECK_REFERENCE(self);
 
-    /* Case 1: Direct */
-    if (GIT_REF_OID == git_reference_type(self->reference))
-        return git_oid_to_python(git_reference_target(self->reference));
+PyDoc_STRVAR(Reference_raw_target__doc__,
+    "The raw reference target: If direct the value will be an Oid object, if it\n"
+    "is symbolic it will be bytes with the full name of the target\n"
+    "reference.\n");
 
-    /* Case 2: Symbolic */
-    c_name = git_reference_symbolic_target(self->reference);
-    if (c_name == NULL) {
-        PyErr_SetString(PyExc_ValueError, "no target available");
-        return NULL;
-    }
-    return to_path(c_name);
+PyObject *
+Reference_raw_target__get__(Reference *self)
+{
+    const char * c_name = NULL;
+    PyObject * ret;
+
+    ret = Reference_target_impl(self, &c_name);
+    if (ret != NULL)
+        return ret;
+    if (c_name != NULL)
+        return PyBytes_FromString(c_name);
+    return NULL;
 }
 
 PyDoc_STRVAR(Reference_set_target__doc__,
@@ -634,6 +665,7 @@ PyGetSetDef Reference_getseters[] = {
     GETTER(Reference, shorthand),
     GETTER(Reference, raw_shorthand),
     GETTER(Reference, target),
+    GETTER(Reference, raw_target),
     GETTER(Reference, type),
     {NULL}
 };

test/test_refs.py

@@ -56,6 +56,7 @@ def test_refs_list(testrepo):
 def test_head(testrepo):
     head = testrepo.head
     assert LAST_COMMIT == testrepo[head.target].hex
+    assert LAST_COMMIT == testrepo[head.raw_target].hex
 
 def test_refs_getitem(testrepo):
     refname = 'refs/foo'
@@ -92,12 +93,15 @@ def test_refs_get_type(testrepo):
 def test_refs_get_target(testrepo):
     reference = testrepo.references.get('HEAD')
     assert reference.target == 'refs/heads/master'
+    assert reference.raw_target == b'refs/heads/master'
 
 def test_refs_set_target(testrepo):
     reference = testrepo.references.get('HEAD')
     assert reference.target == 'refs/heads/master'
+    assert reference.raw_target == b'refs/heads/master'
     reference.set_target('refs/heads/i18n')
     assert reference.target == 'refs/heads/i18n'
+    assert reference.raw_target == b'refs/heads/i18n'
 
 def test_refs_get_shorthand(testrepo):
     reference = testrepo.references.get('refs/heads/master')
@@ -108,11 +112,13 @@ def test_refs_get_shorthand(testrepo):
 def test_refs_set_target_with_message(testrepo):
     reference = testrepo.references.get('HEAD')
     assert reference.target == 'refs/heads/master'
+    assert reference.raw_target == b'refs/heads/master'
     sig = Signature('foo', 'bar')
     testrepo.set_ident('foo', 'bar')
     msg = 'Hello log'
     reference.set_target('refs/heads/i18n', message=msg)
     assert reference.target == 'refs/heads/i18n'
+    assert reference.raw_target == b'refs/heads/i18n'
     first = list(reference.log())[0]
     assert first.message == msg
     assert first.committer == sig
@@ -188,6 +194,7 @@ def test_refs_create_symbolic(testrepo):
     reference = testrepo.references.create('refs/tags/beta', 'refs/heads/master')
     assert reference.type == GIT_REF_SYMBOLIC
     assert reference.target == 'refs/heads/master'
+    assert reference.raw_target == b'refs/heads/master'
 
     # try to create existing symbolic reference
     with pytest.raises(ValueError):
@@ -198,6 +205,7 @@ def test_refs_create_symbolic(testrepo):
                                            force=True)
     assert reference.type == GIT_REF_SYMBOLIC
     assert reference.target == 'refs/heads/master'
+    assert reference.raw_target == b'refs/heads/master'
 
 #def test_packall_references(testrepo):
 #    testrepo.packall_references()
@@ -206,6 +214,7 @@ def test_refs_create_symbolic(testrepo):
 def test_refs_peel(testrepo):
     ref = testrepo.references.get('refs/heads/master')
     assert testrepo[ref.target].id == ref.peel().id
+    assert testrepo[ref.raw_target].id == ref.peel().id
 
     commit = ref.peel(Commit)
     assert commit.tree.id == ref.peel(Tree).id
@@ -359,12 +368,15 @@ def test_reference_get_type(testrepo):
 def test_get_target(testrepo):
     reference = testrepo.lookup_reference('HEAD')
     assert reference.target == 'refs/heads/master'
+    assert reference.raw_target == b'refs/heads/master'
 
 def test_set_target(testrepo):
     reference = testrepo.lookup_reference('HEAD')
     assert reference.target == 'refs/heads/master'
+    assert reference.raw_target == b'refs/heads/master'
     reference.set_target('refs/heads/i18n')
     assert reference.target == 'refs/heads/i18n'
+    assert reference.raw_target == b'refs/heads/i18n'
 
 def test_get_shorthand(testrepo):
     reference = testrepo.lookup_reference('refs/heads/master')
@@ -375,11 +387,13 @@ def test_get_shorthand(testrepo):
 def test_set_target_with_message(testrepo):
     reference = testrepo.lookup_reference('HEAD')
     assert reference.target == 'refs/heads/master'
+    assert reference.raw_target == b'refs/heads/master'
     sig = Signature('foo', 'bar')
     testrepo.set_ident('foo', 'bar')
     msg = 'Hello log'
     reference.set_target('refs/heads/i18n', message=msg)
     assert reference.target == 'refs/heads/i18n'
+    assert reference.raw_target == b'refs/heads/i18n'
     first = list(reference.log())[0]
     assert first.message == msg
     assert first.committer == sig
@@ -465,6 +479,7 @@ def test_create_symbolic_reference(testrepo):
                                       'refs/heads/master')
     assert reference.type == GIT_REF_SYMBOLIC
     assert reference.target == 'refs/heads/master'
+    assert reference.raw_target == b'refs/heads/master'
 
     # try to create existing symbolic reference
     with pytest.raises(AlreadyExistsError) as error:
@@ -476,6 +491,7 @@ def test_create_symbolic_reference(testrepo):
                                       'refs/heads/master', force=True)
     assert reference.type == GIT_REF_SYMBOLIC
     assert reference.target == 'refs/heads/master'
+    assert reference.raw_target == b'refs/heads/master'
 
 def test_create_invalid_reference(testrepo):
     repo = testrepo
@@ -493,6 +509,7 @@ def test_peel(testrepo):
     repo = testrepo
     ref = repo.lookup_reference('refs/heads/master')
     assert repo[ref.target].id == ref.peel().id
+    assert repo[ref.raw_target].id == ref.peel().id
 
     commit = ref.peel(Commit)
     assert commit.tree.id == ref.peel(Tree).id