# HG changeset patch # User Benoit Boissinot # Date 2010-02-05 17:50:08 # Node ID 23e608f42f2c29c6c814a3fbae1b1cac5f77b233 # Parent b9e44cc97355ff27e05f6cd384061fc12731cec0 fix spaces/identation issues diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1648,7 +1648,7 @@ def help_(ui, name=None, with_version=Fa 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, diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -60,8 +60,8 @@ def _picktool(repo, ui, path, binary, sy 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 = {} diff --git a/mercurial/hgweb/wsgicgi.py b/mercurial/hgweb/wsgicgi.py --- a/mercurial/hgweb/wsgicgi.py +++ b/mercurial/hgweb/wsgicgi.py @@ -30,7 +30,7 @@ def launch(application): 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' diff --git a/mercurial/lsprof.py b/mercurial/lsprof.py --- a/mercurial/lsprof.py +++ b/mercurial/lsprof.py @@ -96,7 +96,7 @@ def label(code): 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) diff --git a/mercurial/store.py b/mercurial/store.py --- a/mercurial/store.py +++ b/mercurial/store.py @@ -293,7 +293,7 @@ class fncachestore(basicstore): 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 diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -95,10 +95,10 @@ class engine(object): 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)