equal
deleted
inserted
replaced
5786 """ |
5786 """ |
5787 |
5787 |
5788 opts = pycompat.byteskwargs(opts) |
5788 opts = pycompat.byteskwargs(opts) |
5789 confirm = ui.configbool(b'commands', b'resolve.confirm') |
5789 confirm = ui.configbool(b'commands', b'resolve.confirm') |
5790 flaglist = b'all mark unmark list no_status re_merge'.split() |
5790 flaglist = b'all mark unmark list no_status re_merge'.split() |
5791 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist] |
5791 all, mark, unmark, show, nostatus, remerge = (opts.get(o) for o in flaglist) |
5792 |
5792 |
5793 actioncount = len(list(filter(None, [show, mark, unmark, remerge]))) |
5793 actioncount = len(list(filter(None, [show, mark, unmark, remerge]))) |
5794 if actioncount > 1: |
5794 if actioncount > 1: |
5795 raise error.InputError(_(b"too many actions specified")) |
5795 raise error.InputError(_(b"too many actions specified")) |
5796 elif actioncount == 0 and ui.configbool( |
5796 elif actioncount == 0 and ui.configbool( |