##// END OF EJS Templates
record: minor refactoring of dorecord...
Laurent Charignon -
r24345:01b39149 default
parent child Browse files
Show More
@@ -39,6 +39,9 b' def recordfilter(ui, originalhunks):'
39 def dorecord(ui, repo, commitfunc, cmdsuggest, backupall,
39 def dorecord(ui, repo, commitfunc, cmdsuggest, backupall,
40 filterfn, *pats, **opts):
40 filterfn, *pats, **opts):
41 import merge as mergemod
41 import merge as mergemod
42 hunkclasses = (crecordmod.uihunk, patch.recordhunk)
43 ishunk = lambda x: isinstance(x, hunkclasses)
44
42 if not ui.interactive():
45 if not ui.interactive():
43 raise util.Abort(_('running non-interactively, use %s instead') %
46 raise util.Abort(_('running non-interactively, use %s instead') %
44 cmdsuggest)
47 cmdsuggest)
@@ -96,10 +99,8 b' def dorecord(ui, repo, commitfunc, cmdsu'
96
99
97 newandmodifiedfiles = set()
100 newandmodifiedfiles = set()
98 for h in chunks:
101 for h in chunks:
99 iscrecordhunk = isinstance(h, crecordmod.uihunk)
100 ishunk = isinstance(h, patch.recordhunk)
101 isnew = h.filename() in status.added
102 isnew = h.filename() in status.added
102 if (ishunk or iscrecordhunk) and isnew and not h in originalchunks:
103 if ishunk(h) and isnew and not h in originalchunks:
103 newandmodifiedfiles.add(h.filename())
104 newandmodifiedfiles.add(h.filename())
104
105
105 modified = set(status.modified)
106 modified = set(status.modified)
General Comments 0
You need to be logged in to leave comments. Login now