##// END OF EJS Templates
histedit: miscellaneous style cleanups...
Augie Fackler -
r22987:e6d890e1 default
parent child Browse files
Show More
@@ -212,7 +212,7 b' class histeditstate(object):'
212 212 raise
213 213 raise util.Abort(_('no histedit in progress'))
214 214
215 (parentctxnode, rules, keep, topmost, replacements) = pickle.load(fp)
215 parentctxnode, rules, keep, topmost, replacements = pickle.load(fp)
216 216
217 217 self.parentctx = self.repo[parentctxnode]
218 218 self.rules = rules
@@ -361,8 +361,7 b' def pick(ui, state, ha, opts):'
361 361 n = commit(text=oldctx.description(), user=oldctx.user(),
362 362 date=oldctx.date(), extra=oldctx.extra())
363 363 if n is None:
364 ui.warn(_('%s: empty changeset\n')
365 % node.hex(ha))
364 ui.warn(_('%s: empty changeset\n') % node.hex(ha))
366 365 return ctx, []
367 366 new = repo[n]
368 367 return new, [(oldctx.node(), (n,))]
@@ -393,8 +392,7 b' def fold(ui, state, ha, opts):'
393 392 n = repo.commit(text='fold-temp-revision %s' % ha, user=oldctx.user(),
394 393 date=oldctx.date(), extra=oldctx.extra())
395 394 if n is None:
396 ui.warn(_('%s: empty changeset')
397 % node.hex(ha))
395 ui.warn(_('%s: empty changeset') % node.hex(ha))
398 396 return ctx, []
399 397 return finishfold(ui, repo, ctx, oldctx, n, opts, [])
400 398
@@ -456,8 +454,7 b' def message(ui, state, ha, opts):'
456 454 commit = commitfuncfor(repo, oldctx)
457 455 editor = cmdutil.getcommiteditor(edit=True, editform='histedit.mess')
458 456 new = commit(text=message, user=oldctx.user(), date=oldctx.date(),
459 extra=oldctx.extra(),
460 editor=editor)
457 extra=oldctx.extra(), editor=editor)
461 458 newctx = repo[new]
462 459 if oldctx.node() != newctx.node():
463 460 return newctx, [(oldctx.node(), (new,))]
@@ -747,9 +744,8 b' def bootstrapcontinue(ui, state, opts):'
747 744 editform = 'histedit.%s' % canonaction.get(action, action)
748 745 editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
749 746 commit = commitfuncfor(repo, ctx)
750 new = commit(text=message, user=ctx.user(),
751 date=ctx.date(), extra=ctx.extra(),
752 editor=editor)
747 new = commit(text=message, user=ctx.user(), date=ctx.date(),
748 extra=ctx.extra(), editor=editor)
753 749 if new is not None:
754 750 newchildren.append(new)
755 751
General Comments 0
You need to be logged in to leave comments. Login now