Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename the master branch to main

Browse source
This commit is contained in:
Martin Robinson 2023-11-27 14:03:16 +01:00
parent 7bcb25c85c
commit 23add0c1e5
14 changed files with 47 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/wpt/exporter/github.py
View file

@ -74,7 +74,7 @@ class GithubRepository:
self, branch: GithubBranch
) -> Optional[PullRequest]:
"""If this repository has an open pull request with the
given source head reference targeting the master branch,
given source head reference targeting the main branch,
return the first matching pull request, otherwise return None."""
params = "+".join([
@ -105,7 +105,7 @@ class GithubRepository:
data = {
"title": title,
"head": branch.get_pr_head_reference_for_repo(self),
"base": "master",
"base": "main",
"body": body,
"maintainer_can_modify": False,
}

2
python/wpt/exporter/step.py
View file

@ -190,7 +190,7 @@ class CreateOrUpdateBranchForPRStep(Step):
return branch_name
finally:
try:
run.sync.local_wpt_repo.run("checkout", "master")
run.sync.local_wpt_repo.run("checkout", "main")
run.sync.local_wpt_repo.run("branch", "-D", branch_name)
except Exception:
pass

2
python/wpt/test.py
View file

@ -647,7 +647,7 @@ def setUpModule():
def setup_mock_repo(repo_name, local_repo):
subprocess.check_output(
["cp", "-R", "-p", os.path.join(TESTS_DIR, repo_name), local_repo.path])
local_repo.run("init", "-b", "master")
local_repo.run("init", "-b", "main")
local_repo.run("add", ".")
local_repo.run("commit", "-a", "-m", "Initial commit")

10
python/wpt/tests/closed.json
View file

@ -196,12 +196,12 @@
"forks": 1731,
"open_issues": 2072,
"watchers": 10131,
"default_branch": "master"
"default_branch": "main"
}
},
"base": {
"label": "servo:master",
"ref": "master",
"label": "servo:main",
"ref": "main",
"sha": "3b7a82b8c743bcbbefb6f25defd4cc132c25c348",
"user": {
"login": "servo",
@ -309,7 +309,7 @@
"forks": 1731,
"open_issues": 2072,
"watchers": 10131,
"default_branch": "master"
"default_branch": "main"
}
},
"_links": {
@ -439,7 +439,7 @@
"forks": 1731,
"open_issues": 2072,
"watchers": 10131,
"default_branch": "master"
"default_branch": "main"
},
"organization": {
"login": "servo",

10
python/wpt/tests/edited.json
View file

@ -43,8 +43,8 @@
"author_association": "OWNER",
"auto_merge": null,
"base": {
"label": "mrobinson:master",
"ref": "master",
"label": "mrobinson:main",
"ref": "main",
"repo": {
"allow_auto_merge": false,
"allow_forking": true,
@ -65,7 +65,7 @@
"contents_url": "https://api.github.com/repos/servo/servo/contents/{+path}",
"contributors_url": "https://api.github.com/repos/servo/servo/contributors",
"created_at": "2014-03-31T16:17:52Z",
"default_branch": "master",
"default_branch": "main",
"delete_branch_on_merge": false,
"deployments_url": "https://api.github.com/repos/servo/servo/deployments",
"description": "The Servo Browser Engine",
@ -218,7 +218,7 @@
"contents_url": "https://api.github.com/repos/servo/servo/contents/{+path}",
"contributors_url": "https://api.github.com/repos/servo/servo/contributors",
"created_at": "2014-03-31T16:17:52Z",
"default_branch": "master",
"default_branch": "main",
"delete_branch_on_merge": false,
"deployments_url": "https://api.github.com/repos/servo/servo/deployments",
"description": "The Servo Browser Engine",
@ -400,7 +400,7 @@
"contents_url": "https://api.github.com/repos/servo/servo/contents/{+path}",
"contributors_url": "https://api.github.com/repos/servo/servo/contributors",
"created_at": "2014-03-31T16:17:52Z",
"default_branch": "master",
"default_branch": "main",
"deployments_url": "https://api.github.com/repos/servo/servo/deployments",
"description": "The Servo Browser Engine",
"disabled": false,

10
python/wpt/tests/merged.json
View file

@ -203,12 +203,12 @@
"forks": 0,
"open_issues": 0,
"watchers": 0,
"default_branch": "master"
"default_branch": "main"
}
},
"base": {
"label": "servo:master",
"ref": "master",
"label": "servo:main",
"ref": "main",
"sha": "df0f9ad7ae6f10ffeaf5d40f4a2a25abadabf9cc",
"user": {
"login": "servo",
@ -323,7 +323,7 @@
"forks": 1810,
"open_issues": 2027,
"watchers": 10867,
"default_branch": "master"
"default_branch": "main"
}
},
"_links": {
@ -478,7 +478,7 @@
"forks": 1810,
"open_issues": 2027,
"watchers": 10867,
"default_branch": "master"
"default_branch": "main"
},
"organization": {
"login": "servo",

10
python/wpt/tests/opened-with-no-sync-signal.json
View file

@ -160,12 +160,12 @@
"forks": 1731,
"open_issues": 2073,
"watchers": 10131,
"default_branch": "master"
"default_branch": "main"
}
},
"base": {
"label": "servo:master",
"ref": "master",
"label": "servo:main",
"ref": "main",
"sha": "3b7a82b8c743bcbbefb6f25defd4cc132c25c348",
"user": {
"login": "servo",
@ -273,7 +273,7 @@
"forks": 1731,
"open_issues": 2073,
"watchers": 10131,
"default_branch": "master"
"default_branch": "main"
}
},
"_links": {
@ -403,7 +403,7 @@
"forks": 1731,
"open_issues": 2073,
"watchers": 10131,
"default_branch": "master"
"default_branch": "main"
},
"organization": {
"login": "servo",

10
python/wpt/tests/opened.json
View file

@ -160,12 +160,12 @@
"forks": 1731,
"open_issues": 2073,
"watchers": 10131,
"default_branch": "master"
"default_branch": "main"
}
},
"base": {
"label": "servo:master",
"ref": "master",
"label": "servo:main",
"ref": "main",
"sha": "3b7a82b8c743bcbbefb6f25defd4cc132c25c348",
"user": {
"login": "servo",
@ -273,7 +273,7 @@
"forks": 1731,
"open_issues": 2073,
"watchers": 10131,
"default_branch": "master"
"default_branch": "main"
}
},
"_links": {
@ -403,7 +403,7 @@
"forks": 1731,
"open_issues": 2073,
"watchers": 10131,
"default_branch": "master"
"default_branch": "main"
},
"organization": {
"login": "servo",

10
python/wpt/tests/synchronize-multiple.json
View file

@ -203,12 +203,12 @@
"forks": 0,
"open_issues": 0,
"watchers": 0,
"default_branch": "master"
"default_branch": "main"
}
},
"base": {
"label": "servo:master",
"ref": "master",
"label": "servo:main",
"ref": "main",
"sha": "df0f9ad7ae6f10ffeaf5d40f4a2a25abadabf9cc",
"user": {
"login": "servo",
@ -323,7 +323,7 @@
"forks": 1810,
"open_issues": 2027,
"watchers": 10867,
"default_branch": "master"
"default_branch": "main"
}
},
"_links": {
@ -462,7 +462,7 @@
"forks": 1810,
"open_issues": 2027,
"watchers": 10867,
"default_branch": "master"
"default_branch": "main"
},
"organization": {
"login": "servo",

10
python/wpt/tests/synchronize.json
View file

@ -203,12 +203,12 @@
"forks": 0,
"open_issues": 0,
"watchers": 0,
"default_branch": "master"
"default_branch": "main"
}
},
"base": {
"label": "servo:master",
"ref": "master",
"label": "servo:main",
"ref": "main",
"sha": "df0f9ad7ae6f10ffeaf5d40f4a2a25abadabf9cc",
"user": {
"login": "servo",
@ -323,7 +323,7 @@
"forks": 1810,
"open_issues": 2027,
"watchers": 10867,
"default_branch": "master"
"default_branch": "main"
}
},
"_links": {
@ -462,7 +462,7 @@
"forks": 1810,
"open_issues": 2027,
"watchers": 10867,
"default_branch": "master"
"default_branch": "main"
},
"organization": {
"login": "servo",