##// END OF EJS Templates
closehead: migrate `opts` to native kwargs
Matt Harbison -
r51766:25921338 default
parent child Browse files
Show More
@@ -54,8 +54,8 b' def close_branch(ui, repo, *revs, **opts'
54 text=message,
54 text=message,
55 files=[],
55 files=[],
56 filectxfn=None,
56 filectxfn=None,
57 user=opts.get(b'user'),
57 user=opts.get('user'),
58 date=opts.get(b'date'),
58 date=opts.get('date'),
59 extra=extra,
59 extra=extra,
60 )
60 )
61 tr = repo.transaction(b'commit')
61 tr = repo.transaction(b'commit')
@@ -64,9 +64,7 b' def close_branch(ui, repo, *revs, **opts'
64 cctx.markcommitted(ret)
64 cctx.markcommitted(ret)
65 tr.close()
65 tr.close()
66
66
67 opts = pycompat.byteskwargs(opts)
67 revs += tuple(opts.get('rev', []))
68
69 revs += tuple(opts.get(b'rev', []))
70 revs = logcmdutil.revrange(repo, revs)
68 revs = logcmdutil.revrange(repo, revs)
71
69
72 if not revs:
70 if not revs:
@@ -80,7 +78,7 b' def close_branch(ui, repo, *revs, **opts'
80 if rev not in heads:
78 if rev not in heads:
81 raise error.Abort(_(b'revision is not an open head: %d') % rev)
79 raise error.Abort(_(b'revision is not an open head: %d') % rev)
82
80
83 message = cmdutil.logmessage(ui, opts)
81 message = cmdutil.logmessage(ui, pycompat.byteskwargs(opts))
84 if not message:
82 if not message:
85 raise error.Abort(_(b"no commit message specified with -l or -m"))
83 raise error.Abort(_(b"no commit message specified with -l or -m"))
86 extra = {b'close': b'1'}
84 extra = {b'close': b'1'}
General Comments 0
You need to be logged in to leave comments. Login now