Use "prefix" instead of "root_path" in write_archive

Author: gandalf013

pygit2/repository.py

@@ -31,7 +31,6 @@
 # Import from the Standard Library
 from string import hexdigits
 import sys, tarfile
-import os.path
 from time import time
 if sys.version_info[0] < 3:
     from cStringIO import StringIO
@@ -567,15 +566,14 @@ def favor_to_enum(favor):
     #
     # Utility for writing a tree into an archive
     #
-    def write_archive(self, treeish, archive, timestamp=None, root_path=None):
+    def write_archive(self, treeish, archive, timestamp=None, prefix=''):
         """Write treeish into an archive
 
         If no timestamp is provided and 'treeish' is a commit, its committer
         timestamp will be used. Otherwise the current time will be used.
 
-        If no root_path is provided, the archive will be created so that
-        extracting it will create files under root_path, instead of the current
-        directory (equivalent to "tar -C root_path ..." while extracting).
+        All path names in the archive are added to 'prefix', which defaults to
+        an empty string.
 
         Arguments:
 
@@ -585,8 +583,8 @@ def write_archive(self, treeish, archive, timestamp=None, root_path=None):
             An archive from the 'tarfile' module
         timestamp
             Timestamp to use for the files in the archive.
-        root_path
-            The path under which all the files will appear in the archive.
+        prefix
+            Extra prefix to add to the path names in the archive.
 
         Example::
 
@@ -615,17 +613,14 @@ def write_archive(self, treeish, archive, timestamp=None, root_path=None):
         if not timestamp:
             timestamp = int(time())
 
-        if root_path is None:
-            root_path = '.'
-
         tree = treeish.peel(Tree)
 
         index = Index()
         index.read_tree(tree)
 
         for entry in index:
             content = self[entry.id].read_raw()
-            info = tarfile.TarInfo(os.path.join(root_path, entry.path))
+            info = tarfile.TarInfo(prefix + entry.path)
             info.size = len(content)
             info.mtime = timestamp
             info.uname = info.gname = 'root' # just because git does this