ghstack 0.9.1__tar.gz → 0.9.2__tar.gz

{ghstack-0.9.1 → ghstack-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ghstack
-Version: 0.9.1
+Version: 0.9.2
 Summary: Stack diff support for GitHub
 Home-page: https://github.com/ezyang/ghstack
 License: MIT
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiohttp (>=3,<4)
 Requires-Dist: click (>=8,<9)
+Requires-Dist: flake8 (>=7.0.0,<8.0.0)
 Requires-Dist: importlib-metadata (>=1.4) ; python_version < "3.8"
 Requires-Dist: requests (>=2,<3)
 Requires-Dist: typing-extensions (>=3,<5)

{ghstack-0.9.1 → ghstack-0.9.2}/ghstack/gpg_sign.py

@@ -11,6 +11,7 @@ This module will retain this behavior:
 We will attempt to sign as long as `commit.gpgsign` is true.
 If not key is configure, error will occur
 """
+
 from typing import Tuple, Union
 
 import ghstack.shell

{ghstack-0.9.1 → ghstack-0.9.2}/ghstack/rage.py

@@ -43,7 +43,7 @@ def main(latest: bool = False) -> None:
     if not latest:
         print("Which invocation would you like to report?")
         print()
-        for (i, fn) in enumerate(logs):
+        for i, fn in enumerate(logs):
             if next_index > 10:
                 break
 

{ghstack-0.9.1 → ghstack-0.9.2}/ghstack/shell.py

@@ -233,23 +233,16 @@ class Shell(object):
             return s
 
     @overload  # noqa: F811
-    def git(self, *args: str) -> str:
-        ...
+    def git(self, *args: str) -> str: ...
 
     @overload  # noqa: F811
-    def git(self, *args: str, input: str) -> str:
-
-        ...
+    def git(self, *args: str, input: str) -> str: ...
 
     @overload  # noqa: F811
-    def git(self, *args: str, input: str, env: Dict[str, str]) -> str:
-
-        ...
+    def git(self, *args: str, input: str, env: Dict[str, str]) -> str: ...
 
     @overload  # noqa: F811
-    def git(self, *args: str, **kwargs: Any) -> _SHELL_RET:
-
-        ...
+    def git(self, *args: str, **kwargs: Any) -> _SHELL_RET: ...
 
     def git(self, *args: str, **kwargs: Any) -> _SHELL_RET:  # noqa: F811
         """
@@ -288,16 +281,13 @@ class Shell(object):
         return self._maybe_rstrip(self.sh(*(("git",) + args), **kwargs))
 
     @overload  # noqa: F811
-    def hg(self, *args: str) -> str:
-        ...
+    def hg(self, *args: str) -> str: ...
 
     @overload  # noqa: F811
-    def hg(self, *args: str, input: str) -> str:
-        ...
+    def hg(self, *args: str, input: str) -> str: ...
 
     @overload  # noqa: F811
-    def hg(self, *args: str, **kwargs: Any) -> _SHELL_RET:
-        ...
+    def hg(self, *args: str, **kwargs: Any) -> _SHELL_RET: ...
 
     def hg(self, *args: str, **kwargs: Any) -> _SHELL_RET:  # noqa: F811
         """

{ghstack-0.9.1 → ghstack-0.9.2}/ghstack/submit.py

@@ -363,9 +363,9 @@ class Submitter:
     # did not exist on the stack at all), because they were associated
     # with a patch that contains no changes.  GhNumber may be false
     # if the diff was never associated with a PR.
-    ignored_diffs: List[
-        Tuple[ghstack.diff.Diff, Optional[DiffWithGitHubMetadata]]
-    ] = dataclasses.field(default_factory=list)
+    ignored_diffs: List[Tuple[ghstack.diff.Diff, Optional[DiffWithGitHubMetadata]]] = (
+        dataclasses.field(default_factory=list)
+    )
 
     # Set of seen ghnums
     seen_ghnums: Set[Tuple[str, GhNumber]] = dataclasses.field(default_factory=set)
@@ -692,9 +692,11 @@ class Submitter:
                 parent_commit,
                 parent_diff_meta,
                 diff,
-                self.elaborate_diff(diff)
-                if diff.pull_request_resolved is not None
-                else None,
+                (
+                    self.elaborate_diff(diff)
+                    if diff.pull_request_resolved is not None
+                    else None
+                ),
                 submit,
             )
             if diff_meta is not None:
@@ -952,9 +954,11 @@ to disassociate the commit with the pull request, and then try again.
                 [
                     f"{strip_mentions(diff.summary.rstrip())}\n\n",
                     f"ghstack-source-id: {diff.source_id}\n",
-                    f"ghstack-comment-id: {elab_diff.comment_id}\n"
-                    if self.direct
-                    else "",
+                    (
+                        f"ghstack-comment-id: {elab_diff.comment_id}\n"
+                        if self.direct
+                        else ""
+                    ),
                     f"Pull Request resolved: {pull_request_resolved.url()}",
                 ]
             )
@@ -1193,6 +1197,22 @@ is closed (likely due to being merged).  Please rebase to upstream and try again
                 base_args: List[str] = []
                 if push_branches.base.commit is not None:
                     base_args.extend(("-p", push_branches.base.commit.commit_id))
+                # We don't technically need to do this, but often tooling
+                # relies on pull requests being able to compute merge-base
+                # with the main branch.  While the result you get here can be
+                # misleading (in particular, the merge-base will not
+                # incorporate changes on base, and if a ghstack has been
+                # rebased backwards in time, the merge-base will be stuck
+                # on the more recent commit), it is useful so we put it in.
+                extra_base = self.sh.git("merge-base", base.commit_id, self.base)
+                if push_branches.base.commit is None or not self.sh.git(
+                    "merge-base",
+                    "--is-ancestor",
+                    extra_base,
+                    push_branches.base.commit.commit_id,
+                    exitcode=True,
+                ):
+                    base_args.extend(("-p", extra_base))
                 new_base = GitCommitHash(
                     self.sh.git(
                         "commit-tree",
@@ -1672,7 +1692,9 @@ is closed (likely due to being merged).  Please rebase to upstream and try again
             # Direct commit parent typically have base, as it will be the
             # main branch
             if not self.direct:
-                assert not base_commit.parents
+                pass
+                # This is now set to the orig base
+                # assert not base_commit.parents
 
         # 8. Head branch is not malformed
         assert self.sh.git(

{ghstack-0.9.1 → ghstack-0.9.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ghstack"
-version = "0.9.1"
+version = "0.9.2"
 authors = ["Edward Z. Yang <ezyang@mit.edu>"]
 description = "Stack diff support for GitHub"
 readme = "README.md"
@@ -23,10 +23,11 @@ python = "^3.8.1"
 requests = "^2"
 typing-extensions = ">=3 <5"
 click = "^8"
+flake8 = "^7.0.0"
 
 [tool.poetry.dev-dependencies]
-black = "^22.12.0"
-flake8 = "^6"
+black = "^24.3.0"
+flake8 = "^7"
 graphql-core = "^3"
 hypothesis = "^6"
 mypy = "^1"