Add parse_reflog_line.

dulwich/reflog.py

@@ -21,6 +21,7 @@
 
 from dulwich.objects import (
     format_timezone,
+    parse_timezone,
     ZERO_SHA,
     )
 
@@ -40,3 +41,17 @@ def format_reflog_line(old_sha, new_sha, committer, timestamp, timezone, message
     return (old_sha + b' ' + new_sha + b' ' + committer + b' ' +
             str(timestamp).encode('ascii') + b' ' +
             format_timezone(timezone).encode('ascii') + b'\t' + message)
+
+
+def parse_reflog_line(line):
+    """Parse a reflog line.
+
+    :param line: Line to parse
+    :return: Tuple of (old_sha, new_sha, committer, timestamp, timezone,
+        message)
+    """
+    (begin, message) = line.split('\t', 1)
+    (old_sha, new_sha, rest) = begin.split(' ', 2)
+    (committer, timestamp_str, timezone_str) = rest.rsplit(' ', 2)
+    return (old_sha, new_sha, committer, int(timestamp_str),
+            parse_timezone(timezone_str)[0], message)

dulwich/tests/test_reflog.py

@@ -21,16 +21,19 @@
 """Tests for dulwich.reflog."""
 
 
-from dulwich.reflog import format_reflog_line
+from dulwich.reflog import (
+    format_reflog_line,
+    parse_reflog_line,
+    )
 
 from dulwich.tests import (
     TestCase,
     )
 
 
-class FormatReflogLineTests(TestCase):
+class ReflogLineTests(TestCase):
 
-    def test_valid(self):
+    def test_format(self):
         self.assertEqual(
             b'0000000000000000000000000000000000000000 '
             b'49030649db3dfec5a9bc03e5dde4255a14499f16 Jelmer Vernooij '
@@ -53,3 +56,14 @@ class FormatReflogLineTests(TestCase):
                 b'Jelmer Vernooij <jelmer@jelmer.uk>',
                 1446552482, 0, b'clone: from git://jelmer.uk/samba'))
 
+    def test_parse(self):
+        self.assertEqual(
+                (b'0000000000000000000000000000000000000000',
+                 b'49030649db3dfec5a9bc03e5dde4255a14499f16',
+                 b'Jelmer Vernooij <jelmer@jelmer.uk>',
+                 1446552482, 0, b'clone: from git://jelmer.uk/samba'),
+                 parse_reflog_line(
+                     b'0000000000000000000000000000000000000000 '
+                     b'49030649db3dfec5a9bc03e5dde4255a14499f16 Jelmer Vernooij '
+                     b'<jelmer@jelmer.uk> 1446552482 +0000	'
+                     b'clone: from git://jelmer.uk/samba'))