X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fconvert-ly.py;h=d473ec26f5f416ab7fb5472ffb878d7f8168455a;hb=HEAD;hp=e14a137f97a71e2cad18e2aecf1e8aa8bff3ab8a;hpb=91f8d0ab0bfbd603b8f7801ef9f5c03529cbfa66;p=lilypond.git diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index e14a137f97..d473ec26f5 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -5,7 +5,7 @@ # This file is part of LilyPond, the GNU music typesetter. # -# Copyright (C) 1998--2012 Han-Wen Nienhuys +# Copyright (C) 1998--2015 Han-Wen Nienhuys # Jan Nieuwenhuizen # # LilyPond is free software: you can redistribute it and/or modify @@ -24,6 +24,7 @@ import os import sys import re +import shutil """ @relocate-preamble@ @@ -45,6 +46,9 @@ lilypond_version_strict_re = re.compile (lilypond_version_strict_re_str) help_summary = ( _ ('''Update LilyPond input to newer version. By default, update from the version taken from the \\version command, to the current LilyPond version.''') ++ "\n" ++ _ ("If FILE is `-', read from standard input.") ++ "\n\n" + _ ("Examples:") + ''' $ convert-ly -e old.ly @@ -72,7 +76,7 @@ def warranty (): %s %s -''' % ( _ ('Copyright (c) %s by') % '2001--2012', +''' % ( _ ('Copyright (c) %s by') % '2001--2015', ' '.join (authors), _ ('Distributed under terms of the GNU General Public License.'), _ ('It comes with NO WARRANTY.'))) @@ -126,18 +130,25 @@ def get_option_parser (): 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, dest='show_rules', action='store_true', default=False) - + p.add_option ('-t', '--to', help=_ ("convert to VERSION [default: %s]") % program_version, metavar=_ ('VERSION'), action='store', dest="to_version", default='') + + p.add_option ('-b', '--backup-numbered', + help=_ ("make a numbered backup [default: filename.ext~]"), + action='store_true', + dest="backup_numbered", + default='') + p.add_option ('-w', '--warranty', help=_ ("show warranty and copyright"), action='store_true', ), @@ -149,8 +160,6 @@ def get_option_parser (): return p - - def str_to_tuple (s): return tuple ([int(n) for n in s.split ('.')]) @@ -179,13 +188,15 @@ 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 successful conversion and the resulting -string.""" +tuple (LAST,LASTCHANGED,STR,ERRORS), with the last applied conversion, +the last conversion resulting in a change, the resulting +string and the number of errors.""" conv_list = get_conversions (from_version, to_version) ly.progress (_ ("Applying conversion: "), newline = False) last_conversion = None + last_change = None errors = 0 try: for x in conv_list: @@ -194,8 +205,11 @@ string.""" ly.progress (', ', newline = False) else: ly.progress (tup_to_str (x[0])) - str = x[1] (str) + newstr = x[1] (str) last_conversion = x[0] + if (newstr != str): + last_change = last_conversion + str = newstr except convertrules.FatalConversionError: ly.error (_ ("Error while converting") @@ -203,9 +217,7 @@ string.""" + _ ("Stopping at last successful rule")) errors += 1 - return (last_conversion, str, errors) - - + return (last_conversion, last_change, str, errors) def guess_lilypond_version (input): m = lilypond_version_strict_re.search (input) @@ -227,6 +239,19 @@ class InvalidVersion (Exception): def __init__ (self, version): self.version = version +def back_up (file, numbered): + if numbered: + n = 0 + while True: + n = n + 1 + back_up = file + '.~' + str(n) + '~' + if not os.path.exists (back_up): + break + else: + back_up = file + '~' + shutil.copy2 (file, back_up) + return back_up + def do_one_file (infile_name): ly.progress (_ (u"Processing `%s\'... ") % infile_name, True) @@ -237,15 +262,13 @@ def do_one_file (infile_name): else: input = sys.stdin.read () - from_version = None to_version = None - if global_options.from_version: - from_version = global_options.from_version - else: - guess = guess_lilypond_version (input) - if not guess: - raise UnknownVersion () - from_version = str_to_tuple (guess) + org_version = None + guess = guess_lilypond_version (input) + org_version = guess and str_to_tuple (guess) + from_version = global_options.from_version or org_version + if not from_version: + raise UnknownVersion () if global_options.to_version: to_version = global_options.to_version @@ -256,23 +279,29 @@ def do_one_file (infile_name): raise InvalidVersion (".".join ([str(n) for n in from_version])) - (last, result, errors) = do_conversion (input, from_version, to_version) + (last, last_change, result, errors) = \ + do_conversion (input, from_version, to_version) if global_options.force_current_version and \ (last is None or last == to_version): last = str_to_tuple (program_version) if last: if global_options.diff_version_update: + # Note that last_change can be set even if the result is + # the same if two conversion rules cancelled out 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 + # make no (actual) change to the version number + last = org_version or from_version + else: + last = last_change + # If the last update was to an unstable version + # number, and the final update target is no longer in + # the same unstable series, we update to the stable + # series following the unstable version. + if last[1]%2: # unstable + next_stable = (last[0], last[1]+1, 0) + if next_stable <= to_version: + last = next_stable newversion = r'\version "%s"' % tup_to_str (last) if lilypond_version_re.search (result): @@ -284,11 +313,7 @@ def do_one_file (infile_name): ly.progress ('\n') if global_options.edit: - try: - os.remove (infile_name + '~') - except: - pass - os.rename (infile_name, infile_name + '~') + backup = back_up (infile_name, global_options.backup_numbered) outfile = open (infile_name, 'w') else: outfile = sys.stdout @@ -334,10 +359,10 @@ def main (): errors = 0 for f in files: - if f == '-': - continue f = f.decode (sys.stdin.encoding or "utf-8") - if not os.path.isfile (f): + if f == '-': + f = '' + elif not os.path.isfile (f): ly.error (_ (u"%s: Unable to open file") % f) errors += 1 continue @@ -360,5 +385,4 @@ def main (): "There were %d errors.", errors) % errors) sys.exit (1) - main ()