wip: fix broken phabricator submit test

Author: arxanas

git-branchless-submit/src/phabricator.rs

@@ -241,7 +241,7 @@ impl Forge for PhabricatorForge<'_> {
     fn query_status(
         &mut self,
         commit_set: CommitSet,
-    ) -> eyre::Result<std::result::Result<HashMap<NonZeroOid, CommitStatus>, ExitCode>> {
+    ) -> EyreExitOr<HashMap<NonZeroOid, CommitStatus>> {
         let commit_oids = self.dag.commit_set_to_vec(&commit_set)?;
         let commit_oid_to_revision: HashMap<NonZeroOid, Option<Id>> = commit_oids
             .into_iter()
@@ -319,7 +319,7 @@ impl Forge for PhabricatorForge<'_> {
         &mut self,
         commits: HashMap<NonZeroOid, CommitStatus>,
         options: &SubmitOptions,
-    ) -> eyre::Result<std::result::Result<HashMap<NonZeroOid, CreateStatus>, ExitCode>> {
+    ) -> EyreExitOr<HashMap<NonZeroOid, CreateStatus>> {
         let SubmitOptions {
             create: _,
             draft,
@@ -371,7 +371,9 @@ impl Forge for PhabricatorForge<'_> {
             TestCommand::Args(args.into_iter().map(ToString::to_string).collect())
         } else {
             TestCommand::String(
-                r#"(git show | grep 'BROKEN') && exit 1 || git commit --amend --message "$(git show --no-patch --format=%B HEAD)
+                // Convoluted way to check if the commit message contains the
+                // given string without a dependency on `grep`, etc.
+                r#"[ "$(git log --max-count=1 HEAD^..HEAD --grep='BROKEN')" != '' ] && exit 1 || git commit --amend --message "$(git show --no-patch --format=%B HEAD)
 
 Differential Revision: https://phabricator.example.com/D000$(git rev-list --count HEAD)
             "

git-branchless-submit/tests/test_phabricator_forge.rs

@@ -265,7 +265,7 @@ fn test_submit_phabricator_failure_commit() -> eyre::Result<()> {
         Stopped at d5bb8b5 (create test3.txt)
         branchless: processing 1 update: ref HEAD
         "###);
-        insta::assert_snapshot!(stdout, @r###"
+        insta::assert_snapshot!(stdout, @r"
         branchless: running command: <git-executable> diff --quiet
         Calling Git for on-disk rebase...
         branchless: running command: <git-executable> rebase --continue
@@ -274,7 +274,6 @@ fn test_submit_phabricator_failure_commit() -> eyre::Result<()> {
         branchless: running command: <git-executable> rebase --abort
         Failed (exit code 1): 5b9de4b BROKEN: test2.txt
         Stdout:
-            BROKEN: test2.txt
         Stderr:
         Attempting rebase in-memory...
         [1/3] Committed as: 55af3db create test1.txt
@@ -293,7 +292,7 @@ fn test_submit_phabricator_failure_commit() -> eyre::Result<()> {
         Failed to create 2 commits:
         5b9de4b BROKEN: test2.txt
         e9d3664 create test3.txt
-        "###);
+        ");
     }
 
     {