Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Log git operations

Browse Source
This commit is contained in:
Michal Čihař 2012-03-01 16:10:08 +01:00
parent 412707d5d3
commit cdb0f0a570
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trans/models.py
View File

@ -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__())