Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSayamindu Dasgupta <sayamindu@gmail.com>2010-01-09 09:14:26 (GMT)
committer Sayamindu Dasgupta <sayamindu@gmail.com>2010-01-09 09:14:26 (GMT)
commitbc2d071880a64e376f338458662768875ba9b68f (patch)
tree15ac44a08b805d43cbf51d2b2c8ed6c7b6f7dec7
parentc012733f8a208f6681b177c2f6f77339dd77e31f (diff)
Apply pull before push patch to translate 1.5.1
-rw-r--r--translate-toolkit-1.5.1/translate/storage/versioncontrol/git.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/translate-toolkit-1.5.1/translate/storage/versioncontrol/git.py b/translate-toolkit-1.5.1/translate/storage/versioncontrol/git.py
index 41f6410..817ac38 100644
--- a/translate-toolkit-1.5.1/translate/storage/versioncontrol/git.py
+++ b/translate-toolkit-1.5.1/translate/storage/versioncontrol/git.py
@@ -69,6 +69,13 @@ class git(GenericRevisionControlSystem):
def commit(self, message=None, author=None):
"""Commits the file and supplies the given commit message if present"""
+ # pull first.
+ # This is required since a lot of updates happen outside the po/ directory
+ # and git won't push unless those are pulled in
+ command = self._get_git_command(["pull"])
+ exitcode, output_pull, error = run_command(command, self.root_dir)
+ if exitcode != 0:
+ raise IOError("[GIT] pull failed (%s): %s" % (command, error))
# add the file
command = self._get_git_command(["add", self.location_rel])
exitcode, output_add, error = run_command(command, self.root_dir)
@@ -95,7 +102,7 @@ class git(GenericRevisionControlSystem):
if exitcode != 0:
raise IOError("[GIT] push of ('%s', '%s') failed: %s" \
% (self.root_dir, self.location_rel, error))
- return output_add + output_commit + output_push
+ return output_pull + output_add + output_commit + output_push
def getcleanfile(self, revision=None):
"""Get a clean version of a file from the git repository"""