##// END OF EJS Templates
for calls expecting bool args, pass bool instead of int...
Nicolas Dumazet -
r9136:31177742 default
parent child Browse files
Show More
@@ -38,13 +38,13 b' def buildlist(names, top):'
38
38
39 def diff_files(file1, file2):
39 def diff_files(file1, file2):
40 if file1 is None:
40 if file1 is None:
41 b = file(file2).read().splitlines(1)
41 b = file(file2).read().splitlines(True)
42 l1 = "--- %s\n" % (file2)
42 l1 = "--- %s\n" % (file2)
43 l2 = "+++ %s\n" % (file2)
43 l2 = "+++ %s\n" % (file2)
44 l3 = "@@ -0,0 +1,%d @@\n" % len(b)
44 l3 = "@@ -0,0 +1,%d @@\n" % len(b)
45 l = [l1, l2, l3] + ["+" + e for e in b]
45 l = [l1, l2, l3] + ["+" + e for e in b]
46 elif file2 is None:
46 elif file2 is None:
47 a = file(file1).read().splitlines(1)
47 a = file(file1).read().splitlines(True)
48 l1 = "--- %s\n" % (file1)
48 l1 = "--- %s\n" % (file1)
49 l2 = "+++ %s\n" % (file1)
49 l2 = "+++ %s\n" % (file1)
50 l3 = "@@ -1,%d +0,0 @@\n" % len(a)
50 l3 = "@@ -1,%d +0,0 @@\n" % len(a)
@@ -52,8 +52,8 b' def diff_files(file1, file2):'
52 else:
52 else:
53 t1 = file(file1).read()
53 t1 = file(file1).read()
54 t2 = file(file2).read()
54 t2 = file(file2).read()
55 l1 = t1.splitlines(1)
55 l1 = t1.splitlines(True)
56 l2 = t2.splitlines(1)
56 l2 = t2.splitlines(True)
57 if options.difflib:
57 if options.difflib:
58 l = difflib.unified_diff(l1, l2, file1, file2)
58 l = difflib.unified_diff(l1, l2, file1, file2)
59 else:
59 else:
@@ -183,7 +183,7 b' class mercurial_sink(converter_sink):'
183 tagparent = nullid
183 tagparent = nullid
184
184
185 try:
185 try:
186 oldlines = sorted(parentctx['.hgtags'].data().splitlines(1))
186 oldlines = sorted(parentctx['.hgtags'].data().splitlines(True))
187 except:
187 except:
188 oldlines = []
188 oldlines = []
189
189
@@ -205,7 +205,7 b' class hgcia(object):'
205 msg['From'] = self.emailfrom
205 msg['From'] = self.emailfrom
206 msg['Subject'] = 'DeliverXML'
206 msg['Subject'] = 'DeliverXML'
207 msg['Content-type'] = 'text/xml'
207 msg['Content-type'] = 'text/xml'
208 msgtext = msg.as_string(0)
208 msgtext = msg.as_string()
209
209
210 self.ui.status(_('hgcia: sending update to %s\n') % address)
210 self.ui.status(_('hgcia: sending update to %s\n') % address)
211 mail.sendmail(self.ui, util.email(self.emailfrom),
211 mail.sendmail(self.ui, util.email(self.emailfrom),
@@ -221,7 +221,7 b' class notifier(object):'
221 hash(self.repo.root), socket.getfqdn()))
221 hash(self.repo.root), socket.getfqdn()))
222 msg['To'] = ', '.join(self.subs)
222 msg['To'] = ', '.join(self.subs)
223
223
224 msgtext = msg.as_string(0)
224 msgtext = msg.as_string()
225 if self.test:
225 if self.test:
226 self.ui.write(msgtext)
226 self.ui.write(msgtext)
227 if not msgtext.endswith('\n'):
227 if not msgtext.endswith('\n'):
@@ -1448,7 +1448,7 b' def help_(ui, name=None, with_version=Fa'
1448 if not doc:
1448 if not doc:
1449 doc = _("(no help text available)")
1449 doc = _("(no help text available)")
1450 if ui.quiet:
1450 if ui.quiet:
1451 doc = doc.splitlines(0)[0]
1451 doc = doc.splitlines()[0]
1452 ui.write("\n%s\n" % doc.rstrip())
1452 ui.write("\n%s\n" % doc.rstrip())
1453
1453
1454 if not ui.quiet:
1454 if not ui.quiet:
@@ -1476,7 +1476,7 b' def help_(ui, name=None, with_version=Fa'
1476 doc = gettext(e[0].__doc__)
1476 doc = gettext(e[0].__doc__)
1477 if not doc:
1477 if not doc:
1478 doc = _("(no help text available)")
1478 doc = _("(no help text available)")
1479 h[f] = doc.splitlines(0)[0].rstrip()
1479 h[f] = doc.splitlines()[0].rstrip()
1480 cmds[f] = c.lstrip("^")
1480 cmds[f] = c.lstrip("^")
1481
1481
1482 if not h:
1482 if not h:
@@ -1523,7 +1523,7 b' def help_(ui, name=None, with_version=Fa'
1523 raise error.UnknownCommand(name)
1523 raise error.UnknownCommand(name)
1524
1524
1525 doc = gettext(mod.__doc__) or _('no help text available')
1525 doc = gettext(mod.__doc__) or _('no help text available')
1526 doc = doc.splitlines(0)
1526 doc = doc.splitlines()
1527 ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))
1527 ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))
1528 for d in doc[1:]:
1528 for d in doc[1:]:
1529 ui.write(d, '\n')
1529 ui.write(d, '\n')
@@ -82,7 +82,7 b' class config(object):'
82 line = 0
82 line = 0
83 cont = 0
83 cont = 0
84
84
85 for l in data.splitlines(1):
85 for l in data.splitlines(True):
86 line += 1
86 line += 1
87 if cont:
87 if cont:
88 m = contre.match(l)
88 m = contre.match(l)
@@ -443,7 +443,7 b' class filectx(object):'
443 del hist[p]
443 del hist[p]
444 hist[f] = curr
444 hist[f] = curr
445
445
446 return zip(hist[f][0], hist[f][1].splitlines(1))
446 return zip(hist[f][0], hist[f][1].splitlines(True))
447
447
448 def ancestor(self, fc2):
448 def ancestor(self, fc2):
449 """
449 """
@@ -173,6 +173,6 b' def enabled():'
173 doc = (gettext(ext.__doc__) or _('(no help text available)'))
173 doc = (gettext(ext.__doc__) or _('(no help text available)'))
174 ename = ename.split('.')[-1]
174 ename = ename.split('.')[-1]
175 maxlength = max(len(ename), maxlength)
175 maxlength = max(len(ename), maxlength)
176 exts[ename] = doc.splitlines(0)[0].strip()
176 exts[ename] = doc.splitlines()[0].strip()
177
177
178 return exts, maxlength
178 return exts, maxlength
@@ -65,7 +65,7 b' def _filerevision(web, tmpl, fctx):'
65 text = '(binary:%s)' % mt
65 text = '(binary:%s)' % mt
66
66
67 def lines():
67 def lines():
68 for lineno, t in enumerate(text.splitlines(1)):
68 for lineno, t in enumerate(text.splitlines(True)):
69 yield {"line": t,
69 yield {"line": t,
70 "lineid": "l%d" % (lineno + 1),
70 "lineid": "l%d" % (lineno + 1),
71 "linenumber": "% 6d" % (lineno + 1),
71 "linenumber": "% 6d" % (lineno + 1),
@@ -73,7 +73,7 b' def fill(text, width):'
73 def firstline(text):
73 def firstline(text):
74 '''return the first line of text'''
74 '''return the first line of text'''
75 try:
75 try:
76 return text.splitlines(1)[0].rstrip('\r\n')
76 return text.splitlines(True)[0].rstrip('\r\n')
77 except IndexError:
77 except IndexError:
78 return ''
78 return ''
79
79
General Comments 0
You need to be logged in to leave comments. Login now