Merge #7655

7655: Include a commit log summary in the changelog r=matklad a=lnicola

This version omits any direct pushes, and maybe even pull requests merged from the GitHub UI. But I think it makes writing the release notes easier.

Co-authored-by: Laurențiu Nicola <[email protected]>

2 files changed, 33 insertions, 25 deletions

diff --git a/docs/dev/README.md b/docs/dev/README.md
index 9b9b18102..d6fae5295 100644
--- a/docs/dev/README.md
+++ b/docs/dev/README.md
@@ -218,8 +218,7 @@ Release steps:
      * makes a GitHub release
      * pushes VS Code extension to the marketplace
    * create new changelog in `rust-analyzer.github.io`
-   * create `rust-analyzer.github.io/git.log` file with the log of merge commits since last release
-2. While the release is in progress, fill-in the changelog using `git.log`
+2. While the release is in progress, fill in the changelog
 3. Commit & push the changelog
 4. Tweet
 5. Inside `rust-analyzer`, run `cargo xtask promote` -- this will create a PR to rust-lang/rust updating rust-analyzer's submodule.
diff --git a/xtask/src/release.rs b/xtask/src/release.rs
index 93079b369..63556476d 100644
--- a/xtask/src/release.rs
+++ b/xtask/src/release.rs
@@ -1,3 +1,5 @@
+use std::fmt::Write;
+
 use xshell::{cmd, cp, pushd, read_dir, write_file};
 
 use crate::{codegen, date_iso, is_release_tag, project_root, Mode, Result};
@@ -24,6 +26,34 @@ impl ReleaseCmd {
         let commit = cmd!("git rev-parse HEAD").read()?;
         let changelog_n = read_dir(changelog_dir.as_path())?.len();
 
+        for &adoc in [
+            "manual.adoc",
+            "generated_assists.adoc",
+            "generated_config.adoc",
+            "generated_diagnostic.adoc",
+            "generated_features.adoc",
+        ]
+        .iter()
+        {
+            let src = project_root().join("./docs/user/").join(adoc);
+            let dst = website_root.join(adoc);
+            cp(src, dst)?;
+        }
+
+        let tags = cmd!("git tag --list").read()?;
+        let prev_tag = tags.lines().filter(|line| is_release_tag(line)).last().unwrap();
+
+        let git_log = cmd!("git log {prev_tag}..HEAD --merges --reverse").read()?;
+        let mut git_log_summary = String::new();
+        for line in git_log.lines() {
+            let line = line.trim_start();
+            if let Some(p) = line.find(':') {
+                if let Ok(pr) = line[..p].parse::<u32>() {
+                    writeln!(git_log_summary, "* pr:{}[]{}", pr, &line[p + 1..]).unwrap();
+                }
+            }
+        }
+
         let contents = format!(
             "\
 = Changelog #{}
@@ -40,39 +70,18 @@ https://github.com/sponsors/rust-analyzer[GitHub Sponsors].
 
 == New Features
 
-* pr:[] .
+{}
 
 == Fixes
 
 == Internal Improvements
 ",
-            changelog_n, commit, today
+            changelog_n, commit, today, git_log_summary
         );
 
         let path = changelog_dir.join(format!("{}-changelog-{}.adoc", today, changelog_n));
         write_file(&path, &contents)?;
 
-        for &adoc in [
-            "manual.adoc",
-            "generated_assists.adoc",
-            "generated_config.adoc",
-            "generated_diagnostic.adoc",
-            "generated_features.adoc",
-        ]
-        .iter()
-        {
-            let src = project_root().join("./docs/user/").join(adoc);
-            let dst = website_root.join(adoc);
-            cp(src, dst)?;
-        }
-
-        let tags = cmd!("git tag --list").read()?;
-        let prev_tag = tags.lines().filter(|line| is_release_tag(line)).last().unwrap();
-
-        let git_log = cmd!("git log {prev_tag}..HEAD --merges --reverse").read()?;
-        let git_log_dst = website_root.join("git.log");
-        write_file(git_log_dst, &git_log)?;
-
         Ok(())
     }
 }