commit c4cfabb27c4ba496368aef66984c31351d0d3bc4
author Tzung-Bi Shih <tzungbi@chromium.org> Mon Aug 10 12:57:23 2020 +0800
committer Commit Bot <commit-bot@chromium.org> Tue Aug 11 01:06:01 2020 +0000
tree 1ed29ce566ab4a99d68ac921e134e0513c101658
parent 3a4ebdaa6e0d7aefdc25765d473e09979c554bc3

fromupstream: wrap test description only if it is newly provided

Only wrap test description if it is newly provided via -t command line.
If the test description is from previous commit mesesage, for example
when using --replace, assume the test descriptions are already good.

BUG=none
TEST=fromupstream.py -b none -t "VERY_LONG_STRING..." \
     linux://238c30468f46b

Change-Id: I083826391da2a5e744cdb51482c65a666d24e616
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2345647
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Commit-Queue: Tzung-Bi Shih <tzungbi@chromium.org>
Tested-by: Tzung-Bi Shih <tzungbi@chromium.org>

contrib/fromupstream.py

diff --git a/contrib/fromupstream.py b/contrib/fromupstream.py
index ca35a6b..816f52b 100755
--- a/contrib/fromupstream.py
+++ b/contrib/fromupstream.py
@@ -167,7 +167,9 @@
 def _wrap_commit_line(prefix, content):
     line = prefix + '=' + content
     indent = ' ' * (len(prefix) + 1)
-    return textwrap.fill(line, COMMIT_MESSAGE_WIDTH, subsequent_indent=indent)
+
+    ret = textwrap.fill(line, COMMIT_MESSAGE_WIDTH, subsequent_indent=indent)
+    return ret[len(prefix) + 1:]
 
 def _pick_patchwork(url, patch_id, args):
     if args['tag'] is None:
@@ -452,6 +454,9 @@
     if buglist:
         args['bug'] = ', '.join(buglist)
 
+    if args['test']:
+        args['test'] = _wrap_commit_line('TEST', args['test'])
+
     if args['replace']:
         old_commit_message = _git(['show', '-s', '--format=%B', 'HEAD'])
 
@@ -526,7 +531,7 @@
         commit_message += '\n'
         commit_message += conflicts
         commit_message += '\n' + 'BUG=' + args['bug']
-        commit_message += '\n' + _wrap_commit_line('TEST', args['test'])
+        commit_message += '\n' + 'TEST=' + args['test']
 
         extra = []
         if args['signoff']: