equal
deleted
inserted
replaced
4527 |
4527 |
4528 Returns 0 on success, 1 if any files fail a resolve attempt. |
4528 Returns 0 on success, 1 if any files fail a resolve attempt. |
4529 """ |
4529 """ |
4530 |
4530 |
4531 opts = pycompat.byteskwargs(opts) |
4531 opts = pycompat.byteskwargs(opts) |
|
4532 confirm = ui.configbool('commands', 'resolve.confirm') |
4532 flaglist = 'all mark unmark list no_status'.split() |
4533 flaglist = 'all mark unmark list no_status'.split() |
4533 all, mark, unmark, show, nostatus = \ |
4534 all, mark, unmark, show, nostatus = \ |
4534 [opts.get(o) for o in flaglist] |
4535 [opts.get(o) for o in flaglist] |
|
4536 |
|
4537 if all and confirm: |
|
4538 if ui.promptchoice(_(b're-merge all unresolved files (yn)?' |
|
4539 b'$$ &Yes $$ &No')): |
|
4540 raise error.Abort(_('user quit')) |
4535 |
4541 |
4536 if (show and (mark or unmark)) or (mark and unmark): |
4542 if (show and (mark or unmark)) or (mark and unmark): |
4537 raise error.Abort(_("too many options specified")) |
4543 raise error.Abort(_("too many options specified")) |
4538 if pats and all: |
4544 if pats and all: |
4539 raise error.Abort(_("can't specify --all and patterns")) |
4545 raise error.Abort(_("can't specify --all and patterns")) |