##// END OF EJS Templates
coding style: fix gratuitous whitespace after Python keywords
Thomas Arendsen Hein -
r13075:d73c3034 default
parent child Browse files
Show More
@@ -1076,7 +1076,7 b' class queue(object):'
1076
1076
1077 if move:
1077 if move:
1078 if not patch:
1078 if not patch:
1079 raise util.Abort(_("please specify the patch to move"))
1079 raise util.Abort(_("please specify the patch to move"))
1080 for i, rpn in enumerate(self.full_series[start:]):
1080 for i, rpn in enumerate(self.full_series[start:]):
1081 # strip markers for patch guards
1081 # strip markers for patch guards
1082 if self.guard_re.split(rpn, 1)[0] == patch:
1082 if self.guard_re.split(rpn, 1)[0] == patch:
@@ -344,10 +344,10 b' def filterpatch(ui, chunks):'
344 # new hunk
344 # new hunk
345 if resp_file[0] is None and resp_all[0] is None:
345 if resp_file[0] is None and resp_all[0] is None:
346 chunk.pretty(ui)
346 chunk.pretty(ui)
347 r = total == 1 and prompt(_('record this change to %r?') %
347 r = (total == 1
348 chunk.filename()) \
348 and prompt(_('record this change to %r?') % chunk.filename())
349 or prompt(_('record change %d/%d to %r?') %
349 or prompt(_('record change %d/%d to %r?') %
350 (pos, total, chunk.filename()))
350 (pos, total, chunk.filename())))
351 if r:
351 if r:
352 if fixoffset:
352 if fixoffset:
353 chunk = copy.copy(chunk)
353 chunk = copy.copy(chunk)
@@ -1220,7 +1220,7 b' class localrepository(repo.repository):'
1220 def heads(self, start=None):
1220 def heads(self, start=None):
1221 heads = self.changelog.heads(start)
1221 heads = self.changelog.heads(start)
1222 # sort the output in rev descending order
1222 # sort the output in rev descending order
1223 return sorted(heads, key=self.changelog.rev, reverse=True)
1223 return sorted(heads, key=self.changelog.rev, reverse=True)
1224
1224
1225 def branchheads(self, branch=None, start=None, closed=False):
1225 def branchheads(self, branch=None, start=None, closed=False):
1226 '''return a (possibly filtered) list of heads for the given branch
1226 '''return a (possibly filtered) list of heads for the given branch
General Comments 0
You need to be logged in to leave comments. Login now