Add porcelain for 'archive' command.

bin/dulwich

@@ -33,6 +33,7 @@ from getopt import getopt
 from dulwich.client import get_transport_and_path
 from dulwich.errors import ApplyDeltaError
 from dulwich.index import Index
+from dulwich.porcelain import archive
 from dulwich.pack import Pack, sha_to_hex
 from dulwich.patch import write_tree_diff
 from dulwich.repo import Repo
@@ -42,8 +43,9 @@ from dulwich.server import update_server_info
 def cmd_archive(args):
     opts, args = getopt(args, "", [])
     client, path = get_transport_and_path(args.pop(0))
+    location = args.pop(0)
     committish = args.pop(0)
-    client.archive(path, committish, sys.stdout.write, sys.stderr.write)
+    archive(location, committish, outstream=sys.stdout, errstream=sys.stderr)
 
 
 def cmd_fetch_pack(args):

dulwich/porcelain.py

@@ -0,0 +1,46 @@
+# porcelain.py -- Porcelain-like layer on top of Dulwich
+# Copyright (C) 2013 Jelmer Vernooij <jelmer@samba.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# or (at your option) a later version of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.
+
+import sys
+
+from dulwich.client import get_transport_and_path
+
+"""Simple wrapper that provides porcelain-like functions on top of Dulwich.
+
+Currently implemented:
+ * archive
+
+"""
+
+__docformat__ = 'restructuredText'
+
+
+def archive(location, committish=None, outstream=sys.stdout,
+            errstream=sys.stderr):
+    """Create an archive.
+
+    :param location: Location of repository for which to generate an archive.
+    :param committish: Commit SHA1 or ref to use
+    :param outstream: Output stream (defaults to stdout)
+    :param errstream: Error stream (defaults to stderr)
+    """
+
+    client, path = get_transport_and_path(location)
+    if committish is None:
+        committish = "HEAD"
+    client.archive(path, committish, outstream.write, errstream.write)

dulwich/tests/__init__.py

@@ -125,6 +125,7 @@ def self_test_suite():
         'missing_obj_finder',
         'pack',
         'patch',
+        'porcelain',
         'protocol',
         'repository',
         'server',

dulwich/tests/test_porcelain.py

@@ -0,0 +1,60 @@
+# test_porcelain.py -- porcelain tests
+# Copyright (C) 2013 Jelmer Vernooij <jelmer@samba.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 2
+# of the License or (at your option) a later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.
+
+"""Tests for dulwich.porcelain."""
+
+from cStringIO import StringIO
+import shutil
+import tarfile
+import tempfile
+
+from dulwich.porcelain import (
+    archive,
+    )
+from dulwich.repo import Repo
+from dulwich.tests.utils import (
+    make_object,
+    make_commit,
+    )
+from dulwich.tests import (
+    TestCase,
+    )
+from dulwich.tests.utils import (
+    build_commit_graph,
+    )
+
+
+class ArchiveTests(TestCase):
+    """Tests for the archive command."""
+
+    def setUp(self):
+        super(TestCase, self).setUp()
+        repo_dir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, repo_dir)
+        self.repo = Repo.init_bare(repo_dir)
+
+    def test_simple(self):
+        c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
+        self.repo.refs["refs/heads/master"] = c3.id
+        out = StringIO()
+        err = StringIO()
+        archive(self.repo.path, "refs/heads/master", outstream=out, errstream=err)
+        self.assertEquals("", err.getvalue())
+        tf = tarfile.TarFile(fileobj=out)
+        self.addCleanup(tf.close)
+        self.assertEquals([], tf.getnames())