resolve merge

[lilypond.git] / scripts / convert-ly.py

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index cffd859ff72ef74900f01579fb3efdbc6bc6c66a..c0c7ee3e354fdee020bfeeb971cf92f91be57ec0 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1,14 +1,25 @@
 #!@TARGET_PYTHON@
-#
+
 # convert-ly.py -- Update old LilyPond input files (fix name?)
+# converting rules are found in python/convertrules.py
+
+# This file is part of LilyPond, the GNU music typesetter.
 #
-# source file of the GNU LilyPond music typesetter
-#
-# (c) 1998--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2011  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 #
-# converting rules are found in python/convertrules.py
+# LilyPond is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# LilyPond 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
+# GNU General Public License for more details.
 #
+# You should have received a copy of the GNU General Public License
+# along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import sys
@@ -67,7 +78,7 @@ def warranty ():
 
 %s
 %s
-''' % ( _ ('Copyright (c) %s by') % '2001--2009',
+''' % ( _ ('Copyright (c) %s by') % '2001--2011',
         ' '.join (authors),
         _ ('Distributed under terms of the GNU General Public License.'),
         _ ('It comes with NO WARRANTY.')))
@@ -107,6 +118,12 @@ def get_option_parser ():
               action='store_true',
               dest='force_current_version',
               default=False)
+
+    p.add_option ('-d', '--diff-version-update',
+              help=_ ("only update \\version number if file is modified"),
+              action='store_true',
+              dest='diff_version_update',
+              default=False)
     
     p.add_option ("-s", '--show-rules',
               help=_ ("show rules [default: -f 0, -t %s]") % program_version,
@@ -160,7 +177,7 @@ def show_rules (file, from_version, to_version):
 
 def do_conversion (str, from_version, to_version):
     """Apply conversions from FROM_VERSION to TO_VERSION.  Return
-tuple (LAST,STR), with the last succesful conversion and the resulting
+tuple (LAST,STR), with the last successful conversion and the resulting
 string."""
     conv_list = get_conversions (from_version, to_version)
 
@@ -193,12 +210,16 @@ def guess_lilypond_version (input):
     else:
         return ''
 
-class FatalConversionError:
+class FatalConversionError (Exception):
     pass
 
-class UnknownVersion:
+class UnknownVersion (Exception):
     pass
 
+class InvalidVersion (Exception):
+    def __init__ (self, version):
+      self.version = version
+
 def do_one_file (infile_name):
     ly.stderr_write (_ ("Processing `%s\'... ") % infile_name)
     sys.stderr.write ('\n')
@@ -225,6 +246,9 @@ def do_one_file (infile_name):
     else:
         to_version = latest_version ()
 
+    if len (from_version) != 3:
+        raise InvalidVersion (".".join ([str(n) for n in from_version]))
+
 
     (last, result) = do_conversion (input, from_version, to_version)
 
@@ -232,6 +256,18 @@ def do_one_file (infile_name):
         if global_options.force_current_version and last == to_version:
             last = str_to_tuple (program_version)
 
+        if global_options.diff_version_update:
+            if result == input:
+                # check the y in x.y.z  (minor version number)
+                previous_stable = (last[0], 2*(last[1]/2), 0)
+                if ((last[0:2] != from_version[0:2]) and
+                    (previous_stable > from_version)):
+                    # previous stable version
+                    last = previous_stable
+                else:
+                    # make no (actual) change to the version number
+                    last = from_version
+
         newversion = r'\version "%s"' % tup_to_str (last)
         if lilypond_version_re.search (result):
             result = re.sub (lilypond_version_re_str,
@@ -293,14 +329,21 @@ def main ():
         if f == '-':
             f = ''
         elif not os.path.isfile (f):
-            error (_ ("cannot open file: `%s'") % f)
+            error (_ ("%s: Unable to open file") % f)
             if len (files) == 1:
                 sys.exit (1)
             continue
         try:
             do_one_file (f)
         except UnknownVersion:
-            error (_ ("cannot determine version for `%s'.  Skipping") % f)
+            error (_ ("%s: Unable to determine version.  Skipping") % f)
+        except InvalidVersion:
+            # Compat code for 2.x and 3.0 syntax ("except .. as v" doesn't 
+            # work in python 2.4!):
+            t, v, b = sys.exc_info ()
+            error (_ ("%s: Invalid version string `%s' \n"
+                      "Valid version strings consist of three numbers, "
+                      "separated by dots, e.g. `2.8.12'") % (f, v.version) )
 
     sys.stderr.write ('\n')