##// END OF EJS Templates
record: extract ishunk to a function...
Laurent Charignon -
r25256:5a8398b0 default
parent child Browse files
Show More
@@ -17,6 +17,10 b' 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
@@ -59,8 +63,6 b' def recordfilter(ui, originalhunks):'
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') %
General Comments 0
You need to be logged in to leave comments. Login now