Show More
@@ -1648,7 +1648,7 b' def help_(ui, name=None, with_version=Fa' | |||||
1648 | opt_output.append(("\n%s" % title, None)) |
|
1648 | opt_output.append(("\n%s" % title, None)) | |
1649 | for shortopt, longopt, default, desc in options: |
|
1649 | for shortopt, longopt, default, desc in options: | |
1650 | if _("DEPRECATED") in desc and not ui.verbose: |
|
1650 | if _("DEPRECATED") in desc and not ui.verbose: | |
1651 |
|
|
1651 | continue | |
1652 | opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt, |
|
1652 | opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt, | |
1653 | longopt and " --%s" % longopt), |
|
1653 | longopt and " --%s" % longopt), | |
1654 | "%s%s" % (desc, |
|
1654 | "%s%s" % (desc, |
@@ -60,8 +60,8 b' def _picktool(repo, ui, path, binary, sy' | |||||
60 | for pat, tool in ui.configitems("merge-patterns"): |
|
60 | for pat, tool in ui.configitems("merge-patterns"): | |
61 | mf = match.match(repo.root, '', [pat]) |
|
61 | mf = match.match(repo.root, '', [pat]) | |
62 | if mf(path) and check(tool, pat, symlink, False): |
|
62 | if mf(path) and check(tool, pat, symlink, False): | |
63 |
|
|
63 | toolpath = _findtool(ui, tool) | |
64 |
|
|
64 | return (tool, '"' + toolpath + '"') | |
65 |
|
65 | |||
66 | # then merge tools |
|
66 | # then merge tools | |
67 | tools = {} |
|
67 | tools = {} |
@@ -30,7 +30,7 b' def launch(application):' | |||||
30 | environ['wsgi.multiprocess'] = True |
|
30 | environ['wsgi.multiprocess'] = True | |
31 | environ['wsgi.run_once'] = True |
|
31 | environ['wsgi.run_once'] = True | |
32 |
|
32 | |||
33 | if environ.get('HTTPS','off').lower() in ('on','1','yes'): |
|
33 | if environ.get('HTTPS', 'off').lower() in ('on', '1', 'yes'): | |
34 | environ['wsgi.url_scheme'] = 'https' |
|
34 | environ['wsgi.url_scheme'] = 'https' | |
35 | else: |
|
35 | else: | |
36 | environ['wsgi.url_scheme'] = 'http' |
|
36 | environ['wsgi.url_scheme'] = 'http' |
@@ -96,7 +96,7 b' def label(code):' | |||||
96 | mname = _fn2mod[code.co_filename] = k |
|
96 | mname = _fn2mod[code.co_filename] = k | |
97 | break |
|
97 | break | |
98 | else: |
|
98 | else: | |
99 | mname = _fn2mod[code.co_filename] = '<%s>'%code.co_filename |
|
99 | mname = _fn2mod[code.co_filename] = '<%s>' % code.co_filename | |
100 |
|
100 | |||
101 | return '%s:%d(%s)' % (mname, code.co_firstlineno, code.co_name) |
|
101 | return '%s:%d(%s)' % (mname, code.co_firstlineno, code.co_name) | |
102 |
|
102 |
@@ -293,7 +293,7 b' class fncachestore(basicstore):' | |||||
293 | if (mode not in ('r', 'rb') |
|
293 | if (mode not in ('r', 'rb') | |
294 | and path.startswith('data/') |
|
294 | and path.startswith('data/') | |
295 | and path not in fnc): |
|
295 | and path not in fnc): | |
296 |
|
|
296 | fnc.add(path) | |
297 | return op(hybridencode(path), mode, *args, **kw) |
|
297 | return op(hybridencode(path), mode, *args, **kw) | |
298 | self.opener = fncacheopener |
|
298 | self.opener = fncacheopener | |
299 |
|
299 |
@@ -95,10 +95,10 b' class engine(object):' | |||||
95 | except KeyError, i: |
|
95 | except KeyError, i: | |
96 | raise SyntaxError(_("unknown filter '%s'") % i[0]) |
|
96 | raise SyntaxError(_("unknown filter '%s'") % i[0]) | |
97 | def apply(get): |
|
97 | def apply(get): | |
98 |
|
|
98 | x = get(val) | |
99 |
|
|
99 | for f in filters: | |
100 |
|
|
100 | x = f(x) | |
101 |
|
|
101 | return x | |
102 | self.cache[expr] = apply |
|
102 | self.cache[expr] = apply | |
103 | return self.cache[expr](get) |
|
103 | return self.cache[expr](get) | |
104 |
|
104 |
General Comments 0
You need to be logged in to leave comments.
Login now