pr submit: don't update closed PRs

Summary:
If a PR is not open (i.e. merged or closed), "sl pr submit" will now avoid updating it. Previously it didn't consider the PR's state.

We emit a warning and a hint pointing the user to "sl pr unlink" if they want to create a new PR. (After disassociating the commit from the existing PR, "sl pr submit" will create a new PR).

Fixes #474

Reviewed By: quark-zju

Differential Revision: D43208767

fbshipit-source-id: 964381a6fcb9de30b2751bb825509cca2fd68f69

Author: muirdm

eden/scm/edenscm/ext/github/__init__.py

@@ -41,6 +41,16 @@
 autopullpredicate = registrar.autopullpredicate()
 
 
+hint = registrar.hint()
+
+
+@hint("unlink-closed-pr")
+def unlink_closed_pr_hint() -> str:
+    return _(
+        "to create a new PR, disassociate commit(s) using '@prog@ pr unlink' then re-run '@prog@ pr submit'"
+    )
+
+
 def extsetup(ui):
     pr_status.setup_smartset_prefetch()
 

eden/scm/edenscm/ext/github/submit.py

@@ -9,7 +9,7 @@
 from enum import Enum
 from typing import Any, List, Optional, Tuple
 
-from edenscm import error, git
+from edenscm import error, git, hintutil
 from edenscm.i18n import _
 from edenscm.node import hex, nullid
 from edenscm.result import Result
@@ -273,6 +273,14 @@ async def rewrite_pull_request_body(
     )
     pr = head_commit_data.pr
     assert pr
+
+    if pr.state != PullRequestState.OPEN:
+        ui.status_err(
+            _("warning, not updating #%d because it isn't open\n") % pr.number
+        )
+        hintutil.triggershow(ui, "unlink-closed-pr")
+        return
+
     result = await gh_submit.update_pull_request(
         repository.hostname, pr.node_id, title, body, base
     )

eden/scm/tests/github/mock_existing_closed_pr.py

@@ -0,0 +1,37 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+from edenscm import extensions
+from edenscm.ext.github import submit
+from edenscm.ext.github.gh_submit import PullRequestState
+from edenscm.ext.github.mock_utils import mock_run_git_command, MockGitHubServer
+from ghstack import github_gh_cli
+
+
+def setup_mock_github_server(ui) -> MockGitHubServer:
+    github_server = MockGitHubServer()
+
+    github_server.expect_get_repository_request().and_respond()
+
+    pr_num = 42
+
+    github_server.expect_get_pr_details_request(pr_num).and_respond(
+        f"PR_id_{pr_num}", state=PullRequestState.CLOSED
+    )
+
+    github_server.expect_get_username_request().and_respond()
+
+    head = "782e8bee814295e5a3d41eee2e9d823ea83a7c13"
+    github_server.expect_merge_into_branch(head).and_respond()
+
+    return github_server
+
+
+def uisetup(ui):
+    mock_github_server = setup_mock_github_server(ui)
+    extensions.wrapfunction(
+        github_gh_cli, "_make_request", mock_github_server.make_request
+    )
+    extensions.wrapfunction(submit, "run_git_command", mock_run_git_command)

eden/scm/tests/test-ext-github-pr-submit-closed.t

@@ -0,0 +1,22 @@
+#chg-compatible
+#debugruntest-compatible
+#inprocess-hg-incompatible
+
+  $ enable github
+  $ export SL_TEST_GH_URL=https://github.com/facebook/test_github_repo.git
+  $ . $TESTDIR/git.sh
+  $ configure github.pr-workflow=single
+
+build up a github repo
+
+  $ sl init --git repo1
+  $ cd repo1
+  $ echo a > a1
+  $ sl ci -Aqm "Pull Request resolved: https://github.com/facebook/test_github_repo/pull/42"
+
+test we don't try updating a closed pr:
+
+  $ sl pr submit --config extensions.pr_submit=$TESTDIR/github/mock_existing_closed_pr.py
+  pushing 1 to https://github.com/facebook/test_github_repo.git
+  warning, not updating #42 because it isn't open
+  hint[unlink-closed-pr]: to create a new PR, disassociate commit(s) using 'sl pr unlink' then re-run 'sl pr submit'