commit 1000682637e5414028c680b45b3ed696d9b2fba2
author Michael Bestas <mikeioannina@gmail.com> Thu Apr 17 15:36:46 2014 +0300
committer Michael Bestas <mikeioannina@gmail.com> Sun Apr 20 00:08:33 2014 +0300
tree 5af3f5a0102d34e9f2852c7892cb262cf84d469f
parent 6aeac318dbed76c5f01b3cc8a95282845e0d2f6f

cm_crowdin_sync: Add custom branch support

Some repositories use 'master' branch instead of 'cm-11.0'

Change-Id: I76bba76c52d89a0f2f2ee7ac129d77002a7881a2

cm_crowdin_sync.py

diff --git a/cm_crowdin_sync.py b/cm_crowdin_sync.py
index 527176a..cc8e8ee 100755
--- a/cm_crowdin_sync.py
+++ b/cm_crowdin_sync.py
@@ -177,7 +177,7 @@
     # Close file
     file_write.close()
 
-def push_as_commit(path, name):
+def push_as_commit(path, name, branch):
     # CM gerrit nickname
     username = 'your_nickname'
 
@@ -189,7 +189,7 @@
     repo.git.add(path)
     try:
         repo.git.commit(m='Automatic translation import')
-        repo.git.push('ssh://' + username + '@review.cyanogenmod.org:29418/' + name, 'HEAD:refs/for/cm-11.0')
+        repo.git.push('ssh://' + username + '@review.cyanogenmod.org:29418/' + name, 'HEAD:refs/for/' + branch)
         print 'Succesfully pushed commit for ' + name
     except:
         # If git commit fails, it's probably because of no changes.
@@ -335,13 +335,17 @@
                 # Obtain them from android/default.xml or extra_packages.xml.
                 if project_item.attributes["path"].value == good_path:
                     working = 'true'
-                    print 'Committing ' + project_item.attributes['name'].value + ' (based on android/default.xml or extra_packages.xml)'
-                    push_as_commit(good_path, project_item.attributes['name'].value)
+                    if project_item.hasAttribute('revision'):
+                        branch = project_item.attributes['revision'].value
+                    else:
+                        branch = 'cm-11.0'
+                    print 'Committing ' + project_item.attributes['name'].value + ' on branch ' + branch + ' (based on android/default.xml or extra_packages.xml)'
+                    push_as_commit(good_path, project_item.attributes['name'].value, branch)
             # We also translate repositories that are not downloaded by default (e.g. device parts).
             # This is just a fallback.
             # WARNING: If the name is wrong, this will not stop the script.
             if working == 'false':
-                print 'Committing ' + project_item.attributes['name'].value + ' (workaround)'
-                push_as_commit(good_path, 'CyanogenMod/android_' + good_path.replace('/', '_'))
+                print 'Committing ' + project_item.attributes['name'].value + ' on branch cm-11.0 (workaround)'
+                push_as_commit(good_path, 'CyanogenMod/android_' + good_path.replace('/', '_'), 'cm-11.0')
 
 print('\nSTEP 6: Done!')