From af38f3bcdbd52457b42c8fcd1c75bb2ed2fa8494 Mon Sep 17 00:00:00 2001
From: Richard Levasseur <rlevasseur@google.com>
Date: Mon, 30 Sep 2024 10:37:44 -0700
Subject: [PATCH] Add execution info to action conflict error message

The execution info is part of the action, so including it in the error message
makes the reported error easier to diagnose when two targets performing the
same action have different execution info.

PiperOrigin-RevId: 680633760
Change-Id: I6a93bf3584b5306456b712c84351145939c119b8
---
 .../devtools/build/lib/analysis/actions/SpawnAction.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
index d857f13e59105b..a917c9539f8438 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -403,6 +403,11 @@ public String describeKey() {
       message.append(ShellEscaper.escapeString(var));
       message.append('\n');
     }
+    for (Map.Entry<String, String> entry : getExecutionInfo().entrySet()) {
+      message.append("  Execution info: ");
+      message.append(entry.getKey()).append('=').append(entry.getValue());
+      message.append('\n');
+    }
     try {
       for (String argument : ShellEscaper.escapeAll(getArguments())) {
         message.append("  Argument: ");