# HG changeset patch # User Vadim Gelfer # Date 1147383712 25200 # Node ID 6c9305fbebaf21a94f2445fc89a66105b864a3e5 # Parent d812d91c5a848ceea1e6fb1667d6af88145a32d3 fix coding style of backout editor change. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -789,7 +789,7 @@ def backout(ui, repo, rev, **opts): commit_opts['addremove'] = False if not commit_opts['message'] and not commit_opts['logfile']: commit_opts['message'] = _("Backed out changeset %s") % (hex(node)) - commit_opts['force_editor'] = True; + commit_opts['force_editor'] = True commit(ui, repo, **commit_opts) def nice(node): return '%d:%s' % (repo.changelog.rev(node), short(node)) @@ -988,12 +988,8 @@ def commit(ui, repo, *pats, **opts): else: files = [] try: - try: - force_editor = opts['force_editor'] - except KeyError: - force_editor = False repo.commit(files, message, opts['user'], opts['date'], match, - force_editor=force_editor) + force_editor=opts.get('force_editor')) except ValueError, inst: raise util.Abort(str(inst)) diff --git a/tests/test-backout.out b/tests/test-backout.out --- a/tests/test-backout.out +++ b/tests/test-backout.out @@ -1,19 +1,19 @@ # basic operation adding a -changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57 +changeset 2:c86754337410 backs out changeset 1:a820f4f40a57 a # file that was removed is recreated adding a adding a -changeset 2:44cd84c7349a backs out changeset 1:76862dcce372 +changeset 2:d2d961bd79f2 backs out changeset 1:76862dcce372 content # backout of backout is as if nothing happened removing a -changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a +changeset 3:8a7eeb5ab5ce backs out changeset 2:d2d961bd79f2 cat: a: No such file or directory # backout with merge adding a -changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 +changeset 3:3c9e845b409c backs out changeset 1:314f55b1bf23 merging with changeset 2:b66ea5b77abb merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved