From fce90ce2859b480a74f3413551214015e6d9b389 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Thu, 30 Jan 2025 15:22:45 +0100 Subject: [PATCH] vcs: don't assume that the base rev has a single child In case of branching or history rewrite, `{base_rev}~-1` is ambiguous and causes an error. --- src/taskgraph/util/vcs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/taskgraph/util/vcs.py b/src/taskgraph/util/vcs.py index 2d88f54b9..0b2db6a6f 100644 --- a/src/taskgraph/util/vcs.py +++ b/src/taskgraph/util/vcs.py @@ -281,7 +281,7 @@ def get_changed_files( return self.run("status", "--no-status", f"-{df}").splitlines() else: template = self._files_template(diff_filter) - revision_argument = rev if base_rev is None else f"{base_rev}~-1::{rev}" + revision_argument = rev if base_rev is None else f"{rev} % {base_rev}" return self.run("log", "-r", revision_argument, "-T", template).splitlines() def get_outgoing_files(self, diff_filter="ADM", upstream=None):