4e51ba238f
Upon receiving an "import" command, the testgit remote helper would ignore the ref asked for by git and generate a fast-export stream based on HEAD. Instead, we should actually give git the ref it asked for. This requires adding a new parameter to the export_repo method in the remote-helpers python library, which may be used by code outside of git.git. We use a default parameter so that callers without the new parameter will get the same behavior as before. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
59 lines
1.7 KiB
Python
59 lines
1.7 KiB
Python
import os
|
|
import subprocess
|
|
import sys
|
|
|
|
|
|
class GitExporter(object):
|
|
"""An exporter for testgit repositories.
|
|
|
|
The exporter simply delegates to git fast-export.
|
|
"""
|
|
|
|
def __init__(self, repo):
|
|
"""Creates a new exporter for the specified repo.
|
|
"""
|
|
|
|
self.repo = repo
|
|
|
|
def export_repo(self, base, refs=None):
|
|
"""Exports a fast-export stream for the given directory.
|
|
|
|
Simply delegates to git fast-epxort and pipes it through sed
|
|
to make the refs show up under the prefix rather than the
|
|
default refs/heads. This is to demonstrate how the export
|
|
data can be stored under it's own ref (using the refspec
|
|
capability).
|
|
|
|
If None, refs defaults to ["HEAD"].
|
|
"""
|
|
|
|
if not refs:
|
|
refs = ["HEAD"]
|
|
|
|
dirname = self.repo.get_base_path(base)
|
|
path = os.path.abspath(os.path.join(dirname, 'testgit.marks'))
|
|
|
|
if not os.path.exists(dirname):
|
|
os.makedirs(dirname)
|
|
|
|
print "feature relative-marks"
|
|
if os.path.exists(os.path.join(dirname, 'git.marks')):
|
|
print "feature import-marks=%s/git.marks" % self.repo.hash
|
|
print "feature export-marks=%s/git.marks" % self.repo.hash
|
|
sys.stdout.flush()
|
|
|
|
args = ["git", "--git-dir=" + self.repo.gitpath, "fast-export", "--export-marks=" + path]
|
|
|
|
if os.path.exists(path):
|
|
args.append("--import-marks=" + path)
|
|
|
|
args.extend(refs)
|
|
|
|
p1 = subprocess.Popen(args, stdout=subprocess.PIPE)
|
|
|
|
args = ["sed", "s_refs/heads/_" + self.repo.prefix + "_g"]
|
|
|
|
child = subprocess.Popen(args, stdin=p1.stdout)
|
|
if child.wait() != 0:
|
|
raise CalledProcessError
|