Mercurial > hg
changeset 10340:2e9656d284cc
merge with main
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 06 Feb 2010 17:11:18 +0100 |
parents | 23e608f42f2c (diff) f9108768b892 (current diff) |
children | c203878e58ba |
files | mercurial/commands.py |
diffstat | 8 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/graphlog.py Sat Feb 06 15:18:52 2010 +0100 +++ b/hgext/graphlog.py Sat Feb 06 17:11:18 2010 +0100 @@ -12,7 +12,7 @@ revision graph is also shown. ''' -import os, sys +import os from mercurial.cmdutil import revrange, show_changeset from mercurial.commands import templateopts from mercurial.i18n import _
--- a/hgext/keyword.py Sat Feb 06 15:18:52 2010 +0100 +++ b/hgext/keyword.py Sat Feb 06 17:11:18 2010 +0100 @@ -97,7 +97,7 @@ ' transplant') # provide cvs-like UTC date filter -utcdate = lambda x: util.datestr(x, '%Y/%m/%d %H:%M:%S') +utcdate = lambda x: util.datestr((x[0], 0), '%Y/%m/%d %H:%M:%S') # make keyword tools accessible kwtools = {'templater': None, 'hgcmd': '', 'inc': [], 'exc': ['.hg*']}
--- a/mercurial/commands.py Sat Feb 06 15:18:52 2010 +0100 +++ b/mercurial/commands.py Sat Feb 06 17:11:18 2010 +0100 @@ -1649,7 +1649,7 @@ opt_output.append(("\n%s" % title, None)) for shortopt, longopt, default, desc in options: if _("DEPRECATED") in desc and not ui.verbose: - continue + continue opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt, longopt and " --%s" % longopt), "%s%s" % (desc,
--- a/mercurial/filemerge.py Sat Feb 06 15:18:52 2010 +0100 +++ b/mercurial/filemerge.py Sat Feb 06 17:11:18 2010 +0100 @@ -60,8 +60,8 @@ for pat, tool in ui.configitems("merge-patterns"): mf = match.match(repo.root, '', [pat]) if mf(path) and check(tool, pat, symlink, False): - toolpath = _findtool(ui, tool) - return (tool, '"' + toolpath + '"') + toolpath = _findtool(ui, tool) + return (tool, '"' + toolpath + '"') # then merge tools tools = {}
--- a/mercurial/hgweb/wsgicgi.py Sat Feb 06 15:18:52 2010 +0100 +++ b/mercurial/hgweb/wsgicgi.py Sat Feb 06 17:11:18 2010 +0100 @@ -30,7 +30,7 @@ environ['wsgi.multiprocess'] = True environ['wsgi.run_once'] = True - if environ.get('HTTPS','off').lower() in ('on','1','yes'): + if environ.get('HTTPS', 'off').lower() in ('on', '1', 'yes'): environ['wsgi.url_scheme'] = 'https' else: environ['wsgi.url_scheme'] = 'http'
--- a/mercurial/lsprof.py Sat Feb 06 15:18:52 2010 +0100 +++ b/mercurial/lsprof.py Sat Feb 06 17:11:18 2010 +0100 @@ -96,7 +96,7 @@ mname = _fn2mod[code.co_filename] = k break else: - mname = _fn2mod[code.co_filename] = '<%s>'%code.co_filename + mname = _fn2mod[code.co_filename] = '<%s>' % code.co_filename return '%s:%d(%s)' % (mname, code.co_firstlineno, code.co_name)
--- a/mercurial/store.py Sat Feb 06 15:18:52 2010 +0100 +++ b/mercurial/store.py Sat Feb 06 17:11:18 2010 +0100 @@ -293,7 +293,7 @@ if (mode not in ('r', 'rb') and path.startswith('data/') and path not in fnc): - fnc.add(path) + fnc.add(path) return op(hybridencode(path), mode, *args, **kw) self.opener = fncacheopener
--- a/mercurial/templater.py Sat Feb 06 15:18:52 2010 +0100 +++ b/mercurial/templater.py Sat Feb 06 17:11:18 2010 +0100 @@ -95,10 +95,10 @@ except KeyError, i: raise SyntaxError(_("unknown filter '%s'") % i[0]) def apply(get): - x = get(val) - for f in filters: - x = f(x) - return x + x = get(val) + for f in filters: + x = f(x) + return x self.cache[expr] = apply return self.cache[expr](get)