# This file is part of LilyPond, the GNU music typesetter.
#
-# Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
# Jan Nieuwenhuizen <janneke@gnu.org>
#
# LilyPond is free software: you can redistribute it and/or modify
lilypond_version_re_str = '\\\\version *\"([0-9.]+)"'
lilypond_version_re = re.compile (lilypond_version_re_str)
+lilypond_version_strict_re_str = '\\\\version *\"([0-9]+[.][0-9]+[.][0-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
authors = ('Jan Nieuwenhuizen <janneke@gnu.org>',
'Han-Wen Nienhuys <hanwen@xs4all.nl>')
-error_file_write = ly.stderr_write
-
-def warning (s):
- ly.stderr_write (program_name + ": " + _ ("warning: %s") % s + '\n')
-
-def error (s):
- ly.stderr_write (program_name + ": " + _ ("error: %s") % s + '\n')
-
-def identify (port=sys.stderr):
- ly.encoded_write (port, '%s (GNU LilyPond) %s\n' % (program_name, program_version))
+def identify ():
+ ly.progress ('%s (GNU LilyPond) %s\n' % (program_name, program_version))
def warranty ():
identify ()
%s
%s
-''' % ( _ ('Copyright (c) %s by') % '2001--2010',
+''' % ( _ ('Copyright (c) %s by') % '2001--2012',
' '.join (authors),
_ ('Distributed under terms of the GNU General Public License.'),
_ ('It comes with NO WARRANTY.')))
p.add_option ('-e', '--edit', help=_ ("edit in place"),
action='store_true')
+ p.add_option ("-l", "--loglevel",
+ help=_ ("Print log messages according to LOGLEVEL "
+ "(NONE, ERROR, WARNING, PROGRESS (default), DEBUG)"),
+ metavar=_ ("LOGLEVEL"),
+ action='callback',
+ callback=ly.handle_loglevel_option,
+ type='string')
+
p.add_option ('-n', '--no-version',
help=_ ("do not add \\version command if missing"),
action='store_true',
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,
string."""
conv_list = get_conversions (from_version, to_version)
- error_file_write (_ ("Applying conversion: "))
-
+ ly.progress (_ ("Applying conversion: "), newline = False)
+
last_conversion = ()
+ errors = 0
try:
+ if not conv_list:
+ last_conversion = to_version
for x in conv_list:
- error_file_write (tup_to_str (x[0]))
if x != conv_list[-1]:
- error_file_write (', ')
+ ly.progress (tup_to_str (x[0]), newline = False)
+ ly.progress (', ', newline = False)
+ else:
+ ly.progress (tup_to_str (x[0]))
str = x[1] (str)
last_conversion = x[0]
except convertrules.FatalConversionError:
- error_file_write ('\n'
- + _ ("Error while converting")
- + '\n'
- + _ ("Stopping at last successful rule")
- + '\n')
+ ly.error (_ ("Error while converting")
+ + '\n'
+ + _ ("Stopping at last successful rule"))
+ errors += 1
- return (last_conversion, str)
+ return (last_conversion, str, errors)
def guess_lilypond_version (input):
- m = lilypond_version_re.search (input)
+ m = lilypond_version_strict_re.search (input)
if m:
return m.group (1)
+ m = lilypond_version_re.search (input)
+ if m:
+ raise InvalidVersion (m.group (1))
else:
return ''
self.version = version
def do_one_file (infile_name):
- ly.stderr_write (_ ("Processing `%s\'... ") % infile_name)
- sys.stderr.write ('\n')
+ ly.progress (_ ("Processing `%s\'... ") % infile_name, True)
if infile_name:
infile = open (infile_name, 'r')
raise InvalidVersion (".".join ([str(n) for n in from_version]))
- (last, result) = do_conversion (input, from_version, to_version)
+ (last, result, errors) = do_conversion (input, from_version, to_version)
if last:
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,
'\\' + newversion, result)
elif not global_options.skip_version_add:
result = newversion + '\n' + result
-
- error_file_write ('\n')
+
+ ly.progress ('\n')
if global_options.edit:
try:
sys.stderr.flush ()
+ return errors
+
def do_options ():
opt_parser = get_option_parser()
(options, args) = opt_parser.parse_args ()
show_rules (sys.stdout, global_options.from_version, global_options.to_version)
sys.exit (0)
- identify (sys.stderr)
+ identify ()
+ errors = 0
for f in files:
if f == '-':
- f = ''
- elif not os.path.isfile (f):
- error (_ ("%s: Unable to open file") % f)
- if len (files) == 1:
- sys.exit (1)
+ continue
+ if not os.path.isfile (f):
+ ly.error (_ ("%s: Unable to open file") % f)
+ errors += 1
continue
try:
- do_one_file (f)
+ errors += do_one_file (f)
except UnknownVersion:
- error (_ ("%s: Unable to determine version. Skipping") % f)
+ ly.error (_ ("%s: Unable to determine version. Skipping") % f)
+ errors += 1
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) )
+ ly.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) )
+ errors += 1
+
+ if errors:
+ ly.warning (ly.ungettext ("There was %d error.",
+ "There were %d errors.", errors) % errors)
+ sys.exit (1)
- sys.stderr.write ('\n')
main ()
projects / lilypond.git / blobdiff