Add version 2, convert version 1 from days to hours automatically

Author: tedivm

README.md

@@ -9,6 +9,8 @@ The file `.gitconsensus.yaml` needs to be placed in the repository to be managed
 will be skipped.
 
 ```yaml
+# Which version of the consensus rules to use
+version: 2
 
 # Add extra labels for the vote counts and age when merging
 extra_labels: false

gitconsensus/config.py

@@ -16,6 +16,12 @@ def reloadSettings():
     if os.path.isfile(path):
         with open(path, 'r') as f:
             settings = yaml.load(f)
+            # support older versions by converting from day to hours.
+            if 'version' not in settings or settings['version'] < 2:
+                if 'mergedelay' in settings and settings['mergedelay']:
+                    settings['mergedelay'] = settings['mergedelay'] * 24
+                if 'timeout' in settings and settings['timeout']:
+                    settings['timeout'] = settings['timeout'] * 24
     return settings