ghstack 0.11.0__tar.gz → 0.12.0__tar.gz

{ghstack-0.11.0 → ghstack-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ghstack
-Version: 0.11.0
+Version: 0.12.0
 Summary: Stack diff support for GitHub
 Author: Edward Z. Yang
 Author-email: Edward Z. Yang <ezyang@mit.edu>
@@ -14,7 +14,7 @@ Requires-Dist: requests>=2,<3
 Requires-Dist: typing-extensions>=3
 Requires-Dist: click>=8,<9
 Requires-Dist: flake8>=7.0.0,<8.0.0
-Requires-Python: >=3.8.1, <4.0.0
+Requires-Python: >=3.9.1, <4.0.0
 Project-URL: repository, https://github.com/ezyang/ghstack
 Description-Content-Type: text/markdown
 
@@ -28,7 +28,7 @@ uv tool install ghstack
 
 ghstack is tested with 
 [several different Python versions](https://github.com/ezyang/ghstack/blob/master/.github/workflows/test.yml#L13). 
-It requires at least Python 3.8.1.
+It requires at least Python 3.9.1.
 
 ## How to setup
 

{ghstack-0.11.0 → ghstack-0.12.0}/README.md

@@ -8,7 +8,7 @@ uv tool install ghstack
 
 ghstack is tested with 
 [several different Python versions](https://github.com/ezyang/ghstack/blob/master/.github/workflows/test.yml#L13). 
-It requires at least Python 3.8.1.
+It requires at least Python 3.9.1.
 
 ## How to setup
 

{ghstack-0.11.0 → ghstack-0.12.0}/pyproject.toml

@@ -3,7 +3,7 @@ authors = [
     {name = "Edward Z. Yang", email = "ezyang@mit.edu"},
 ]
 license = {text = "MIT"}
-requires-python = "<4.0.0,>=3.8.1"
+requires-python = "<4.0.0,>=3.9.1"
 dependencies = [
     "aiohttp<4,>=3",
     "importlib-metadata>=1.4; python_version < \"3.8\"",
@@ -13,7 +13,7 @@ dependencies = [
     "flake8<8.0.0,>=7.0.0",
 ]
 name = "ghstack"
-version = "0.11.0"
+version = "0.12.0"
 description = "Stack diff support for GitHub"
 readme = "README.md"
 classifiers = [

ghstack-0.12.0/src/ghstack/cherry_pick.py

@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+
+import logging
+import re
+
+import ghstack.github
+import ghstack.github_utils
+import ghstack.shell
+
+
+def main(
+    pull_request: str,
+    github: ghstack.github.GitHubEndpoint,
+    sh: ghstack.shell.Shell,
+    remote_name: str,
+    stack: bool = False,
+) -> None:
+
+    params = ghstack.github_utils.parse_pull_request(
+        pull_request, sh=sh, remote_name=remote_name
+    )
+    head_ref = github.get_head_ref(**params)
+    orig_ref = re.sub(r"/head$", "/orig", head_ref)
+    if orig_ref == head_ref:
+        logging.warning(
+            "The ref {} doesn't look like a ghstack reference".format(head_ref)
+        )
+
+    sh.git("fetch", "--prune", remote_name)
+
+    if stack:
+        # Cherry-pick the entire stack from merge-base to the commit
+        remote_orig_ref = remote_name + "/" + orig_ref
+
+        # Find the merge-base with the main branch
+        repo_info = ghstack.github_utils.get_github_repo_info(
+            github=github,
+            sh=sh,
+            github_url=params["github_url"],
+            remote_name=remote_name,
+        )
+        main_branch = f"{remote_name}/{repo_info['default_branch']}"
+
+        # Get merge-base between the commit and main branch
+        merge_base = sh.git("merge-base", main_branch, remote_orig_ref).strip()
+
+        # Get all commits from merge-base to the target commit
+        commit_list = (
+            sh.git("rev-list", "--reverse", f"{merge_base}..{remote_orig_ref}")
+            .strip()
+            .split("\n")
+        )
+
+        if not commit_list or commit_list == [""]:
+            raise RuntimeError("No commits found to cherry-pick in the specified range")
+
+        logging.info(f"Cherry-picking {len(commit_list)} commits from stack")
+        for commit in commit_list:
+            sh.git("cherry-pick", commit)
+            logging.info(f"Cherry-picked {commit}")
+    else:
+        # Cherry-pick just the single commit
+        remote_orig_ref = remote_name + "/" + orig_ref
+        sh.git("cherry-pick", remote_orig_ref)
+        logging.info(f"Cherry-picked {orig_ref}")

{ghstack-0.11.0 → ghstack-0.12.0}/src/ghstack/cli.py

@@ -7,6 +7,7 @@ import click
 import ghstack
 import ghstack.action
 import ghstack.checkout
+import ghstack.cherry_pick
 import ghstack.circleci_real
 import ghstack.config
 import ghstack.github_real
@@ -126,6 +127,28 @@ def checkout(pull_request: str) -> None:
         )
 
 
+@main.command("cherry-pick")
+@click.option(
+    "--stack",
+    "-s",
+    is_flag=True,
+    help="Cherry-pick all commits from the commit to the merge-base with main branch",
+)
+@click.argument("pull_request", metavar="PR")
+def cherry_pick(stack: bool, pull_request: str) -> None:
+    """
+    Cherry-pick a PR
+    """
+    with cli_context(request_github_token=False) as (shell, config, github):
+        ghstack.cherry_pick.main(
+            pull_request=pull_request,
+            github=github,
+            sh=shell,
+            remote_name=config.remote_name,
+            stack=stack,
+        )
+
+
 @main.command("land")
 @click.option("--force", is_flag=True, help="force land even if the PR is closed")
 @click.argument("pull_request", metavar="PR")

{ghstack-0.11.0 → ghstack-0.12.0}/src/ghstack/github_real.py

@@ -224,6 +224,10 @@ permissions.  Please create a new OAuth token at
 https://{github_url}/settings/tokens and DOUBLE CHECK that you checked
 "public_repo" for permissions, and update ~/.ghstackrc with your new
 value.
+
+Another possible reason for this error is if the repository has moved
+to a new location or been renamed. Check that the repository URL is
+still correct.
 """.format(
                         url=url, github_url=self.github_url
                     )

{ghstack-0.11.0 → ghstack-0.12.0}/src/ghstack/github_utils.py

@@ -77,20 +77,43 @@ def get_github_repo_info(
         name_with_owner = {"owner": repo_owner, "name": repo_name}
 
     # TODO: Cache this guy
-    repo = github.graphql(
-        """
-        query ($owner: String!, $name: String!) {
-            repository(name: $name, owner: $owner) {
-                id
-                isFork
-                defaultBranchRef {
-                    name
+    try:
+        repo = github.graphql(
+            """
+            query ($owner: String!, $name: String!) {
+                repository(name: $name, owner: $owner) {
+                    id
+                    isFork
+                    defaultBranchRef {
+                        name
+                    }
                 }
-            }
-        }""",
-        owner=name_with_owner["owner"],
-        name=name_with_owner["name"],
-    )["data"]["repository"]
+            }""",
+            owner=name_with_owner["owner"],
+            name=name_with_owner["name"],
+        )["data"]["repository"]
+    except RuntimeError as e:
+        # Check if this is a repository access error (NOT_FOUND)
+        error_msg = str(e)
+        if (
+            "Could not resolve to a Repository" in error_msg
+            and "NOT_FOUND" in error_msg
+        ):
+            raise RuntimeError(
+                f"Original error: {error_msg}\n\n"
+                f"Could not access repository '{name_with_owner['owner']}/{name_with_owner['name']}'. "
+                f"This usually means:\n"
+                f"1. The repository is private and your OAuth token doesn't have access\n"
+                f"2. The repository is in a different organization that hasn't granted access\n"
+                f"3. The repository doesn't exist or has been moved\n\n"
+                f"If this is a private repository or in a separate organization, you can grant access by:\n"
+                f"1. Delete the 'github_oauth' entry from your .ghstackrc file\n"
+                f"2. Run ghstack again to redo the OAuth flow\n"
+                f"3. Make sure to grant access to the appropriate organizations when prompted"
+            )
+        else:
+            # Re-raise the original error if it's not the repository access issue
+            raise
 
     return {
         "name_with_owner": name_with_owner,

{ghstack-0.11.0 → ghstack-0.12.0}/src/ghstack/submit.py

@@ -167,9 +167,7 @@ def strip_mentions(body: str) -> str:
     return RE_MENTION.sub(r"\1", body)
 
 
-STACK_HEADER = (
-    "Stack from [ghstack](https://github.com/ezyang/ghstack) (oldest at bottom)"
-)
+STACK_HEADER = f"Stack from [ghstack](https://github.com/ezyang/ghstack/tree/{ghstack.__version__}) (oldest at bottom)"
 
 
 def starts_with_bullet(body: str) -> bool:

{ghstack-0.11.0 → ghstack-0.12.0}/src/ghstack/test_prelude.py

@@ -12,6 +12,8 @@ from typing import Any, Callable, Iterator, List, Optional, Sequence, Tuple, Uni
 
 from expecttest import assert_expected_inline
 
+import ghstack.cherry_pick
+
 import ghstack.github
 import ghstack.github_fake
 import ghstack.github_utils
@@ -29,6 +31,7 @@ __all__ = [
     "gh_submit",
     "gh_land",
     "gh_unlink",
+    "gh_cherry_pick",
     "GitCommitHash",
     "checkout",
     "amend",
@@ -237,6 +240,17 @@ def gh_unlink() -> None:
     )
 
 
+def gh_cherry_pick(pull_request: str, stack: bool = False) -> None:
+    self = CTX
+    return ghstack.cherry_pick.main(
+        pull_request=pull_request,
+        github=self.github,
+        sh=self.sh,
+        remote_name="origin",
+        stack=stack,
+    )
+
+
 def write_file_and_add(filename: str, contents: str) -> None:
     self = CTX
     with self.sh.open(filename, "w") as f: