23b093ee08
The following python 2.5 features were worked around:
* the sha module is used as a fallback when the hashlib module is
not available
* the 'any' built-in method was replaced with a 'for' loop
* a conditional expression was replaced with an 'if' statement
* the subprocess.check_call method was replaced by a call to
subprocess.Popen followed by a call to subprocess.wait with a
check of its return status
These changes allow the python infrastructure to be used with python 2.4
which is distributed with RedHat's RHEL 5, for example.
t5800 was updated to check for python >= 2.4 to reflect these changes.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
41 lines
1.1 KiB
Python
41 lines
1.1 KiB
Python
import os
|
|
import subprocess
|
|
|
|
|
|
class GitImporter(object):
|
|
"""An importer for testgit repositories.
|
|
|
|
This importer simply delegates to git fast-import.
|
|
"""
|
|
|
|
def __init__(self, repo):
|
|
"""Creates a new importer for the specified repo.
|
|
"""
|
|
|
|
self.repo = repo
|
|
|
|
def do_import(self, base):
|
|
"""Imports a fast-import stream to the given directory.
|
|
|
|
Simply delegates to git fast-import.
|
|
"""
|
|
|
|
dirname = self.repo.get_base_path(base)
|
|
if self.repo.local:
|
|
gitdir = self.repo.gitpath
|
|
else:
|
|
gitdir = os.path.abspath(os.path.join(dirname, '.git'))
|
|
path = os.path.abspath(os.path.join(dirname, 'git.marks'))
|
|
|
|
if not os.path.exists(dirname):
|
|
os.makedirs(dirname)
|
|
|
|
args = ["git", "--git-dir=" + gitdir, "fast-import", "--quiet", "--export-marks=" + path]
|
|
|
|
if os.path.exists(path):
|
|
args.append("--import-marks=" + path)
|
|
|
|
child = subprocess.Popen(args)
|
|
if child.wait() != 0:
|
|
raise CalledProcessError
|