This is an archive of the discontinued Mercurial Phabricator instance.

Differential D567

patch: take messages out of the function so that extensions can add entries
ClosedPublic

Authored by pulkit on Aug 30 2017, 10:07 AM.

Details

Reviewers
lothiraldan
yuja
Group Reviewers
hg-reviewers
Commits
rHGc0170d88ed2b: patch: take messages out of the function so that extensions can add entries
Summary

Extensions will want to have interactive thing for more operations or
particulary want to show more verbs. So this patch takes out the message thing
from the function so that extensions can add verbs to this. The curses one is
also not in any function so extensions can add more actions and verbs there.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Aug 30 2017, 10:07 AM
lothiraldan accepted this revision.Aug 31 2017, 5:25 AM
lothiraldan added a subscriber: lothiraldan.

LGTM

yuja accepted this revision.Sep 1 2017, 9:18 AM
yuja added a subscriber: yuja.

Queued, thanks.

This revision is now accepted and ready to land.Sep 1 2017, 9:18 AM
Closed by commit rHGc0170d88ed2b: patch: take messages out of the function so that extensions can add entries (authored by pulkit). · Explain WhySep 1 2017, 9:57 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (96 lines)

Diff 1537

mercurial/patch.py

pretty = write pretty = write
def filename(self): def filename(self):
return self.header.filename() return self.header.filename()
def __repr__(self): def __repr__(self):
return '<hunk %r@%d>' % (self.filename(), self.fromline) return '<hunk %r@%d>' % (self.filename(), self.fromline)
def filterpatch(ui, headers, operation=None):
"""Interactively filter patch chunks into applied-only chunks"""
if operation is None:
operation = 'record'
messages = { messages = {
'multiple': { 'multiple': {
'discard': _("discard change %d/%d to '%s'?"), 'discard': _("discard change %d/%d to '%s'?"),
'record': _("record change %d/%d to '%s'?"), 'record': _("record change %d/%d to '%s'?"),
'revert': _("revert change %d/%d to '%s'?"), 'revert': _("revert change %d/%d to '%s'?"),
}[operation], },
'single': { 'single': {
'discard': _("discard this change to '%s'?"), 'discard': _("discard this change to '%s'?"),
'record': _("record this change to '%s'?"), 'record': _("record this change to '%s'?"),
'revert': _("revert this change to '%s'?"), 'revert': _("revert this change to '%s'?"),
}[operation], },
'help': { 'help': {
'discard': _('[Ynesfdaq?]' 'discard': _('[Ynesfdaq?]'
'$$ &Yes, discard this change' '$$ &Yes, discard this change'
'$$ &No, skip this change' '$$ &No, skip this change'
'$$ &Edit this change manually' '$$ &Edit this change manually'
'$$ &Skip remaining changes to this file' '$$ &Skip remaining changes to this file'
'$$ Discard remaining changes to this &file' '$$ Discard remaining changes to this &file'
'$$ &Done, skip remaining changes and files' '$$ &Done, skip remaining changes and files'
'$$ Discard &all changes to all remaining files' '$$ Discard &all changes to all remaining files'
'$$ &Quit, discarding no changes' '$$ &Quit, discarding no changes'
'$$ &? (display help)'), '$$ &? (display help)'),
'record': _('[Ynesfdaq?]' 'record': _('[Ynesfdaq?]'
'$$ &Yes, record this change' '$$ &Yes, record this change'
'$$ &No, skip this change' '$$ &No, skip this change'
'$$ &Edit this change manually' '$$ &Edit this change manually'
'$$ &Skip remaining changes to this file' '$$ &Skip remaining changes to this file'
'$$ Record remaining changes to this &file' '$$ Record remaining changes to this &file'
'$$ &Done, skip remaining changes and files' '$$ &Done, skip remaining changes and files'
'$$ Record &all changes to all remaining files' '$$ Record &all changes to all remaining files'
'$$ &Quit, recording no changes' '$$ &Quit, recording no changes'
'$$ &? (display help)'), '$$ &? (display help)'),
'revert': _('[Ynesfdaq?]' 'revert': _('[Ynesfdaq?]'
'$$ &Yes, revert this change' '$$ &Yes, revert this change'
'$$ &No, skip this change' '$$ &No, skip this change'
'$$ &Edit this change manually' '$$ &Edit this change manually'
'$$ &Skip remaining changes to this file' '$$ &Skip remaining changes to this file'
'$$ Revert remaining changes to this &file' '$$ Revert remaining changes to this &file'
'$$ &Done, skip remaining changes and files' '$$ &Done, skip remaining changes and files'
'$$ Revert &all changes to all remaining files' '$$ Revert &all changes to all remaining files'
'$$ &Quit, reverting no changes' '$$ &Quit, reverting no changes'
'$$ &? (display help)') '$$ &? (display help)')
}[operation]
} }
}
def filterpatch(ui, headers, operation=None):
"""Interactively filter patch chunks into applied-only chunks"""
if operation is None:
operation = 'record'
def prompt(skipfile, skipall, query, chunk): def prompt(skipfile, skipall, query, chunk):
"""prompt query, and process base inputs """prompt query, and process base inputs
- y/n for the rest of file - y/n for the rest of file
- y/n for the rest - y/n for the rest
- ? (help) - ? (help)
- q (quit) - q (quit)
Return True/False and possibly updated skipfile and skipall. Return True/False and possibly updated skipfile and skipall.
""" """
newpatches = None newpatches = None
if skipall is not None: if skipall is not None:
return skipall, skipfile, skipall, newpatches return skipall, skipfile, skipall, newpatches
if skipfile is not None: if skipfile is not None:
return skipfile, skipfile, skipall, newpatches return skipfile, skipfile, skipall, newpatches
while True: while True:
resps = messages['help'] resps = messages['help'][operation]
r = ui.promptchoice("%s %s" % (query, resps)) r = ui.promptchoice("%s %s" % (query, resps))
ui.write("\n") ui.write("\n")
if r == 8: # ? if r == 8: # ?
for c, t in ui.extractchoices(resps)[1]: for c, t in ui.extractchoices(resps)[1]:
ui.write('%s - %s\n' % (c, encoding.lower(t))) ui.write('%s - %s\n' % (c, encoding.lower(t)))
continue continue
elif r == 0: # yes elif r == 0: # yes
ret = True ret = True
applied[h.filename()] = [h] applied[h.filename()] = [h]
if h.allhunks(): if h.allhunks():
applied[h.filename()] += h.hunks applied[h.filename()] += h.hunks
continue continue
for i, chunk in enumerate(h.hunks): for i, chunk in enumerate(h.hunks):
if skipfile is None and skipall is None: if skipfile is None and skipall is None:
chunk.pretty(ui) chunk.pretty(ui)
if total == 1: if total == 1:
msg = messages['single'] % chunk.filename() msg = messages['single'][operation] % chunk.filename()
else: else:
idx = pos - len(h.hunks) + i idx = pos - len(h.hunks) + i
msg = messages['multiple'] % (idx, total, chunk.filename()) msg = messages['multiple'][operation] % (idx, total,
chunk.filename())
r, skipfile, skipall, newpatches = prompt(skipfile, r, skipfile, skipall, newpatches = prompt(skipfile,
skipall, msg, chunk) skipall, msg, chunk)
if r: if r:
if fixoffset: if fixoffset:
chunk = copy.copy(chunk) chunk = copy.copy(chunk)
chunk.toline += fixoffset chunk.toline += fixoffset
applied[chunk.filename()].append(chunk) applied[chunk.filename()].append(chunk)
elif newpatches is not None: elif newpatches is not None: