5223 [('a', 'all', None, _('select all unresolved files')), |
5223 [('a', 'all', None, _('select all unresolved files')), |
5224 ('l', 'list', None, _('list state of files needing merge')), |
5224 ('l', 'list', None, _('list state of files needing merge')), |
5225 ('m', 'mark', None, _('mark files as resolved')), |
5225 ('m', 'mark', None, _('mark files as resolved')), |
5226 ('u', 'unmark', None, _('mark files as unresolved')), |
5226 ('u', 'unmark', None, _('mark files as unresolved')), |
5227 ('n', 'no-status', None, _('hide status prefix'))] |
5227 ('n', 'no-status', None, _('hide status prefix'))] |
5228 + mergetoolopts + walkopts, |
5228 + mergetoolopts + walkopts + formatteropts, |
5229 _('[OPTION]... [FILE]...'), |
5229 _('[OPTION]... [FILE]...'), |
5230 inferrepo=True) |
5230 inferrepo=True) |
5231 def resolve(ui, repo, *pats, **opts): |
5231 def resolve(ui, repo, *pats, **opts): |
5232 """redo merges or set/view the merge status of files |
5232 """redo merges or set/view the merge status of files |
5233 |
5233 |
5276 if not (all or pats or show or mark or unmark): |
5276 if not (all or pats or show or mark or unmark): |
5277 raise util.Abort(_('no files or directories specified'), |
5277 raise util.Abort(_('no files or directories specified'), |
5278 hint=('use --all to remerge all files')) |
5278 hint=('use --all to remerge all files')) |
5279 |
5279 |
5280 if show: |
5280 if show: |
|
5281 fm = ui.formatter('resolve', opts) |
5281 ms = mergemod.mergestate(repo) |
5282 ms = mergemod.mergestate(repo) |
5282 m = scmutil.match(repo[None], pats, opts) |
5283 m = scmutil.match(repo[None], pats, opts) |
5283 for f in ms: |
5284 for f in ms: |
5284 if not m(f): |
5285 if not m(f): |
5285 continue |
5286 continue |
5286 if nostatus: |
5287 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved'}[ms[f]] |
5287 ui.write("%s\n" % f) |
5288 fm.startitem() |
5288 else: |
5289 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l) |
5289 ui.write("%s %s\n" % (ms[f].upper(), f), |
5290 fm.write('path', '%s\n', f, label=l) |
5290 label='resolve.' + |
5291 fm.end() |
5291 {'u': 'unresolved', 'r': 'resolved'}[ms[f]]) |
|
5292 return 0 |
5292 return 0 |
5293 |
5293 |
5294 wlock = repo.wlock() |
5294 wlock = repo.wlock() |
5295 try: |
5295 try: |
5296 ms = mergemod.mergestate(repo) |
5296 ms = mergemod.mergestate(repo) |