From 768a4dfa0a715afbc55f92a33b22b8f28c08e754 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 22 Mar 2020 12:37:44 +0000 Subject: [PATCH] Another tweak to bin/mergeready - Legacy-Id: 17502 --- bin/mergeready | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/mergeready b/bin/mergeready index 28308caf7..2c3769ef7 100755 --- a/bin/mergeready +++ b/bin/mergeready @@ -328,7 +328,9 @@ for entry in ready: else: raise # - merge_path = os.path.join(*path.split(os.path.sep)[:4]) + dirs = path.split(os.path.sep) + dirs = dirs[:dirs.index('ietf')] if 'ietf' in dirs else dirs[:4] + merge_path = os.path.join(*dirs) if not (rev, repo, merge_path) in hold: output_line = "%s %-24s ^/%s@%s" % (when.strftime("%Y-%m-%d_%H:%MZ"), who+":", merge_path, rev) all_commits[when] = (rev, repo, branch, who, merge_path)