From patchwork Mon Feb 12 20:24:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D2188: narrowrevlog: add what little I can remember about rename filtering From: phabricator X-Patchwork-Id: 27695 Message-Id: <4f24ed0c4bf6c9e8bc7b0aa7507f0d02@localhost.localdomain> To: mercurial-devel@mercurial-scm.org Date: Mon, 12 Feb 2018 20:24:06 +0000 durin42 updated this revision to Diff 5518. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2188?vs=5504&id=5518 REVISION DETAIL https://phab.mercurial-scm.org/D2188 AFFECTED FILES hgext/narrow/narrowrevlog.py CHANGE DETAILS To: durin42, #hg-reviewers Cc: mercurial-devel diff --git a/hgext/narrow/narrowrevlog.py b/hgext/narrow/narrowrevlog.py --- a/hgext/narrow/narrowrevlog.py +++ b/hgext/narrow/narrowrevlog.py @@ -139,6 +139,12 @@ def makenarrowfilelog(fl, narrowmatch): class narrowfilelog(fl.__class__): def renamed(self, node): + # Renames that come from outside the narrowspec are + # problematic at least for git-diffs, because we lack the + # base text for the rename. This logic was introduced in + # 3cd72b1 of narrowhg (authored by martinvonz, reviewed by + # adgar), but that revision doesn't have any additional + # commentary on what problems we can encounter. m = super(narrowfilelog, self).renamed(node) if m and not narrowmatch(m[0]): return None