Commits

Volodymyr Shamray  committed 294c8a1

upload script fixed

  • Participants
  • Parent commits a7a1fbb
  • Branches stable-bugfix

Comments (0)

Files changed (1)

File plog-version-publish.py

 
     raise RuntimeError('WTF? Don\'t know how to increment ' + what)
 
+def branch():
+    ret = subprocess.call('hg branch ')
+    if ret != 0:
+        raise RuntimeError
+    return ret
+
 def update(rev):
     ret = subprocess.call('hg update ' + rev)
     if ret != 0:
     (major, minor, patch) = getlastversion()
     (major, minor, patch) = increment(major, minor, patch, inctarget)
 
+    current_branch = branch()
     update('stable')
-    merge ('default')
-    commit('default=>stable')
+    merge (current_branch)
+    commit(current_branch + '=>stable')
 
     fixversion(major, minor, patch)
     edit_changelog(major, minor, patch)
     commit('version number updated')
 
-    update('default')
+    update(current_branch)
     tag('stable', major, minor, patch)