censor: fix [hg update] away from a revision with censored files

Differential Revision: https://phab.mercurial-scm.org/D12604

mercurial/filelog.py

@@ -202,10 +202,10 b' class filelog(object):'
 
         # for revisions with renames, we have to go the slow way
         node = self.node(rev)
+        if self.iscensored(rev):
+            return 0
         if self.renamed(node):
             return len(self.read(node))
-        if self.iscensored(rev):
-            return 0
 
         # XXX if self.read(node).startswith("\1\n"), this returns (size+4)
         return self._revlog.size(rev)

tests/test-censor2.t

@@ -19,5 +19,4 b''
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat target
   $ hg update tip
-  abort: file censored data/target:b1c12cf98dc8 (known-bad-output !)
-  [255]
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved