def __call__(self): check_root() uninited_modules = git_tool.get_uninited_submodules() if uninited_modules: display_uninited_modules_instructions(uninited_modules) return current_branch = get_current_branch() resolve_errors(git_tool.recurse_submodules(lambda: git_tool.fetch([current_branch])), **FETCH_HANDLING) resolve_errors(git_tool.recurse_submodules(lambda: git_tool.rebase_if_needed(current_branch)), **REBASE_HANDLING) resolve_errors(git_tool.fix_refs(), title="Fixing submodule references") resolve_errors(git_tool.recurse_submodules(git_tool.push), title="Pushing...")
def __call__(self, namespace): check_root() branch = get_current_branch() authors = Counter() if is_squashed_branch(branch): print "You are trying to submit a squashed branch doll, go back to the original branch, it'll surely work!" return squashed_branch = append_squashed_branch_suffix(branch) issue = issue_from_branchname(branch) issue = issue_tracker_tool.validate_issue(issue) title = issue.fields.summary title = "%s: %s" % (issue.key, title) uninited_modules = git_tool.get_uninited_submodules() if uninited_modules: display_uninited_modules_instructions(uninited_modules) return resolve_errors(git_tool.recurse_submodules(lambda: git_tool.fetch(['master'])), **FETCH_HANDLING) resolve_errors(git_tool.recurse_submodules(lambda: git_tool.rebase_if_needed('master')), **REBASE_HANDLING) def get_original_author(): if git_tool.is_branch_diverged('origin/master'): authors[git_tool.get_author()] += 1 list(git_tool.recurse_submodules(get_original_author)) author = authors.most_common(1)[0][0] if authors else None def create_squashed_branch(): git_tool.gitcmd(['branch', '-f', squashed_branch, branch]) return git_tool.gitcmd(['checkout', squashed_branch]) def squash(): ret = err = None if git_tool.is_branch_diverged('origin/master'): ret, err = git_tool.squash(title, author) return ret, err def push_and_back(): git_tool.gitcmd(['checkout', branch]) return git_tool.forcepush(squashed_branch) resolve_errors(git_tool.recurse_submodules(git_tool.forcepush), title="Pushing...") resolve_errors(git_tool.recurse_submodules(create_squashed_branch), title="Creating squashed branch...") resolve_errors(git_tool.recurse_submodules(squash), title="Squashing...") resolve_errors(git_tool.fix_refs(), title="Fixing refs...") resolve_errors(git_tool.recurse_submodules(push_and_back), title="Pushing squashed branch...") self.process(namespace, squashed_branch)
def __call__(self, checks=True, push=True): check_root() if checks: check_config() uninited_modules = git_tool.get_uninited_submodules() if uninited_modules: display_uninited_modules_instructions(uninited_modules) return resolve_errors(git_tool.recurse_submodules(lambda: git_tool.fetch(['master'])), **FETCH_HANDLING) resolve_errors(git_tool.recurse_submodules(lambda: git_tool.rebase_if_needed('master')), **REBASE_HANDLING) resolve_errors(git_tool.fix_refs(), title="Fixing submodule references") if push: resolve_errors(git_tool.recurse_submodules(git_tool.forcepush), title="Pushing...")