##// END OF EJS Templates
pep8: fixed issue with shadowing reserved python variables.
marcink -
r119:36ec6f9e default
parent child Browse files
Show More
@@ -389,14 +389,14 b' class HgRemote(object):'
389 389 repo = self._factory.repo(wire)
390 390
391 391 if file_filter:
392 filter = match(file_filter[0], '', [file_filter[1]])
392 match_filter = match(file_filter[0], '', [file_filter[1]])
393 393 else:
394 filter = file_filter
394 match_filter = file_filter
395 395 opts = diffopts(git=opt_git, ignorews=opt_ignorews, context=context)
396 396
397 397 try:
398 398 return "".join(patch.diff(
399 repo, node1=rev1, node2=rev2, match=filter, opts=opts))
399 repo, node1=rev1, node2=rev2, match=match_filter, opts=opts))
400 400 except RepoLookupError:
401 401 raise exceptions.LookupException()
402 402
@@ -76,12 +76,14 b' def filter_ignorable_lines(hunks, fromli'
76 76 elif tag == 'replace' and (ignore_case or ignore_space_changes):
77 77 if len(fromlines) != len(tolines):
78 78 return False
79 def f(str):
79
80 def f(input_str):
80 81 if ignore_case:
81 str = str.lower()
82 input_str = input_str.lower()
82 83 if ignore_space_changes:
83 str = ' '.join(str.split())
84 return str
84 input_str = ' '.join(input_str.split())
85 return input_str
86
85 87 for i in range(len(fromlines)):
86 88 if f(fromlines[i]) != f(tolines[i]):
87 89 return False
General Comments 0
You need to be logged in to leave comments. Login now