AFPy/python-docs-fr
AFPy
/
python-docs-fr
5
6
Fork 44
Code Issues 22 Pull Requests 13 Projects Releases Wiki Activity

allow to specify any commit to merge.py #33

Merged
mdk merged 1 commits from ChristopheNan/python-docs-fr:pymerge_commit into 3.11 2023-02-12 10:36:19 +00:00
Conversation 1 Commits 1 Files Changed 1 +9 -3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
merge.py
View File

@ -29,14 +29,20 @@ def parse_args():
type=Path,
help="Use this given cpython clone.",
)
parser.add_argument("branch", help="Merge from this branch")
parser.add_argument(
"branch",
help="Merge from this branch or from this commit",
)
return parser.parse_args()
def setup_repo(repo_path: Path, branch: str):
"""Ensure we're up-to-date."""
run("git", "-C", repo_path, "checkout", branch)
run("git", "-C", repo_path, "pull", "--ff-only")
if branch.find('.') == 2:
run("git", "-C", repo_path, "checkout", branch)
run("git", "-C", repo_path, "pull", "--ff-only")
else: # it's a commit
run("git", "-C", repo_path, "checkout", branch)
def copy_new_files(new_files: set[Path], pot_path: Path) -> None: