On Sun, Jun 29, 2008 at 05:51:34PM +0200, Miklos Vajna <[EMAIL PROTECTED]> wrote: > I'll send a patch to correct this later tonight.
Could you try this one, please?
Index: translate/storage/versioncontrol/git.py
===================================================================
--- translate/storage/versioncontrol/git.py (revision 7679)
+++ translate/storage/versioncontrol/git.py (working copy)
@@ -39,17 +39,23 @@
"""
import os
return os.path.join(self.root_dir, self.RCS_METADIR)
+
+ def _get_git_command(self, args):
+ """prepends generic git arguments to conrete ones
+ """
+ command = ["git", "--git-dir", self._get_git_dir(), "--work-tree",
self.root_dir]
+ command.extend(args)
+ return command
def update(self, revision=None):
"""Does a clean update of the given path"""
# git checkout
- command = ["git", "--git-dir", self._get_git_dir(),
- "checkout", self.location_rel]
+ command = self._get_git_command(["checkout", self.location_rel])
exitcode, output_checkout, error = run_command(command)
if exitcode != 0:
raise IOError("[GIT] checkout failed (%s): %s" % (command, error))
# pull changes
- command = ["git", "--git-dir", self._get_git_dir(), "pull"]
+ command = self._get_git_command(["pull"])
exitcode, output_pull, error = run_command(command)
if exitcode != 0:
raise IOError("[GIT] pull failed (%s): %s" % (command, error))
@@ -58,14 +64,13 @@
def commit(self, message=None):
"""Commits the file and supplies the given commit message if present"""
# add the file
- command = ["git", "--git-dir", self._get_git_dir(),
- "add", self.location_rel]
+ command = self._get_git_command(["add", self.location_rel])
exitcode, output_add, error = run_command(command)
if exitcode != 0:
raise IOError("[GIT] add of ('%s', '%s') failed: %s" \
% (self.root_dir, self.location_rel, error))
# commit file
- command = ["git", "--git-dir", self._get_git_dir(), "commit"]
+ command = self._get_git_command(["commit"])
if message:
command.extend(["-m", message])
exitcode, output_commit, error = run_command(command)
@@ -73,7 +78,7 @@
raise IOError("[GIT] commit of ('%s', '%s') failed: %s" \
% (self.root_dir, self.location_rel, error))
# push changes
- command = ["git", "--git-dir", self._get_git_dir(), "push"]
+ command = self._get_git_command(["push"])
exitcode, output_push, error = run_command(command)
if exitcode != 0:
raise IOError("[GIT] push of ('%s', '%s') failed: %s" \
@@ -83,8 +88,7 @@
def getcleanfile(self, revision=None):
"""Get a clean version of a file from the git repository"""
# run git-show
- command = ["git", "--git-dir", self._get_git_dir(), "show",
- "HEAD:%s" % self.location_rel]
+ command = self._get_git_command(["show", "HEAD:%s" %
self.location_rel])
exitcode, output, error = run_command(command)
if exitcode != 0:
raise IOError("[GIT] 'show' failed for ('%s', %s): %s" \
pgpffv8ox0KWT.pgp
Description: PGP signature
------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php
_______________________________________________ Translate-pootle mailing list Translate-pootle@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/translate-pootle
