460d10262d
If fast-export did not complete successfully the error handling code
itself would error out.
This was broken in commit 23b093ee0 (Brandon Casey, Wed Jun 9 2010,
Remove python 2.5'isms). Revert that commit an introduce our own copy
of check_call in util.py instead.
Tested by changing 'if retcode' to 'if not retcode' temporarily.
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
62 lines
1.6 KiB
Python
62 lines
1.6 KiB
Python
import os
|
|
import subprocess
|
|
|
|
from git_remote_helpers.util import check_call, die, warn
|
|
|
|
|
|
class NonLocalGit(object):
|
|
"""Handler to interact with non-local repos.
|
|
"""
|
|
|
|
def __init__(self, repo):
|
|
"""Creates a new non-local handler for the specified repo.
|
|
"""
|
|
|
|
self.repo = repo
|
|
|
|
def clone(self, base):
|
|
"""Clones the non-local repo to base.
|
|
|
|
Does nothing if a clone already exists.
|
|
"""
|
|
|
|
path = os.path.join(self.repo.get_base_path(base), '.git')
|
|
|
|
# already cloned
|
|
if os.path.exists(path):
|
|
return path
|
|
|
|
os.makedirs(path)
|
|
args = ["git", "clone", "--bare", "--quiet", self.repo.gitpath, path]
|
|
|
|
check_call(args)
|
|
|
|
return path
|
|
|
|
def update(self, base):
|
|
"""Updates checkout of the non-local repo in base.
|
|
"""
|
|
|
|
path = os.path.join(self.repo.get_base_path(base), '.git')
|
|
|
|
if not os.path.exists(path):
|
|
die("could not find repo at %s", path)
|
|
|
|
args = ["git", "--git-dir=" + path, "fetch", "--quiet", self.repo.gitpath]
|
|
check_call(args)
|
|
|
|
args = ["git", "--git-dir=" + path, "update-ref", "refs/heads/master", "FETCH_HEAD"]
|
|
child = check_call(args)
|
|
|
|
def push(self, base):
|
|
"""Pushes from the non-local repo to base.
|
|
"""
|
|
|
|
path = os.path.join(self.repo.get_base_path(base), '.git')
|
|
|
|
if not os.path.exists(path):
|
|
die("could not find repo at %s", path)
|
|
|
|
args = ["git", "--git-dir=" + path, "push", "--quiet", self.repo.gitpath, "--all"]
|
|
child = check_call(args)
|