equal
deleted
inserted
replaced
4838 if unmark and not pats: |
4838 if unmark and not pats: |
4839 if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?' |
4839 if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?' |
4840 b'$$ &Yes $$ &No')): |
4840 b'$$ &Yes $$ &No')): |
4841 raise error.Abort(_('user quit')) |
4841 raise error.Abort(_('user quit')) |
4842 |
4842 |
|
4843 uipathfn = scmutil.getuipathfn(repo) |
|
4844 |
4843 if show: |
4845 if show: |
4844 ui.pager('resolve') |
4846 ui.pager('resolve') |
4845 fm = ui.formatter('resolve', opts) |
4847 fm = ui.formatter('resolve', opts) |
4846 ms = mergemod.mergestate.read(repo) |
4848 ms = mergemod.mergestate.read(repo) |
4847 wctx = repo[None] |
4849 wctx = repo[None] |
4865 |
4867 |
4866 label, key = mergestateinfo[ms[f]] |
4868 label, key = mergestateinfo[ms[f]] |
4867 fm.startitem() |
4869 fm.startitem() |
4868 fm.context(ctx=wctx) |
4870 fm.context(ctx=wctx) |
4869 fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label) |
4871 fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label) |
4870 fm.write('path', '%s\n', f, label=label) |
4872 fm.data(path=f) |
|
4873 fm.plain('%s\n' % uipathfn(f), label=label) |
4871 fm.end() |
4874 fm.end() |
4872 return 0 |
4875 return 0 |
4873 |
4876 |
4874 with repo.wlock(): |
4877 with repo.wlock(): |
4875 ms = mergemod.mergestate.read(repo) |
4878 ms = mergemod.mergestate.read(repo) |