Issue 4540 - Add Platform Specific Branch Support to createNightlies.py

sitescripts/extensions/bin/createNightlies.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 65 matching lines @@
         self.changelogFilename = None
 
     def hasChanges(self):
         return self.revision != self.previousRevision
 
     def getCurrentRevision(self):
         """
             retrieves the current revision ID from the repository
         """
         command = [
-            'hg', 'id', '-i', '-r', self.config.bookmark, '--config',
+            'hg', 'id', '-i', '-r', self.config.revision, '--config',
             'defaults.id=', self.config.repository
         ]
         return subprocess.check_output(command).strip()
 
     def getCurrentBuild(self):
         """
             calculates the (typically numerical) build ID for the current build
         """
         command = ['hg', 'id', '-n', '--config', 'defaults.id=', self.tempdir]
         build = subprocess.check_output(command).strip()
         if self.config.type == 'gecko':
             build += '-beta'
         return build
 
     def getChanges(self):
         """
           retrieve changes between the current and previous ("first") revision
         """
 
         command = [
-            'hg', 'log', '-R', self.tempdir, '-r', 'ancestors(master)',

[Wladimir Palant, 2016/10/26 15:34:03]

You don't want the ancestors of master but rather of the revision you are
testing. It looks like you didn't test your changes at all, if that's the case
I'd be strongly opposed to you landing those. As I said, I didn't verify that
ancestors() will do the right thing for us (meaning: in the scenario where we
really have multiple bookmarked branches in the repository and creating builds
from all of them), and I'm assuming that you will.

[Jon Sonesen, 2016/10/26 17:44:05]

I have locally tested this specific hg call and it returns the revisions
applicable to the given bookmark.

-            '-l', '50', '--encoding', 'utf-8', '--template',
+            'hg', 'log', '-R', self.tempdir, '-r',
+            'ancestors({})'.format(self.config.revision), '-l', '50',
+            '--encoding', 'utf-8', '--template',
             '{date|isodate}\\0{author|person}\\0{rev}\\0{desc}\\0\\0',
             '--config', 'defaults.log='
         ]
         result = subprocess.check_output(command).decode('utf-8')
 
         for change in result.split('\x00\x00'):
             if change:
                 date, author, revision, description = change.split('\x00')
                 yield {'date': date, 'author': author, 'revision': revision, 'description': description}
 
     def copyRepository(self):
         """
           Create a repository copy in a temporary directory
         """
         self.tempdir = tempfile.mkdtemp(prefix=self.config.repositoryName)
         command = ['hg', 'clone', '-q', self.config.repository,  '-u',
-                   self.config.bookmark, self.tempdir]
+                   self.config.revision, self.tempdir]
         subprocess.check_call(command)
 
         # Make sure to run ensure_dependencies.py if present
         depscript = os.path.join(self.tempdir, 'ensure_dependencies.py')
         if os.path.isfile(depscript):
             subprocess.check_call([sys.executable, depscript, '-q'])
 
     def writeChangelog(self, changes):
         """
           write the changelog file into the cloned repository
@@ skipping 448 matching lines @@
         except Exception as ex:
             logging.error('The build for %s failed:', repo)
             logging.exception(ex)
 
     file = open(nightlyConfigFile, 'wb')
     nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
     main()