[PATCH 5 of 5] record: change recording function to work with crecord
Laurent Charignon
lcharignon at fb.com
Thu Mar 12 17:00:45 CDT 2015
# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1426195232 25200
# Thu Mar 12 14:20:32 2015 -0700
# Node ID 1e3b23faba969afc6c2c356d5c300974f338d6e1
# Parent 80306e0957be92b28d1d7ce02450b9e5e200dabd
record: change recording function to work with crecord
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -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)
More information about the Mercurial-devel
mailing list