##// END OF EJS Templates
cmdutil: avoid redefining write() function in export if possible...
Augie Fackler -
r32434:69c86414 default
parent child Browse files
Show More
@@ -1205,11 +1205,19 b" def export(repo, revs, fntemplate='hg-%h"
1205 revwidth = max(len(str(rev)) for rev in revs)
1205 revwidth = max(len(str(rev)) for rev in revs)
1206 filemode = {}
1206 filemode = {}
1207
1207
1208 write = None
1209 dest = '<unnamed>'
1210 if fp:
1211 dest = getattr(fp, 'name', dest)
1212 def write(s, **kw):
1213 fp.write(s)
1214 elif not fntemplate:
1215 write = repo.ui.write
1216
1208 for seqno, rev in enumerate(revs, 1):
1217 for seqno, rev in enumerate(revs, 1):
1209 ctx = repo[rev]
1218 ctx = repo[rev]
1210 fo = None
1219 fo = None
1211 dest = '<unnamed>'
1220 if not fp and fntemplate:
1212 if not fp and len(fntemplate) > 0:
1213 desc_lines = ctx.description().rstrip().split('\n')
1221 desc_lines = ctx.description().rstrip().split('\n')
1214 desc = desc_lines[0] #Commit always has a first line.
1222 desc = desc_lines[0] #Commit always has a first line.
1215 fo = makefileobj(repo, fntemplate, ctx.node(), desc=desc,
1223 fo = makefileobj(repo, fntemplate, ctx.node(), desc=desc,
@@ -1218,12 +1226,6 b" def export(repo, revs, fntemplate='hg-%h"
1218 dest = fo.name
1226 dest = fo.name
1219 def write(s, **kw):
1227 def write(s, **kw):
1220 fo.write(s)
1228 fo.write(s)
1221 elif fp:
1222 dest = getattr(fp, 'name', dest)
1223 def write(s, **kw):
1224 fp.write(s)
1225 else:
1226 write = repo.ui.write
1227 if not dest.startswith('<'):
1229 if not dest.startswith('<'):
1228 repo.ui.note("%s\n" % dest)
1230 repo.ui.note("%s\n" % dest)
1229 _exportsingle(
1231 _exportsingle(
General Comments 0
You need to be logged in to leave comments. Login now