Mirrors_Framework/ardupilot
1
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot.git synced 2026-09-24 12:53:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tools: git-subsystems-split: do not label a subject twice

Browse Source 
build_template() removes one prefix from a subject before substituting
the subsystem in, so a subject which already named the subsystem after
its prefix ended up labelled twice: relabelling

  AP_HAL: hwdef: avoid shlex when splitting simple hwdef lines

for the hwdef subsystem gave "hwdef: hwdef: avoid shlex ...".

Collapse a repeated label when filling the template in, in both the
place which predicts a new subject for the plan and the place which
writes the message of a commit.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Peter Barker
2026-07-31 14:01:01 +10:00
committed by Peter Barker
co-authored by Claude Opus 5
parent 6d9068658c
commit db56aaff53
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/gittools/git-subsystems-split
+16 -3
View File
@@ -144,10 +144,23 @@ class GitSubsystemsSplit(object):
return subject.split(":", 1)[0].strip()
return None
def fill_template(self, template, subsystem):
'''substitute subsystem into a $subsystem template, labelling the
subject with it exactly once'''
message = template.replace("$subsystem", subsystem)
lines = message.splitlines()
prefix = subsystem + ":"
if lines and lines[0].startswith(prefix):
rest = lines[0][len(prefix):].lstrip()
while rest.startswith(prefix):
rest = rest[len(prefix):].lstrip()
lines[0] = f"{prefix} {rest}" if rest else prefix
return "\n".join(lines) + ("\n" if message.endswith("\n") else "")
def new_subject(self, subject, subsystem):
'''the subject a commit would get once labelled with subsystem'''
templated = self.build_template(subject).splitlines()[0]
return templated.replace("$subsystem", subsystem)
templated = self.build_template(subject)
return self.fill_template(templated, subsystem).splitlines()[0]
def make_message_file(self, git_dir, message):
'''write the (possibly templated) commit message to a file, honouring
@@ -248,7 +261,7 @@ class GitSubsystemsSplit(object):
def commit_group(self, subsystem, paths, template, author, date, msg_file):
'''stage the given paths and create a single commit for them'''
message = template.replace("$subsystem", subsystem)
message = self.fill_template(template, subsystem)
with open(msg_file, "w") as fh:
fh.write(message)
self.git(["reset", "--quiet"], capture=False)