xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename default branch to ‘main’

Browse source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-08-24 12:50:52 -07:00
parent 285a946a1f
commit 53e59c8c09
13 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tools/review
View file

@ -32,21 +32,21 @@ def check_git_pristine() -> None:
exit("Git is not pristine:\n" + output)
def ensure_on_clean_master() -> None:
def ensure_on_clean_main() -> None:
branch = get_git_branch()
if branch != "master":
if branch != "main":
exit(f"You are still on a feature branch: {branch}")
check_git_pristine()
run("git fetch upstream master")
run("git rebase upstream/master")
run("git fetch upstream main")
run("git rebase upstream/main")
def create_pull_branch(pull_id: int) -> None:
run("git fetch upstream pull/%d/head" % (pull_id,))
run(f"git checkout -B review-{pull_id} FETCH_HEAD")
run("git rebase upstream/master")
run("git log upstream/master.. --oneline")
run("git diff upstream/master.. --name-status")
run("git rebase upstream/main")
run("git log upstream/main.. --oneline")
run("git diff upstream/main.. --name-status")
print()
print("PR: %d" % (pull_id,))
@ -59,7 +59,7 @@ def review_pr() -> None:
except Exception:
exit("please provide an integer pull request id")
ensure_on_clean_master()
ensure_on_clean_main()
create_pull_branch(pull_id)