Mercurial > hg
changeset 10341:c203878e58ba
merge with main
| author | Henrik Stuart <hg@hstuart.dk> |
|---|---|
| date | Sat, 06 Feb 2010 17:37:52 +0100 |
| parents | ade04c5ae7bb (current diff) 2e9656d284cc (diff) |
| children | 579aae5aa549 |
| files | |
| diffstat | 6 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Feb 06 15:21:48 2010 +0100 +++ b/mercurial/commands.py Sat Feb 06 17:37:52 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:21:48 2010 +0100 +++ b/mercurial/filemerge.py Sat Feb 06 17:37:52 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:21:48 2010 +0100 +++ b/mercurial/hgweb/wsgicgi.py Sat Feb 06 17:37:52 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:21:48 2010 +0100 +++ b/mercurial/lsprof.py Sat Feb 06 17:37:52 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:21:48 2010 +0100 +++ b/mercurial/store.py Sat Feb 06 17:37:52 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:21:48 2010 +0100 +++ b/mercurial/templater.py Sat Feb 06 17:37:52 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)