def remote_ref(self, branch):
"""Returns the remote ref for 'git diff [local] [remote]'
"""
if branch == self.BRANCH_POINT:
# Compare against the branch point so find the merge-base
branch = gitcmds.current_branch()
tracked_branch = gitcmds.tracked_branch()
if tracked_branch:
return git.merge_base(branch, tracked_branch)
else:
remote_branches = gitcmds.branch_list(remote=True)
remote_branch = 'origin/%s' % branch
if remote_branch in remote_branches:
return git.merge_base(branch, remote_branch)
elif 'origin/master' in remote_branches:
return git.merge_base(branch, 'origin/master')
else:
return 'HEAD'
else:
# Compare against the remote branch
return branch
def merge_base(head, ref):
"""Given `ref`, return $(git merge-base ref HEAD)..ref."""
return git.merge_base(head, ref)[STDOUT]
def merge_base(head, ref):
"""Given `ref`, return $(git merge-base ref HEAD)..ref."""
return git.merge_base(head, ref)[STDOUT]
