+ # Didn't find a Change-Id so try to get a commit message
+ # match on "blah" but only keep the blah
+ msg = self.regex_shortmsg1.search(pfile)
+ if msg and msg.group(2):
+ # logger.info("msg.groups 0: %s, 1: %s, 2: %s", msg.group(), msg.group(1), msg.group(2))
+ logger.info(
+ "trying with short commit-msg 1 from git.properties in %s: %s",
+ project,
+ msg.group(2),
+ )
+
+ gerrits = self.gerritquery.get_gerrits(project, msg=msg.group(2))
+ if gerrits:
+ logger.info(
+ "found Change-Id from git.properties short commit-msg 1 in %s",
+ project,
+ )
+ return ChangeId(gerrits[0]["id"], True)
+
+ msg_no_spaces = msg.group(2).replace(" ", "+")
+ logger.info(
+ "did not find Change-Id in %s, trying with commit-msg 1 (no spaces): %s",
+ project,
+ msg_no_spaces,
+ )
+
+ gerrits = self.gerritquery.get_gerrits(project, msg=msg_no_spaces)
+ if gerrits:
+ logger.info(
+ "found Change-Id from git.properties short commit-msg 1 (no spaces) in %s",
+ project,
+ )
+ return ChangeId(gerrits[0]["id"], True)
+
+ logger.info(
+ "did not find Change-Id from short commit message1 from git.properties in %s",
+ project,
+ )
+
+ # Didn't find a Change-Id so try to get a commit message
+ # match on "blah" but only keep the blah
+ msg = self.regex_shortmsg2.search(pfile)
+ if msg and msg.group(2):
+ logger.info(
+ "trying with short commit-msg 2 from git.properties in %s: %s",
+ project,
+ msg.group(2),
+ )
+
+ gerrits = self.gerritquery.get_gerrits(project, msg=msg.group(2))
+ if gerrits:
+ logger.info(
+ "found Change-Id from git.properties short commit-msg 2 in %s",
+ project,
+ )
+ return ChangeId(gerrits[0]["id"], True)
+
+ msg_no_spaces = msg.group(2).replace(" ", "+")
+ logger.info(
+ "did not find Change-Id in %s, trying with commit-msg 2 (no spaces): %s",
+ project,
+ msg_no_spaces,
+ )
+
+ gerrits = self.gerritquery.get_gerrits(project, msg=msg_no_spaces)
+ if gerrits:
+ logger.info(
+ "found Change-Id from git.properties short commit-msg 2 (no spaces) in %s",
+ project,
+ )
+ return ChangeId(gerrits[0]["id"], True)
+
+ logger.info(
+ "did not find Change-Id from short commit message2 from git.properties in %s",
+ project,
+ )
+
+ # Maybe one of the monster 'merge the world' gerrits
+ msg = self.regex_longmsg.search(pfile)
+ first_msg = None