comparison mercurial/cmdutil.py @ 25256:5a8398b085ed

record: extract ishunk to a function We extract this code as we want to reuse it in revert -i.
author Laurent Charignon <lcharignon@fb.com>
date Thu, 21 May 2015 14:28:02 -0700
parents 63a57a2727b6
children 07326d76f19d
comparison
equal deleted inserted replaced
25255:ad1d2c952889 25256:5a8398b085ed
15 import bookmarks 15 import bookmarks
16 import encoding 16 import encoding
17 import crecord as crecordmod 17 import crecord as crecordmod
18 import lock as lockmod 18 import lock as lockmod
19 19
20 def ishunk(x):
21 hunkclasses = (crecordmod.uihunk, patch.recordhunk)
22 return isinstance(x, hunkclasses)
23
20 def parsealiases(cmd): 24 def parsealiases(cmd):
21 return cmd.lstrip("^").split("|") 25 return cmd.lstrip("^").split("|")
22 26
23 def setupwrapcolorwrite(ui): 27 def setupwrapcolorwrite(ui):
24 # wrap ui.write so diff output can be labeled/colorized 28 # wrap ui.write so diff output can be labeled/colorized
57 return newchunks 61 return newchunks
58 62
59 def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, 63 def dorecord(ui, repo, commitfunc, cmdsuggest, backupall,
60 filterfn, *pats, **opts): 64 filterfn, *pats, **opts):
61 import merge as mergemod 65 import merge as mergemod
62 hunkclasses = (crecordmod.uihunk, patch.recordhunk)
63 ishunk = lambda x: isinstance(x, hunkclasses)
64 66
65 if not ui.interactive(): 67 if not ui.interactive():
66 raise util.Abort(_('running non-interactively, use %s instead') % 68 raise util.Abort(_('running non-interactively, use %s instead') %
67 cmdsuggest) 69 cmdsuggest)
68 70