Patchwork keyword: replace use of _filerev with _filenode

login
register
mail settings
Submitter Christian Ebert
Date April 21, 2016, 11:33 a.m.
Message ID <e2e0e3d3ba00ed301a0e.1461238422@1.0.0.127.in-addr.arpa>
Download mbox | patch
Permalink /patch/14759/
State Accepted
Delegated to: Augie Fackler
Headers show

Comments

Christian Ebert - April 21, 2016, 11:33 a.m.
# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1461060015 -3600
#      Tue Apr 19 11:00:15 2016 +0100
# Node ID e2e0e3d3ba00ed301a0ec41d79e3606609818112
# Parent  9fb2e8c8f3204a610eab3576d6aaf2fa7b8bc450
keyword: replace use of _filerev with _filenode

To be independent of rev numbers.
Analogous to ba8257cb53e8.
Christian Ebert - May 2, 2016, 9:43 p.m.
* Christian Ebert on Thursday, April 21, 2016 at 12:33:42 +0100
> # HG changeset patch
> # User Christian Ebert <blacktrash@gmx.net>
> # Date 1461060015 -3600
> #      Tue Apr 19 11:00:15 2016 +0100
> # Node ID e2e0e3d3ba00ed301a0ec41d79e3606609818112
> # Parent  9fb2e8c8f3204a610eab3576d6aaf2fa7b8bc450
> keyword: replace use of _filerev with _filenode

Ping. Shall I reasend? This one was too close to release I guess.
Matt Mackall - May 3, 2016, 3:41 p.m.
On Mon, 2016-05-02 at 22:43 +0100, Christian Ebert wrote:
> * Christian Ebert on Thursday, April 21, 2016 at 12:33:42 +0100
> > 
> > # HG changeset patch
> > # User Christian Ebert <blacktrash@gmx.net>
> > # Date 1461060015 -3600
> > #      Tue Apr 19 11:00:15 2016 +0100
> > # Node ID e2e0e3d3ba00ed301a0ec41d79e3606609818112
> > # Parent  9fb2e8c8f3204a610eab3576d6aaf2fa7b8bc450
> > keyword: replace use of _filerev with _filenode
> Ping. Shall I reasend? This one was too close to release I guess.

Queued for default, thanks.

Patch

diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -735,7 +735,7 @@  def reposetup(ui, repo):
     def kwfilectx_cmp(orig, self, fctx):
         # keyword affects data size, comparing wdir and filelog size does
         # not make sense
-        if (fctx._filerev is None and
+        if (fctx._filenode is None and
             (self._repo._encodefilterpats or
              kwt.match(fctx.path()) and 'l' not in fctx.flags() or
              self.size() - 4 == fctx.size()) or