From cdb0f0a5700a7f85b43c31aa872f24d8e43e7858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 1 Mar 2012 16:10:08 +0100 Subject: [PATCH] Log git operations --- trans/models.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/trans/models.py b/trans/models.py index 8798fa494..b2be32753 100644 --- a/trans/models.py +++ b/trans/models.py @@ -129,9 +129,11 @@ class SubProject(models.Model): Updates current branch to match remote (if possible). ''' repo = self.get_repo() + logger.info('pulling from remote repo %s', self.__unicode__()) repo.remotes.origin.pull() try: repo.git.merge('origin/%s' % self.branch) + logger.info('merged remote into repo %s', self.__unicode__()) except: repo.git.merge('--abort') logger.warning('failed merge on repo %s', self.__unicode__())