Mercurial > hg-stable
changeset 33104:d170f59f6f55
py3: fix kwargs handling for `hg bookmarks`
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sat, 24 Jun 2017 19:55:01 +0530 |
| parents | 73dfc72704b6 |
| children | 7fed389f9a9f |
| files | mercurial/bookmarks.py mercurial/commands.py |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bookmarks.py Mon Jun 26 09:37:16 2017 +0900 +++ b/mercurial/bookmarks.py Sat Jun 24 19:55:01 2017 +0530 @@ -20,6 +20,7 @@ error, lock as lockmod, obsolete, + pycompat, scmutil, txnutil, util, @@ -771,6 +772,7 @@ Provides a way for extensions to control how bookmarks are printed (e.g. prepend or postpend names) """ + opts = pycompat.byteskwargs(opts) fm = ui.formatter('bookmarks', opts) hexfn = fm.hexfunc if len(bmarks) == 0 and fm.isplain():
--- a/mercurial/commands.py Mon Jun 26 09:37:16 2017 +0900 +++ b/mercurial/commands.py Sat Jun 24 19:55:01 2017 +0530 @@ -944,12 +944,11 @@ hg book -f @ ''' - opts = pycompat.byteskwargs(opts) - force = opts.get('force') - rev = opts.get('rev') - delete = opts.get('delete') - rename = opts.get('rename') - inactive = opts.get('inactive') + force = opts.get(r'force') + rev = opts.get(r'rev') + delete = opts.get(r'delete') + rename = opts.get(r'rename') + inactive = opts.get(r'inactive') if delete and rename: raise error.Abort(_("--delete and --rename are incompatible"))