##// END OF EJS Templates
histedit: fix unused variable warnings spotted by pyflakes
Patrick Mezard -
r17451:8e1fa8a3 default
parent child Browse files
Show More
@@ -238,7 +238,7 b' def edit(ui, repo, ctx, ha, opts):'
238 oldctx = repo[ha]
238 oldctx = repo[ha]
239 hg.update(repo, ctx.node())
239 hg.update(repo, ctx.node())
240 try:
240 try:
241 files = foldchanges(ui, repo, oldctx.p1().node() , ha, opts)
241 foldchanges(ui, repo, oldctx.p1().node() , ha, opts)
242 except Exception:
242 except Exception:
243 pass
243 pass
244 raise util.Abort(_('Make changes as needed, you may commit or record as '
244 raise util.Abort(_('Make changes as needed, you may commit or record as '
@@ -264,7 +264,7 b' def fold(ui, repo, ctx, ha, opts):'
264 def finishfold(ui, repo, ctx, oldctx, newnode, opts, internalchanges):
264 def finishfold(ui, repo, ctx, oldctx, newnode, opts, internalchanges):
265 parent = ctx.parents()[0].node()
265 parent = ctx.parents()[0].node()
266 hg.update(repo, parent)
266 hg.update(repo, parent)
267 files = foldchanges(ui, repo, parent, newnode, opts)
267 foldchanges(ui, repo, parent, newnode, opts)
268 newmessage = '\n***\n'.join(
268 newmessage = '\n***\n'.join(
269 [ctx.description()] +
269 [ctx.description()] +
270 [repo[r].description() for r in internalchanges] +
270 [repo[r].description() for r in internalchanges] +
@@ -287,7 +287,7 b' def message(ui, repo, ctx, ha, opts):'
287 oldctx = repo[ha]
287 oldctx = repo[ha]
288 hg.update(repo, ctx.node())
288 hg.update(repo, ctx.node())
289 try:
289 try:
290 files = foldchanges(ui, repo, oldctx.p1().node() , ha, opts)
290 foldchanges(ui, repo, oldctx.p1().node() , ha, opts)
291 except Exception:
291 except Exception:
292 raise util.Abort(_('Fix up the change and run '
292 raise util.Abort(_('Fix up the change and run '
293 'hg histedit --continue'))
293 'hg histedit --continue'))
General Comments 0
You need to be logged in to leave comments. Login now