--- a/hgext/mq.py Fri Dec 03 11:23:38 2010 +0100
+++ b/hgext/mq.py Fri Dec 03 11:30:45 2010 +0100
@@ -1076,7 +1076,7 @@
if move:
if not patch:
- raise util.Abort(_("please specify the patch to move"))
+ raise util.Abort(_("please specify the patch to move"))
for i, rpn in enumerate(self.full_series[start:]):
# strip markers for patch guards
if self.guard_re.split(rpn, 1)[0] == patch:
--- a/hgext/record.py Fri Dec 03 11:23:38 2010 +0100
+++ b/hgext/record.py Fri Dec 03 11:30:45 2010 +0100
@@ -344,10 +344,10 @@
# new hunk
if resp_file[0] is None and resp_all[0] is None:
chunk.pretty(ui)
- r = total == 1 and prompt(_('record this change to %r?') %
- chunk.filename()) \
- or prompt(_('record change %d/%d to %r?') %
- (pos, total, chunk.filename()))
+ r = (total == 1
+ and prompt(_('record this change to %r?') % chunk.filename())
+ or prompt(_('record change %d/%d to %r?') %
+ (pos, total, chunk.filename())))
if r:
if fixoffset:
chunk = copy.copy(chunk)
--- a/mercurial/localrepo.py Fri Dec 03 11:23:38 2010 +0100
+++ b/mercurial/localrepo.py Fri Dec 03 11:30:45 2010 +0100
@@ -1220,7 +1220,7 @@
def heads(self, start=None):
heads = self.changelog.heads(start)
# sort the output in rev descending order
- return sorted(heads, key=self.changelog.rev, reverse=True)
+ return sorted(heads, key=self.changelog.rev, reverse=True)
def branchheads(self, branch=None, start=None, closed=False):
'''return a (possibly filtered) list of heads for the given branch