Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log: add an assertion about fctx not being None in patch.diff()
authorDenis Laxalde <denis.laxalde@logilab.fr>
Thu, 19 Oct 2017 15:06:33 +0200
changeset 34908 907ff34e1460
parent 34907 0ccfc468423a
child 34909 a52e5604d864
child 34956 3ce0e4b51f78
log: add an assertion about fctx not being None in patch.diff() As noted in the comment, this should not happen as removed files (the cause of fctx2 being None) are caught earlier.
mercurial/patch.py file | annotate | diff | comparison | revisions 
--- a/mercurial/patch.py	Thu Oct 19 14:55:10 2017 +0200
+++ b/mercurial/patch.py	Thu Oct 19 15:06:33 2017 +0200
@@ -2330,6 +2330,11 @@
             losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy,
     ):
         if hunksfilterfn is not None:
+            # If the file has been removed, fctx2 is None; but this should
+            # not occur here since we catch removed files early in
+            # cmdutil.getloglinerangerevs() for 'hg log -L'.
+            assert fctx2 is not None, \
+                'fctx2 unexpectly None in diff hunks filtering'
             hunks = hunksfilterfn(fctx2, hunks)
         text = ''.join(sum((list(hlines) for hrange, hlines in hunks), []))
         if hdr and (text or len(hdr) > 1):
mercurial