# HG changeset patch # User Laurent Charignon # Date 1426195232 25200 # Node ID e02a0a4194180287f997bc7ea7290e671730def8 # Parent 6409fb6c934d5aeac060daf75ca9914eed2b9b7c record: change recording function to work with crecord diff -r 6409fb6c934d -r e02a0a419418 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Thu Mar 12 14:19:11 2015 -0700 +++ b/mercurial/cmdutil.py Thu Mar 12 14:20:32 2015 -0700 @@ -14,6 +14,7 @@ import changelog import bookmarks import encoding +import crecord as crecordmod import lock as lockmod def parsealiases(cmd): @@ -86,9 +87,10 @@ newandmodifiedfiles = set() for h in chunks: + iscrecordhunk = isinstance(h, crecordmod.uihunk) ishunk = isinstance(h, patch.recordhunk) isnew = h.filename() in status.added - if ishunk and isnew and not h in originalchunks: + if (ishunk or iscrecordhunk) and isnew and not h in originalchunks: newandmodifiedfiles.add(h.filename()) modified = set(status.modified)