Skip to content

[1/1]: Improve push comment when diff is empty#40

Merged
slinder1 merged 1 commit into
mainfrom
users/slinder1/I1125aa8a0ac19d682ddc1db1f2e5a837f1a35a4f
Apr 16, 2026
Merged

[1/1]: Improve push comment when diff is empty#40
slinder1 merged 1 commit into
mainfrom
users/slinder1/I1125aa8a0ac19d682ddc1db1f2e5a837f1a35a4f

Conversation

@slinder1
Copy link
Copy Markdown
Owner

@slinder1 slinder1 commented Apr 16, 2026

Change-Id: I1125aa8a0ac19d682ddc1db1f2e5a837f1a35a4f


Stack:

(Note: Closed and merged PRs may not be reflected here and PR numbering is not stable.)

@slinder1 slinder1 changed the title Improve push comment when diff is empty [1/1]: Improve push comment when diff is empty Apr 16, 2026
@slinder1
Copy link
Copy Markdown
Owner Author

🛠️ Initial changes (click to expand):
diff --git b/src/gd.rs a/src/gd.rs
@@ -1,7 +1,7 @@
 // Copyright © 2026 Advanced Micro Devices, Inc. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-use crate::change::{self, AnyChange, Change, Diff, LocalChange};
+use crate::change::{self, AnyChange, Change, LocalChange};
 use crate::cli;
 use crate::env;
 use crate::gh::{self, Pr, PrState};
@@ -151,13 +151,7 @@ fn push(cfg: &cli::Push) -> Result<()> {
     changes
         .par_iter()
         .zip(diffs)
-        .map(|(c, diff)| {
-            let (summary, body) = match diff {
-                Diff::InitialDiff(text) => ("Initial changes", text),
-                Diff::InterDiff(text) => ("Changes since last push", text),
-            };
-            c.pr.add_details_comment(summary.to_string(), format!("```diff\n{body}\n```"))
-        })
+        .map(|(c, diff)| c.pr.add_details_comment(&diff))
         .collect::<Result<Vec<_>>>()
         .context("could not add interdiff comments")?;
     changes
diff --git b/src/gh.rs a/src/gh.rs
@@ -1,7 +1,7 @@
 // Copyright © 2026 Advanced Micro Devices, Inc. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-use crate::change::LocalChange;
+use crate::change::{Diff, LocalChange};
 use crate::env;
 use crate::util::{Extract, exec};
 use anyhow::{Context, Result, bail};
@@ -144,10 +144,18 @@ impl Pr {
         Ok(())
     }
 
-    pub fn add_details_comment(&self, summary: String, body: String) -> Result<()> {
-        let comment = format!(
-            "<details>\n<summary>🛠️ {summary} (click to expand):</summary>\n\n{body}\n</details>"
-        );
+    pub fn add_details_comment(&self, diff: &Diff) -> Result<()> {
+        let (summary, changes) = match diff {
+            Diff::InitialDiff(text) => ("Initial changes", text),
+            Diff::InterDiff(text) => ("Changes since last push", text),
+        };
+        let comment = if changes.is_empty() {
+            format!("🛠️ {summary}: none (likely a rebase)")
+        } else {
+            format!(
+                "<details>\n<summary>🛠️ {summary} (click to expand):</summary>\n\n```diff\n{changes}\n```\n</details>"
+            )
+        };
         let mut body_arg = ArgInlineOrFile::new("body");
         let mut cmd = gh();
         let args = self.args_for("comment", [body_arg.arg(comment)?]);

@slinder1 slinder1 marked this pull request as ready for review April 16, 2026 16:36
@slinder1 slinder1 force-pushed the users/slinder1/I1125aa8a0ac19d682ddc1db1f2e5a837f1a35a4f branch from cd2c423 to 8569e55 Compare April 16, 2026 16:37
@slinder1
Copy link
Copy Markdown
Owner Author

🛠️ Changes since last push (click to expand):

Change-Id: I1125aa8a0ac19d682ddc1db1f2e5a837f1a35a4f
@slinder1 slinder1 force-pushed the users/slinder1/I1125aa8a0ac19d682ddc1db1f2e5a837f1a35a4f branch from 8569e55 to 02cdd71 Compare April 16, 2026 16:38
@slinder1
Copy link
Copy Markdown
Owner Author

🛠️ Changes since last push: none (likely a rebase)

@slinder1 slinder1 merged commit d3541c8 into main Apr 16, 2026
2 checks passed
@slinder1 slinder1 deleted the users/slinder1/I1125aa8a0ac19d682ddc1db1f2e5a837f1a35a4f branch April 16, 2026 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant