Add 'add' command to porcelain.

bin/dulwich

@@ -30,16 +30,10 @@ import os
 import sys
 from getopt import getopt
 
+from dulwich import porcelain
 from dulwich.client import get_transport_and_path
 from dulwich.errors import ApplyDeltaError
 from dulwich.index import Index
-from dulwich.porcelain import (
-    archive,
-    clone,
-    commit,
-    init,
-    update_server_info,
-    )
 from dulwich.pack import Pack, sha_to_hex
 from dulwich.patch import write_tree_diff
 from dulwich.repo import Repo
@@ -50,7 +44,14 @@ def cmd_archive(args):
     client, path = get_transport_and_path(args.pop(0))
     location = args.pop(0)
     committish = args.pop(0)
-    archive(location, committish, outstream=sys.stdout, errstream=sys.stderr)
+    porcelain.archive(location, committish, outstream=sys.stdout,
+        errstream=sys.stderr)
+
+
+def cmd_add(args):
+    opts, args = getopt(args, "", [])
+
+    porcelain.add(".", paths=args)
 
 
 def cmd_fetch_pack(args):
@@ -166,7 +167,7 @@ def cmd_init(args):
     else:
         path = args[0]
 
-    init(path, bare=("--bare" in opts))
+    porcelain.init(path, bare=("--bare" in opts))
 
 
 def cmd_clone(args):
@@ -183,17 +184,17 @@ def cmd_clone(args):
     else:
         target = None
 
-    clone(source, target, bare=("--bare" in opts))
+    porcelain.clone(source, target, bare=("--bare" in opts))
 
 
 def cmd_commit(args):
     opts, args = getopt(args, "", ["message"])
     opts = dict(opts)
-    commit(".", message=opts["--message"])
+    porcelain.commit(".", message=opts["--message"])
 
 
 def cmd_update_server_info(args):
-    update_server_info(".")
+    porcelain.update_server_info(".")
 
 
 commands = {

dulwich/porcelain.py

@@ -115,3 +115,14 @@ def clone(source, target=None, bare=False, outstream=sys.stdout):
         determine_wants=r.object_store.determine_wants_all,
         progress=outstream.write)
     r["HEAD"] = remote_refs["HEAD"]
+
+
+def add(repo=".", paths=None):
+    """Add files to the staging area.
+
+    :param repo: Repository for the files
+    :param paths: Paths to add
+    """
+    # FIXME: Support patterns, directories, no argument.
+    r = open_repo(repo)
+    r.stage(paths)

dulwich/tests/test_porcelain.py

@@ -24,11 +24,8 @@ import shutil
 import tarfile
 import tempfile
 
+from dulwich import porcelain
 from dulwich.porcelain import (
-    archive,
-    clone,
-    commit,
-    init,
     update_server_info,
     )
 from dulwich.repo import Repo
@@ -61,7 +58,8 @@ class ArchiveTests(PorcelainTestCase):
         self.repo.refs["refs/heads/master"] = c3.id
         out = StringIO()
         err = StringIO()
-        archive(self.repo.path, "refs/heads/master", outstream=out, errstream=err)
+        porcelain.archive(self.repo.path, "refs/heads/master", outstream=out,
+            errstream=err)
         self.assertEquals("", err.getvalue())
         tf = tarfile.TarFile(fileobj=out)
         self.addCleanup(tf.close)
@@ -71,29 +69,33 @@ class ArchiveTests(PorcelainTestCase):
 class UpdateServerInfoTests(PorcelainTestCase):
 
     def test_simple(self):
-        c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
+        c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
+            [3, 1, 2]])
         self.repo.refs["refs/heads/foo"] = c3.id
-        update_server_info(self.repo.path)
-        self.assertTrue(os.path.exists(os.path.join(self.repo.controldir(), 'info', 'refs')))
+        porcelain.update_server_info(self.repo.path)
+        self.assertTrue(os.path.exists(os.path.join(self.repo.controldir(),
+            'info', 'refs')))
 
 
 class CommitTests(PorcelainTestCase):
 
     def test_simple(self):
-        c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
+        c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
+            [3, 1, 2]])
         self.repo.refs["refs/heads/foo"] = c3.id
-        commit(self.repo.path, message="Some message")
+        porcelain.commit(self.repo.path, message="Some message")
 
 
 class CloneTests(PorcelainTestCase):
 
     def test_simple_local(self):
-        c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
+        c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
+            [3, 1, 2]])
         self.repo.refs["refs/heads/master"] = c3.id
         target_path = tempfile.mkdtemp()
         outstream = StringIO()
         self.addCleanup(shutil.rmtree, target_path)
-        clone(self.repo.path, target_path, outstream=outstream)
+        porcelain.clone(self.repo.path, target_path, outstream=outstream)
         self.assertEquals(Repo(target_path).head(), c3.id)
 
 
@@ -102,9 +104,20 @@ class InitTests(TestCase):
     def test_non_bare(self):
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
-        init(repo_dir)
+        porcelain.init(repo_dir)
 
     def test_bare(self):
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
-        init(repo_dir, bare=True)
+        porcelain.init(repo_dir, bare=True)
+
+
+class AddTests(PorcelainTestCase):
+
+    def test_add_file(self):
+        f = open(os.path.join(self.repo.path, 'foo'), 'w')
+        try:
+            f.write("BAR")
+        finally:
+            f.close()
+        porcelain.add(".", paths=["foo"])