# HG changeset patch # User Laurent Charignon # Date 1426207823 25200 # Node ID 01b39149ebb383f084243245450f736d526b9917 # Parent 6b43baac6dfbc9b824c73e09c35753c103e56326 record: minor refactoring of dorecord It prepares the way for introducing the flag to reverse hunk selection diff -r 6b43baac6dfb -r 01b39149ebb3 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Thu Mar 12 14:42:55 2015 -0700 +++ b/mercurial/cmdutil.py Thu Mar 12 17:50:23 2015 -0700 @@ -39,6 +39,9 @@ def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, filterfn, *pats, **opts): import merge as mergemod + hunkclasses = (crecordmod.uihunk, patch.recordhunk) + ishunk = lambda x: isinstance(x, hunkclasses) + if not ui.interactive(): raise util.Abort(_('running non-interactively, use %s instead') % cmdsuggest) @@ -96,10 +99,8 @@ newandmodifiedfiles = set() for h in chunks: - iscrecordhunk = isinstance(h, crecordmod.uihunk) - ishunk = isinstance(h, patch.recordhunk) isnew = h.filename() in status.added - if (ishunk or iscrecordhunk) and isnew and not h in originalchunks: + if ishunk(h) and isnew and not h in originalchunks: newandmodifiedfiles.add(h.filename()) modified = set(status.modified)