revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

Handle problems when unable to push to origin/master

Browse source
This commit is contained in:
Christian Kühnel 2020-03-25 07:09:31 +01:00
parent 20e6680573
commit 2b3d0e127b
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/phabtalk/apply_patch2.py
View file

@ -23,7 +23,7 @@ import time
from typing import List, Optional, Tuple from typing import List, Optional, Tuple
from phabricator import Phabricator from phabricator import Phabricator
from git import Repo, BadName from git import Repo, BadName, GitCommandError
# FIXME: maybe move to config file # FIXME: maybe move to config file
@ -130,9 +130,14 @@ class ApplyPatch:
if 'upstream' not in self.repo.remotes: if 'upstream' not in self.repo.remotes:
self.repo.create_remote('upstream', url=LLVM_GITHUB_URL) self.repo.create_remote('upstream', url=LLVM_GITHUB_URL)
self.repo.remotes.upstream.fetch() self.repo.remotes.upstream.fetch()
self.repo.git.pull('origin', 'master')
self.repo.git.pull('upstream', 'master') self.repo.git.pull('upstream', 'master')
self.repo.git.push('origin', 'master') try:
print('refresh of master branch completed') self.repo.git.push('origin', 'master')
print('refresh of master branch completed')
except GitCommandError as e:
print('Error: could not push to origin master.')
print(e)
def _create_branch(self, base_revision: Optional[str]): def _create_branch(self, base_revision: Optional[str]):
self.repo.git.fetch('--all') self.repo.git.fetch('--all')