obsolete: rename _fnodesize to _fmfnodesize
authorPierre-Yves David <pierre-yves.david@fb.com>
Mon, 25 Aug 2014 14:52:51 +0200
changeset 22326 370b71622670
parent 22325 3363f2d36015
child 22327 f737631a9f0a
obsolete: rename _fnodesize to _fmfnodesize All variables involved in the obsstore format are prefixed with `_fm`. `_fnodesize` was the exception. It is now back in line. This is meaningful as we'll need to distinguish between multiple versions of the obsstore format.
mercurial/obsolete.py
--- a/mercurial/obsolete.py	Thu Aug 21 17:42:50 2014 -0700
+++ b/mercurial/obsolete.py	Mon Aug 25 14:52:51 2014 +0200
@@ -103,7 +103,7 @@
 _fmfixed   = '>BIB20s'
 _fmnode = '20s'
 _fmfsize = struct.calcsize(_fmfixed)
-_fnodesize = struct.calcsize(_fmnode)
+_fmfnodesize = struct.calcsize(_fmnode)
 
 ### obsolescence marker flag
 
@@ -156,7 +156,7 @@
         # read replacement
         sucs = ()
         if nbsuc:
-            s = (_fnodesize * nbsuc)
+            s = _fmfnodesize * nbsuc
             cur = data[off:off + s]
             sucs = _unpack(_fmnode * nbsuc, cur)
             off += s