From 3490b544b4244e6491a2c48fe77b229997725491 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 20 Jun 2024 03:38:13 +1000 Subject: [PATCH] Have About dialog copy full Git commit hash to clipboard and use full hash in GitHub web app URI --- .../VersionInfoGenerator.cs | 5 +++-- References/BizHawk.SrcGen.VersionInfo.dll | Bin 10240 -> 10752 bytes src/BizHawk.Client.EmuHawk/BizBox.cs | 4 +--- src/BizHawk.Common/VersionInfo.cs | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ExternalProjects/BizHawk.SrcGen.VersionInfo/VersionInfoGenerator.cs b/ExternalProjects/BizHawk.SrcGen.VersionInfo/VersionInfoGenerator.cs index 62dcb4ff45..d9deaeabe2 100644 --- a/ExternalProjects/BizHawk.SrcGen.VersionInfo/VersionInfoGenerator.cs +++ b/ExternalProjects/BizHawk.SrcGen.VersionInfo/VersionInfoGenerator.cs @@ -49,7 +49,7 @@ public class VersionInfoGenerator : ISourceGenerator var rev = ExecuteGitWithArguments($"-C {projectDir} rev-list HEAD --count") ?? string.Empty; var branch = ExecuteGitWithArguments($"-C {projectDir} rev-parse --abbrev-ref HEAD") ?? "master"; - var shortHash = ExecuteGitWithArguments($"-C {projectDir} log -1 --format=\"%h\"") ?? "000000000"; + var hash = ExecuteGitWithArguments($"-C {projectDir} log -1 --format=\"%H\"") ?? "0000000000000000000000000000000000000000"; // Generated source code string source = $@"namespace BizHawk.Common @@ -58,7 +58,8 @@ public class VersionInfoGenerator : ISourceGenerator {{ public const string SVN_REV = ""{rev}""; public const string GIT_BRANCH = ""{branch}""; - public const string GIT_SHORTHASH = ""{shortHash}""; + public const string GIT_HASH = ""{hash}""; + public const string GIT_SHORTHASH = ""{hash.Substring(startIndex: 0, length: 9)}""; }} }} "; diff --git a/References/BizHawk.SrcGen.VersionInfo.dll b/References/BizHawk.SrcGen.VersionInfo.dll index 9934224fffb271a7e4b903ede013ab5e6be01de5..87cdf9c34b8c0c16178cb33a511f06a80a90997b 100644 GIT binary patch delta 3806 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 diff --git a/src/BizHawk.Client.EmuHawk/BizBox.cs b/src/BizHawk.Client.EmuHawk/BizBox.cs index 404c17869a..d0c1b638fc 100644 --- a/src/BizHawk.Client.EmuHawk/BizBox.cs +++ b/src/BizHawk.Client.EmuHawk/BizBox.cs @@ -58,9 +58,7 @@ namespace BizHawk.Client.EmuHawk => Process.Start((string) ((Control) sender).Tag); private void btnCopyHash_Click(object sender, EventArgs e) - { - Clipboard.SetText(VersionInfo.GIT_SHORTHASH); - } + => Clipboard.SetText(VersionInfo.GIT_HASH); private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) => Process.Start(VersionInfo.BizHawkContributorsListURI); diff --git a/src/BizHawk.Common/VersionInfo.cs b/src/BizHawk.Common/VersionInfo.cs index 5e8c3c0348..a9a8ba2e9e 100644 --- a/src/BizHawk.Common/VersionInfo.cs +++ b/src/BizHawk.Common/VersionInfo.cs @@ -41,7 +41,7 @@ namespace BizHawk.Common } public static (string Label, string TargetURI) GetGitCommitLink() - => ($"Commit :{GIT_BRANCH}@{GIT_SHORTHASH}", $"https://github.com/TASEmulators/BizHawk/commit/{GIT_SHORTHASH}"); + => ($"Commit :{GIT_BRANCH}@{GIT_SHORTHASH}", $"https://github.com/TASEmulators/BizHawk/commit/{GIT_HASH}"); public static string GetFullVersionDetails() {