diff options
Diffstat (limited to 'gitautodeploy')
| -rw-r--r-- | gitautodeploy/gitautodeploy.py | 6 | ||||
| -rw-r--r-- | gitautodeploy/wrappers/git.py | 43 |
2 files changed, 43 insertions, 6 deletions
diff --git a/gitautodeploy/gitautodeploy.py b/gitautodeploy/gitautodeploy.py index 2a3b27e..4cdfa0d 100644 --- a/gitautodeploy/gitautodeploy.py +++ b/gitautodeploy/gitautodeploy.py @@ -98,12 +98,8 @@ class GitAutoDeploy(object): for repo_config in self._config['repositories']: if os.path.isdir(repo_config['path']) and os.path.isdir(repo_config['path']+'/.git'): - # Pull repository - logger.debug("Repository %s already present and will be updated" % repo_config['url']) - GitWrapper.pull(repo_config) + GitWrapper.init(repo_config) else: - # Clone repository - logger.info("Repository %s not present and needs to be cloned" % repo_config['url']) GitWrapper.clone(repo_config) def ssh_key_scan(self): diff --git a/gitautodeploy/wrappers/git.py b/gitautodeploy/wrappers/git.py index 4ccd863..9bca474 100644 --- a/gitautodeploy/wrappers/git.py +++ b/gitautodeploy/wrappers/git.py @@ -6,6 +6,46 @@ class GitWrapper(): pass @staticmethod + def init(repo_config): + """Init remote url of the repo from the git server""" + import logging + from process import ProcessWrapper + import os + import platform + + logger = logging.getLogger() + logger.info("Initializing repository %s" % repo_config['path']) + + commands = [] + + # On Windows, bash command needs to be run using bash.exe. This assumes bash.exe + # (typically installed under C:\Program Files\Git\bin) is in the system PATH. + if platform.system().lower() == "windows": + commands.append('bash -c "cd \\"' + repo_config['path'] + '\\" && unset GIT_DIR"') + else: + commands.append('unset GIT_DIR') + + commands.append('git remote set-url ' + repo_config['remote'] + " " + repo_config['url']) + commands.append('git fetch ' + repo_config['remote']) + commands.append('git checkout -f -B ' + repo_config['branch'] + ' -t ' + repo_config['remote'] + '/' + repo_config['branch']) + commands.append('git submodule update --init --recursive') + + # All commands need to success + for command in commands: + res = ProcessWrapper().call(command, cwd=repo_config['path'], shell=True) + + if res != 0: + logger.error("Command '%s' failed with exit code %s" % (command, res)) + break + + if res == 0 and os.path.isdir(repo_config['path']): + logger.info("Repository %s successfully initialized" % repo_config['path']) + else: + logger.error("Unable to init repository %s" % repo_config['path']) + + return int(res) + + @staticmethod def pull(repo_config): """Pulls the latest version of the repo from the git server""" import logging @@ -25,7 +65,8 @@ class GitWrapper(): else: commands.append('unset GIT_DIR') - commands.append('git checkout -f -B ' + repo_config['branch'] + ' -t ' + repo_config['remote'] + '/' + repo_config['branch']) + commands.append('git fetch ' + repo_config['remote']) + commands.append('git reset --hard ' + repo_config['remote'] + "/" + repo_config['branch']) commands.append('git submodule update --init --recursive') # All commands need to success |