combo-layer: make Signed-off-by optional

It depends on the diligence of the person running the combo-layer tool whether the Signed-off-by line added to each commit actually indicates that the person was involved in validating the change.

When the import is purely automatic, it is better to not add the line, because the history is more useful without it (searching for the person really only lists changes he or she was involved with) and it would be a false statement.

This needs to be configurable, achieved with a new global "signoff" boolean property in combo-layer.conf, in the "DEFAULT" section.

Signed-off-by Patrick Ohly <[email protected]>

---
 scripts/combo-layer              | 4 +++-
 scripts/combo-layer.conf.example | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

scripts/combo-layer +1 -0

index 19d64e6..60ead5b 100755
@@ -75,6 +75,8 @@ class Configuration(object):
             self.parser.readfp(f)
 
         self.repos = {}
+        self.signoff = not self.parser.has_option('DEFAULT', 'signoff') or
 \ +                       self.parser.getboolean('DEFAULT', 'signoff') 

for repo in self.parser.sections():
self.repos[repo] = {}
readsection(self.parser, repo, repo)

scripts/combo-layer +0 -0

@@ -471,7 +473,7 @@ def apply_patchlist(conf, repos):
                 if os.path.getsize(patchfile) == 0:
                     logger.info("(skipping %d/%d %s - no changes)" % (i,

linecount, patchdisp)) else:

scripts/combo-layer +1 -1

-                    cmd = "git am --keep-cr -s -p1 %s" % patchfile
+                    cmd = "git am --keep-cr %s-p1 %s" % ('-s ' if

conf.signoff else '', patchfile) logger.info("Applying %d/%d: %s" % (i, linecount, patchdisp)) try:
runcmd(cmd)

(quoted diff) +0 -0

b/scripts/combo-layer.conf.example index 010a692..8ad8615 100644

scripts/combo-layer.conf.example +0 -0

@@ -1,5 +1,11 @@
 # combo-layer example configuration file

Hi Patrick,

scripts/combo-layer.conf.example line 11

Quoted 9 lines · On Monday 09 March 2015 13:56:39 Patrick Ohly wrote:

scripts/combo-layer.conf.example +6 -0

+# global options
+[DEFAULT]
+
+# Add 'Signed-off-by' to all commits that get imported automatically.
+signoff = True
+
 # component name
 [bitbake]
 # mandatory options

So I'm OK with adding this in as an option. However to me a name like DEFAULT implies you're establishing a general section to apply default settings for all components where the component can override those defaults if it chooses, which doesn't really represent what this does - so a different name might be more appropriate (GLOBAL or _global_ perhaps?)

Quoted 8 lines · Paul Eggleton

Quoted 7 lines · On Monday 09 March 2015 13:56:39 Patrick Ohly wrote:

scripts/combo-layer.conf.example +6 -0

+# global options
+[DEFAULT]
+
+# Add 'Signed-off-by' to all commits that get imported automatically.
+signoff = True
+

Quoted 10 lines

Quoted 3 lines

 # component name
 [bitbake]
 # mandatory options

So I'm OK with adding this in as an option. However to me a name like DEFAULT implies you're establishing a general section to apply default settings for all components where the component can override those defaults if it chooses, which doesn't really represent what this does - so a different name might be more appropriate (GLOBAL or _global_ perhaps?)

"DEFAULT" is the special string that Python's ConfigParser uses, well, by default for that special section which does not show up in the list of sections. I don't know how to rename that.

I'm probably abusing this concept a bit here: it seems that special section is meant to provide default values that get returned also for the other sections when they don't have their own value.

Here's a cleaner solution:
* Get rid of the [DEFAULT] section in the file.
* When reading it, on-the-fly prepend the string '[this-is-not-really-a-repo'].
* When reading global properties, get it from that section.
* When listing sections to find repos, ignore it.

How about that?

Quoted 35 lines · On Thursday 12 March 2015 20:45:32 Patrick Ohly wrote:

Quoted 8 lines · Paul Eggleton

Quoted 7 lines · On Monday 09 March 2015 13:56:39 Patrick Ohly wrote:

scripts/combo-layer.conf.example +6 -0

+# global options
+[DEFAULT]
+
+# Add 'Signed-off-by' to all commits that get imported automatically.
+signoff = True
+

Quoted 10 lines

Quoted 3 lines

 # component name
 [bitbake]
 # mandatory options

So I'm OK with adding this in as an option. However to me a name like DEFAULT implies you're establishing a general section to apply default settings for all components where the component can override those defaults if it chooses, which doesn't really represent what this does - so a different name might be more appropriate (GLOBAL or _global_ perhaps?)

"DEFAULT" is the special string that Python's ConfigParser uses, well, by default for that special section which does not show up in the list of sections. I don't know how to rename that.

I'm probably abusing this concept a bit here: it seems that special section is meant to provide default values that get returned also for the other sections when they don't have their own value.

Here's a cleaner solution:
* Get rid of the [DEFAULT] section in the file.
* When reading it, on-the-fly prepend the string '[this-is-not-really-a-repo'].
* When reading global properties, get it from that section.
* When listing sections to find repos, ignore it.

Quoted 1 line

How about that?

Hmm, ok, I wasn't aware of this built-in "DEFAULT" section behaviour. A simple solution then would just be to make this setting per-component and keep the DEFAULT usage in the example config - although I do realise it's unlikely to be very useful on a per-component basis, at least it will work in the same way as other values we read from there.