ghstack 0.9.3__tar.gz → 0.9.4__tar.gz

{ghstack-0.9.3 → ghstack-0.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ghstack
-Version: 0.9.3
+Version: 0.9.4
 Summary: Stack diff support for GitHub
 Home-page: https://github.com/ezyang/ghstack
 License: MIT

{ghstack-0.9.3 → ghstack-0.9.4}/ghstack/cli.py

@@ -57,7 +57,9 @@ def cli_context(
 @click.option("--force", is_flag=True, hidden=True)
 @click.option("--no-skip", is_flag=True, hidden=True)
 @click.option("--draft", is_flag=True, hidden=True)
-@click.option("--direct", is_flag=True, hidden=True)
+@click.option(
+    "--direct/--no-direct", "direct_opt", is_flag=True, hidden=True, default=None
+)
 @click.option("--base", "-B", default=None, hidden=True)
 @click.option("--stack/--no-stack", "-s/-S", is_flag=True, default=True, hidden=True)
 def main(
@@ -67,7 +69,7 @@ def main(
     update_fields: bool,
     short: bool,
     force: bool,
-    direct: bool,
+    direct_opt: Optional[bool],
     no_skip: bool,
     draft: bool,
     base: Optional[str],
@@ -89,7 +91,7 @@ def main(
             draft=draft,
             base=base,
             stack=stack,
-            direct=direct,
+            direct_opt=direct_opt,
         )
 
 
@@ -226,7 +228,11 @@ def status(pull_request: str) -> None:
     "listed in the command line.",
 )
 @click.option(
-    "--direct", is_flag=True, help="Create stack that directly merges into master"
+    "--direct/--no-direct",
+    "direct_opt",
+    default=None,
+    is_flag=True,
+    help="Create stack that directly merges into master",
 )
 @click.argument(
     "revs",
@@ -240,7 +246,7 @@ def submit(
     force: bool,
     no_skip: bool,
     draft: bool,
-    direct: bool,
+    direct_opt: Optional[bool],
     base: Optional[str],
     revs: Tuple[str, ...],
     stack: bool,
@@ -264,7 +270,7 @@ def submit(
             base_opt=base,
             revs=revs,
             stack=stack,
-            direct=direct,
+            direct_opt=direct_opt,
         )
 
 

{ghstack-0.9.3 → ghstack-0.9.4}/ghstack/config.py

@@ -12,6 +12,9 @@ import requests
 
 import ghstack.logs
 
+DEFAULT_GHSTACKRC_PATH = Path.home() / ".ghstackrc"
+GHSTACKRC_PATH_VAR = "GHSTACKRC_PATH"
+
 Config = NamedTuple(
     "Config",
     [
@@ -41,6 +44,12 @@ Config = NamedTuple(
 )
 
 
+def get_path_from_env_var(var_name: str) -> Optional[Path]:
+    if (path := os.environ.get(var_name)) is not None:
+        return Path(path).expanduser().resolve()
+    return None
+
+
 def read_config(
     *,
     request_circle_token: bool = False,
@@ -60,7 +69,9 @@ def read_config(
 
     write_back = False
     if config_path is None:
-        config_path = os.path.expanduser("~/.ghstackrc")
+        config_path = str(
+            get_path_from_env_var(GHSTACKRC_PATH_VAR) or DEFAULT_GHSTACKRC_PATH
+        )
         write_back = True
 
     logging.debug(f"config_path = {config_path}")

{ghstack-0.9.3 → ghstack-0.9.4}/ghstack/github_utils.py

@@ -27,7 +27,7 @@ def get_github_repo_name_with_owner(
     # Grovel in remotes to figure it out
     remote_url = sh.git("remote", "get-url", remote_name)
     while True:
-        match = r"^git@{github_url}:([^/]+)/(.+?)(?:\.git)?$".format(
+        match = r"^git@{github_url}:/?([^/]+)/(.+?)(?:\.git)?$".format(
             github_url=github_url
         )
         m = re.match(match, remote_url)

{ghstack-0.9.3 → ghstack-0.9.4}/ghstack/submit.py

@@ -341,8 +341,8 @@ class Submitter:
 
     # Instead of merging into base branch, merge directly into the appropriate
     # main or head branch.  Change merge targets appropriately as PRs get
-    # merged
-    direct: bool = False
+    # merged.  If None, infer whether or not the PR should be direct or not.
+    direct_opt: Optional[bool] = None
 
     # ~~~~~~~~~~~~~~~~~~~~~~~~
     # Computed in post init
@@ -356,6 +356,8 @@ class Submitter:
 
     base: str = dataclasses.field(init=False)
 
+    direct: bool = dataclasses.field(init=False)
+
     # ~~~~~~~~~~~~~~~~~~~~~~~~
     # Mutable state; TODO: remove me
 
@@ -405,6 +407,18 @@ class Submitter:
 
         object.__setattr__(self, "base", default_branch)
 
+        # Check if direct should be used, if the user didn't explicitly
+        # specify an option
+        direct = self.direct_opt
+        if direct is None:
+            direct_r = self.sh.git(
+                "cat-file", "-e", "HEAD:.github/ghstack_direct", exitcode=True
+            )
+            assert isinstance(direct_r, bool)
+            direct = direct_r
+
+        object.__setattr__(self, "direct", direct)
+
     # ~~~~~~~~~~~~~~~~~~~~~~~~
     # The main algorithm
 
@@ -664,7 +678,6 @@ class Submitter:
         commits_to_submit: List[ghstack.git.CommitHeader],
         commits_to_rebase: List[ghstack.git.CommitHeader],
     ) -> Tuple[Dict[GitCommitHash, DiffMeta], Dict[GitCommitHash, GitCommitHash]]:
-
         # Prepare diffs in reverse topological order.
         # (Reverse here is important because we must have processed parents
         # first.)

{ghstack-0.9.3 → ghstack-0.9.4}/ghstack/test_prelude.py

@@ -201,7 +201,7 @@ def gh_submit(
         repo_owner_opt="pytorch",
         repo_name_opt="pytorch",
         short=short,
-        direct=self.direct,
+        direct_opt=self.direct,
         no_skip=no_skip,
         github_url="github.com",
         remote_name="origin",

{ghstack-0.9.3 → ghstack-0.9.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ghstack"
-version = "0.9.3"
+version = "0.9.4"
 authors = ["Edward Z. Yang <ezyang@mit.edu>"]
 description = "Stack diff support for GitHub"
 readme = "README.md"