--- a/hgext/convert/cvsps.py Tue Nov 20 14:21:56 2012 -0800
+++ b/hgext/convert/cvsps.py Sun Nov 25 13:53:47 2012 -0600
@@ -801,22 +801,22 @@
# Note: trailing spaces on several lines here are needed to have
# bug-for-bug compatibility with cvsps.
ui.write('---------------------\n')
- ui.write('PatchSet %d \n' % cs.id)
- ui.write('Date: %s\n' % util.datestr(cs.date,
- '%Y/%m/%d %H:%M:%S %1%2'))
- ui.write('Author: %s\n' % cs.author)
- ui.write('Branch: %s\n' % (cs.branch or 'HEAD'))
- ui.write('Tag%s: %s \n' % (['', 's'][len(cs.tags) > 1],
- ','.join(cs.tags) or '(none)'))
+ ui.write(('PatchSet %d \n' % cs.id))
+ ui.write(('Date: %s\n' % util.datestr(cs.date,
+ '%Y/%m/%d %H:%M:%S %1%2')))
+ ui.write(('Author: %s\n' % cs.author))
+ ui.write(('Branch: %s\n' % (cs.branch or 'HEAD')))
+ ui.write(('Tag%s: %s \n' % (['', 's'][len(cs.tags) > 1],
+ ','.join(cs.tags) or '(none)')))
branchpoints = getattr(cs, 'branchpoints', None)
if branchpoints:
- ui.write('Branchpoints: %s \n' % ', '.join(branchpoints))
+ ui.write(('Branchpoints: %s \n' % ', '.join(branchpoints)))
if opts["parents"] and cs.parents:
if len(cs.parents) > 1:
- ui.write('Parents: %s\n' %
- (','.join([str(p.id) for p in cs.parents])))
+ ui.write(('Parents: %s\n' %
+ (','.join([str(p.id) for p in cs.parents]))))
else:
- ui.write('Parent: %d\n' % cs.parents[0].id)
+ ui.write(('Parent: %d\n' % cs.parents[0].id))
if opts["ancestors"]:
b = cs.branch
@@ -825,11 +825,11 @@
b, c = ancestors[b]
r.append('%s:%d:%d' % (b or "HEAD", c, branches[b]))
if r:
- ui.write('Ancestors: %s\n' % (','.join(r)))
+ ui.write(('Ancestors: %s\n' % (','.join(r))))
- ui.write('Log:\n')
+ ui.write(('Log:\n'))
ui.write('%s\n\n' % cs.comment)
- ui.write('Members: \n')
+ ui.write(('Members: \n'))
for f in cs.entries:
fn = f.file
if fn.startswith(opts["prefix"]):
--- a/hgext/hgk.py Tue Nov 20 14:21:56 2012 -0800
+++ b/hgext/hgk.py Sun Nov 25 13:53:47 2012 -0600
@@ -98,9 +98,9 @@
if ctx is None:
ctx = repo[n]
# use ctx.node() instead ??
- ui.write("tree %s\n" % short(ctx.changeset()[0]))
+ ui.write(("tree %s\n" % short(ctx.changeset()[0])))
for p in ctx.parents():
- ui.write("parent %s\n" % p)
+ ui.write(("parent %s\n" % p))
date = ctx.date()
description = ctx.description().replace("\0", "")
@@ -110,10 +110,10 @@
else:
committer = ctx.user()
- ui.write("author %s %s %s\n" % (ctx.user(), int(date[0]), date[1]))
- ui.write("committer %s %s %s\n" % (committer, int(date[0]), date[1]))
- ui.write("revision %d\n" % ctx.rev())
- ui.write("branch %s\n\n" % ctx.branch())
+ ui.write(("author %s %s %s\n" % (ctx.user(), int(date[0]), date[1])))
+ ui.write(("committer %s %s %s\n" % (committer, int(date[0]), date[1])))
+ ui.write(("revision %d\n" % ctx.rev()))
+ ui.write(("branch %s\n\n" % ctx.branch()))
if prefix != "":
ui.write("%s%s\n" % (prefix,
@@ -302,7 +302,7 @@
def config(ui, repo, **opts):
"""print extension options"""
def writeopt(name, value):
- ui.write('k=%s\nv=%s\n' % (name, value))
+ ui.write(('k=%s\nv=%s\n' % (name, value)))
writeopt('vdiff', ui.config('hgk', 'vdiff', ''))
--- a/hgext/patchbomb.py Tue Nov 20 14:21:56 2012 -0800
+++ b/hgext/patchbomb.py Sun Nov 25 13:53:47 2012 -0600
@@ -474,11 +474,11 @@
if opts.get('diffstat') or opts.get('confirm'):
ui.write(_('\nFinal summary:\n\n'))
- ui.write('From: %s\n' % sender)
+ ui.write(('From: %s\n' % sender))
for addr in showaddrs:
ui.write('%s\n' % addr)
for m, subj, ds in msgs:
- ui.write('Subject: %s\n' % subj)
+ ui.write(('Subject: %s\n' % subj))
if ds:
ui.write(ds)
ui.write('\n')
--- a/mercurial/commands.py Tue Nov 20 14:21:56 2012 -0800
+++ b/mercurial/commands.py Sun Nov 25 13:53:47 2012 -0600
@@ -1513,7 +1513,7 @@
ui.progress(_('building'), id, unit=_('revisions'), total=total)
for type, data in dagparser.parsedag(text):
if type == 'n':
- ui.note('node %s\n' % str(data))
+ ui.note(('node %s\n' % str(data)))
id, ps = data
files = []
@@ -1574,10 +1574,10 @@
at = id
elif type == 'l':
id, name = data
- ui.note('tag %s\n' % name)
+ ui.note(('tag %s\n' % name))
tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
elif type == 'a':
- ui.note('branch %s\n' % data)
+ ui.note(('branch %s\n' % data))
atbranch = data
ui.progress(_('building'), id, unit=_('revisions'), total=total)
tr.close()
@@ -1595,7 +1595,7 @@
try:
gen = changegroup.readbundle(f, bundlepath)
if all:
- ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
+ ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
def showchunks(named):
ui.write("\n%s\n" % named)
@@ -1787,11 +1787,11 @@
d = util.parsedate(date, util.extendeddateformats)
else:
d = util.parsedate(date)
- ui.write("internal: %s %s\n" % d)
- ui.write("standard: %s\n" % util.datestr(d))
+ ui.write(("internal: %s %s\n") % d)
+ ui.write(("standard: %s\n") % util.datestr(d))
if range:
m = util.matchdate(range)
- ui.write("match: %s\n" % m(d[0]))
+ ui.write(("match: %s\n") % m(d[0]))
@command('debugdiscovery',
[('', 'old', None, _('use old-style discovery')),
@@ -1821,7 +1821,7 @@
force=True)
common = set(common)
if not opts.get('nonheads'):
- ui.write("unpruned common: %s\n" % " ".join([short(n)
+ ui.write(("unpruned common: %s\n") % " ".join([short(n)
for n in common]))
dag = dagutil.revlogdag(repo.changelog)
all = dag.ancestorset(dag.internalizeall(common))
@@ -1831,11 +1831,11 @@
common = set(common)
rheads = set(hds)
lheads = set(repo.heads())
- ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
+ ui.write(("common heads: %s\n") % " ".join([short(n) for n in common]))
if lheads <= common:
- ui.write("local is subset\n")
+ ui.write(("local is subset\n"))
elif rheads <= common:
- ui.write("remote is subset\n")
+ ui.write(("remote is subset\n"))
serverlogs = opts.get('serverlog')
if serverlogs:
@@ -1879,9 +1879,9 @@
def debugfsinfo(ui, path = "."):
"""show information detected about current filesystem"""
util.writefile('.debugfsinfo', '')
- ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
- ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
- ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
+ ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
+ ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
+ ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
and 'yes' or 'no'))
os.unlink('.debugfsinfo')
@@ -1979,7 +1979,7 @@
r = filelog
if not r:
r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
- ui.write("digraph G {\n")
+ ui.write(("digraph G {\n"))
for i in r:
node = r.node(i)
pp = r.parents(node)
@@ -2325,52 +2325,54 @@
def pcfmt(value, total):
return (value, 100 * float(value) / total)
- ui.write('format : %d\n' % format)
- ui.write('flags : %s\n' % ', '.join(flags))
+ ui.write(('format : %d\n') % format)
+ ui.write(('flags : %s\n') % ', '.join(flags))
ui.write('\n')
fmt = pcfmtstr(totalsize)
fmt2 = dfmtstr(totalsize)
- ui.write('revisions : ' + fmt2 % numrevs)
- ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
- ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
- ui.write('revisions : ' + fmt2 % numrevs)
- ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
- ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
- ui.write('revision size : ' + fmt2 % totalsize)
- ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
- ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
+ ui.write(('revisions : ') + fmt2 % numrevs)
+ ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
+ ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
+ ui.write(('revisions : ') + fmt2 % numrevs)
+ ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
+ ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
+ ui.write(('revision size : ') + fmt2 % totalsize)
+ ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
+ ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
ui.write('\n')
fmt = dfmtstr(max(avgchainlen, compratio))
- ui.write('avg chain length : ' + fmt % avgchainlen)
- ui.write('compression ratio : ' + fmt % compratio)
+ ui.write(('avg chain length : ') + fmt % avgchainlen)
+ ui.write(('compression ratio : ') + fmt % compratio)
if format > 0:
ui.write('\n')
- ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
+ ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
% tuple(datasize))
- ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
+ ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
% tuple(fullsize))
- ui.write('delta size (min/max/avg) : %d / %d / %d\n'
+ ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
% tuple(deltasize))
if numdeltas > 0:
ui.write('\n')
fmt = pcfmtstr(numdeltas)
fmt2 = pcfmtstr(numdeltas, 4)
- ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
+ ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
if numprev > 0:
- ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev,
+ ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
numprev))
- ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev,
+ ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
numprev))
- ui.write(' other : ' + fmt2 % pcfmt(numoprev,
+ ui.write((' other : ') + fmt2 % pcfmt(numoprev,
numprev))
if gdelta:
- ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
- ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
- ui.write('deltas against other : ' + fmt % pcfmt(numother,
+ ui.write(('deltas against p1 : ')
+ + fmt % pcfmt(nump1, numdeltas))
+ ui.write(('deltas against p2 : ')
+ + fmt % pcfmt(nump2, numdeltas))
+ ui.write(('deltas against other : ') + fmt % pcfmt(numother,
numdeltas))
@command('debugrevspec', [], ('REVSPEC'))
@@ -2448,9 +2450,9 @@
def debugsub(ui, repo, rev=None):
ctx = scmutil.revsingle(repo, rev, None)
for k, v in sorted(ctx.substate.items()):
- ui.write('path %s\n' % k)
- ui.write(' source %s\n' % v[0])
- ui.write(' revision %s\n' % v[1])
+ ui.write(('path %s\n') % k)
+ ui.write((' source %s\n') % v[0])
+ ui.write((' revision %s\n') % v[1])
@command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
def debugwalk(ui, repo, *pats, **opts):
--- a/tests/autodiff.py Tue Nov 20 14:21:56 2012 -0800
+++ b/tests/autodiff.py Sun Nov 25 13:53:47 2012 -0600
@@ -35,7 +35,7 @@
for chunk in it:
ui.write(chunk)
for fn in sorted(brokenfiles):
- ui.write('data lost for: %s\n' % fn)
+ ui.write(('data lost for: %s\n' % fn))
cmdtable = {
"autodiff":
--- a/tests/test-check-code-hg.t Tue Nov 20 14:21:56 2012 -0800
+++ b/tests/test-check-code-hg.t Sun Nov 25 13:53:47 2012 -0600
@@ -8,160 +8,3 @@
$ hg manifest | xargs "$check_code" || echo 'FAILURE IS NOT AN OPTION!!!'
$ hg manifest | xargs "$check_code" --warnings --nolineno --per-file=0 || true
- hgext/convert/cvsps.py:0:
- > ui.write('Ancestors: %s\n' % (','.join(r)))
- warning: unwrapped ui message
- hgext/convert/cvsps.py:0:
- > ui.write('Parent: %d\n' % cs.parents[0].id)
- warning: unwrapped ui message
- hgext/convert/cvsps.py:0:
- > ui.write('Parents: %s\n' %
- warning: unwrapped ui message
- hgext/convert/cvsps.py:0:
- > ui.write('Branchpoints: %s \n' % ', '.join(branchpoints))
- warning: unwrapped ui message
- hgext/convert/cvsps.py:0:
- > ui.write('Author: %s\n' % cs.author)
- warning: unwrapped ui message
- hgext/convert/cvsps.py:0:
- > ui.write('Branch: %s\n' % (cs.branch or 'HEAD'))
- warning: unwrapped ui message
- hgext/convert/cvsps.py:0:
- > ui.write('Date: %s\n' % util.datestr(cs.date,
- warning: unwrapped ui message
- hgext/convert/cvsps.py:0:
- > ui.write('Log:\n')
- warning: unwrapped ui message
- hgext/convert/cvsps.py:0:
- > ui.write('Members: \n')
- warning: unwrapped ui message
- hgext/convert/cvsps.py:0:
- > ui.write('PatchSet %d \n' % cs.id)
- warning: unwrapped ui message
- hgext/convert/cvsps.py:0:
- > ui.write('Tag%s: %s \n' % (['', 's'][len(cs.tags) > 1],
- warning: unwrapped ui message
- hgext/hgk.py:0:
- > ui.write("parent %s\n" % p)
- warning: unwrapped ui message
- hgext/hgk.py:0:
- > ui.write('k=%s\nv=%s\n' % (name, value))
- warning: unwrapped ui message
- hgext/hgk.py:0:
- > ui.write("author %s %s %s\n" % (ctx.user(), int(date[0]), date[1]))
- warning: unwrapped ui message
- hgext/hgk.py:0:
- > ui.write("branch %s\n\n" % ctx.branch())
- warning: unwrapped ui message
- hgext/hgk.py:0:
- > ui.write("committer %s %s %s\n" % (committer, int(date[0]), date[1]))
- warning: unwrapped ui message
- hgext/hgk.py:0:
- > ui.write("revision %d\n" % ctx.rev())
- warning: unwrapped ui message
- hgext/hgk.py:0:
- > ui.write("tree %s\n" % short(ctx.changeset()[0]))
- warning: unwrapped ui message
- hgext/patchbomb.py:0:
- > ui.write('Subject: %s\n' % subj)
- warning: unwrapped ui message
- hgext/patchbomb.py:0:
- > ui.write('From: %s\n' % sender)
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.note('branch %s\n' % data)
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.note('node %s\n' % str(data))
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.note('tag %s\n' % name)
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write("unpruned common: %s\n" % " ".join([short(n)
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write("local is subset\n")
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write("remote is subset\n")
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('deltas against other : ' + fmt % pcfmt(numother,
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write("match: %s\n" % m(d[0]))
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('path %s\n' % k)
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write("digraph G {\n")
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write("internal: %s %s\n" % d)
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write("standard: %s\n" % util.datestr(d))
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('avg chain length : ' + fmt % avgchainlen)
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('compression ratio : ' + fmt % compratio)
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('delta size (min/max/avg) : %d / %d / %d\n'
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('flags : %s\n' % ', '.join(flags))
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('format : %d\n' % format)
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('revision size : ' + fmt2 % totalsize)
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('revisions : ' + fmt2 % numrevs)
- warning: unwrapped ui message
- warning: unwrapped ui message
- mercurial/commands.py:0:
- > ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
- warning: unwrapped ui message
- tests/autodiff.py:0:
- > ui.write('data lost for: %s\n' % fn)
- warning: unwrapped ui message
- tests/test-ui-color.py:0:
- > testui.warn('warning\n')
- warning: unwrapped ui message
- tests/test-ui-color.py:0:
- > testui.write('buffered\n')
- warning: unwrapped ui message
--- a/tests/test-ui-color.py Tue Nov 20 14:21:56 2012 -0800
+++ b/tests/test-ui-color.py Sun Nov 25 13:53:47 2012 -0600
@@ -5,8 +5,8 @@
# ensure errors aren't buffered
testui = color.colorui()
testui.pushbuffer()
-testui.write('buffered\n')
-testui.warn('warning\n')
+testui.write(('buffered\n'))
+testui.warn(('warning\n'))
testui.write_err('error\n')
print repr(testui.popbuffer())