# HG changeset patch
# User Denis Laxalde <denis.laxalde@logilab.fr>
# Date 2017-10-19 13:06:33
# Node ID 907ff34e1460e2ced2aac24e728c242033394c23
# Parent  0ccfc468423a5b9dd213ae9461ebc91ae0f8d976

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.

diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -2330,6 +2330,11 @@ def diff(repo, node1=None, node2=None, m
             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):