Improve ty with cherrypicked subsets

Record patch counters when we start tracking series so we properly
indicate in the thank-you note which ones got applied. Additionally,
indicate in the subject when we're reporting on a subset of a larger
series.

Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

2 files changed, 26 insertions, 21 deletions

diff --git a/b4/mbox.py b/b4/mbox.py
index a49624c..8521c0c 100644
--- a/b4/mbox.py
+++ b/b4/mbox.py
@@ -246,10 +246,6 @@ def mbox_to_am(mboxfile, cmdargs):
 
 
 def thanks_record_am(lser, cherrypick=None):
-    if not lser.complete:
-        logger.debug('Incomplete series, not tracking for thanks')
-        return
-
     # Are we tracking this already?
     datadir = b4.get_data_dir()
     slug = lser.get_slug(extended=True)
@@ -257,6 +253,7 @@ def thanks_record_am(lser, cherrypick=None):
 
     patches = list()
     at = 0
+    padlen = len(str(lser.expected))
     for pmsg in lser.patches[1:]:
         at += 1
         if pmsg is None:
@@ -270,7 +267,8 @@ def thanks_record_am(lser, cherrypick=None):
         if pmsg.attestation is None:
             logger.debug('Unable to get hashes for all patches, not tracking for thanks')
             return
-        patches.append((pmsg.subject, pmsg.pwhash, pmsg.msgid))
+        prefix = '%s/%s' % (str(pmsg.counter).zfill(padlen), pmsg.expected)
+        patches.append((pmsg.subject, pmsg.pwhash, pmsg.msgid, prefix))
 
     lmsg = lser.patches[0]
     if lmsg is None:
@@ -289,6 +287,7 @@ def thanks_record_am(lser, cherrypick=None):
         'references': b4.LoreMessage.clean_header(lmsg.msg['References']),
         'sentdate': b4.LoreMessage.clean_header(lmsg.msg['Date']),
         'quote': b4.make_quote(lmsg.body, maxlines=5),
+        'cherrypick': cherrypick is not None,
         'patches': patches,
     }
     fullpath = os.path.join(datadir, filename)
diff --git a/b4/ty.py b/b4/ty.py
index 83209eb..96ce3af 100644
--- a/b4/ty.py
+++ b/b4/ty.py
@@ -99,10 +99,11 @@ def make_reply(reply_template, jsondata):
     else:
         msg['References'] = '<%s>' % jsondata['msgid']
 
-    if jsondata['subject'].find('Re: ') < 0:
-        msg['Subject'] = 'Re: %s' % jsondata['subject']
+    subject = re.sub(r'^Re:\s+', '', jsondata['subject'], flags=re.I)
+    if jsondata.get('cherrypick'):
+        msg['Subject'] = 'Re: (subset) ' + subject
     else:
-        msg['Subject'] = jsondata['subject']
+        msg['Subject'] = 'Re: ' + subject
 
     mydomain = jsondata['myemail'].split('@')[1]
     msg['Message-Id'] = email.utils.make_msgid(idstring='b4-ty', domain=mydomain)
@@ -189,11 +190,13 @@ def auto_locate_series(gitdir, jsondata, branch, since='1.week'):
     # We need to find all of them in the commits
     found = list()
     matches = 0
+    at = 0
     for patch in jsondata['patches']:
+        at += 1
         logger.debug('Checking %s', patch)
         if patch[1] in patchids:
             logger.debug('Found: %s', patch[0])
-            found.append(commits[patch[1]])
+            found.append((at, commits[patch[1]][0]))
             matches += 1
         else:
             # try to locate by subject
@@ -201,7 +204,7 @@ def auto_locate_series(gitdir, jsondata, branch, since='1.week'):
             for pwhash, commit in commits.items():
                 if commit[1] == patch[0]:
                     logger.debug('Matched using subject')
-                    found.append(commit)
+                    found.append((at, commit[0]))
                     success = True
                     matches += 1
                     break
@@ -209,7 +212,7 @@ def auto_locate_series(gitdir, jsondata, branch, since='1.week'):
                     for tracker in commit[2]:
                         if tracker.find(patch[2]) >= 0:
                             logger.debug('Matched using recorded message-id')
-                            found.append(commit)
+                            found.append((at, commit[0]))
                             success = True
                             matches += 1
                             break
@@ -218,7 +221,7 @@ def auto_locate_series(gitdir, jsondata, branch, since='1.week'):
 
             if not success:
                 logger.debug('  Failed to find a match for: %s', patch[0])
-                found.append((None, patch[0]))
+                found.append((at, None))
 
     return found
 
@@ -320,24 +323,27 @@ def generate_am_thanks(gitdir, jsondata, branch, since):
     if not cidmask:
         cidmask = 'commit: %s'
     slines = list()
-    counter = 0
     nomatch = 0
     padlen = len(str(len(commits)))
-    for commit in commits:
-        counter += 1
-        prefix = '[%s/%s] ' % (str(counter).zfill(padlen), len(commits))
-        slines.append('%s%s' % (prefix, commit[1]))
-        if commit[0] is None:
+    patches = jsondata['patches']
+    for at, cid in commits:
+        try:
+            prefix = '[%s] ' % patches[at-1][3]
+        except IndexError:
+            prefix = '[%s/%s] ' % (str(at).zfill(padlen), len(commits))
+        slines.append('%s%s' % (prefix, patches[at-1][0]))
+        if cid is None:
             slines.append('%s(no commit info)' % (' ' * len(prefix)))
             nomatch += 1
         else:
-            slines.append('%s%s' % (' ' * len(prefix), cidmask % commit[0]))
+            slines.append('%s%s' % (' ' * len(prefix), cidmask % cid))
     jsondata['summary'] = '\n'.join(slines)
-    if nomatch == counter:
+    if nomatch == len(commits):
         logger.critical('  WARNING: None of the patches matched for: %s', jsondata['subject'])
         logger.critical('           Please review the resulting message')
     elif nomatch > 0:
-        logger.critical('  WARNING: Could not match %s of %s patches in: %s', nomatch, counter, jsondata['subject'])
+        logger.critical('  WARNING: Could not match %s of %s patches in: %s',
+                        nomatch, len(commits), jsondata['subject'])
         logger.critical('           Please review the resulting message')
 
     msg = make_reply(thanks_template, jsondata)