##// END OF EJS Templates
filelog: use super() for calling base functions...
Durham Goode -
r19148:3bda242b default
parent child Browse files
Show More
@@ -1,92 +1,92
1 # filelog.py - file history class for mercurial
1 # filelog.py - file history class for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 import revlog
8 import revlog
9 import re
9 import re
10
10
11 _mdre = re.compile('\1\n')
11 _mdre = re.compile('\1\n')
12 def _parsemeta(text):
12 def _parsemeta(text):
13 """return (metadatadict, keylist, metadatasize)"""
13 """return (metadatadict, keylist, metadatasize)"""
14 # text can be buffer, so we can't use .startswith or .index
14 # text can be buffer, so we can't use .startswith or .index
15 if text[:2] != '\1\n':
15 if text[:2] != '\1\n':
16 return None, None, None
16 return None, None, None
17 s = _mdre.search(text, 2).start()
17 s = _mdre.search(text, 2).start()
18 mtext = text[2:s]
18 mtext = text[2:s]
19 meta = {}
19 meta = {}
20 keys = []
20 keys = []
21 for l in mtext.splitlines():
21 for l in mtext.splitlines():
22 k, v = l.split(": ", 1)
22 k, v = l.split(": ", 1)
23 meta[k] = v
23 meta[k] = v
24 keys.append(k)
24 keys.append(k)
25 return meta, keys, (s + 2)
25 return meta, keys, (s + 2)
26
26
27 def _packmeta(meta, keys=None):
27 def _packmeta(meta, keys=None):
28 if not keys:
28 if not keys:
29 keys = sorted(meta.iterkeys())
29 keys = sorted(meta.iterkeys())
30 return "".join("%s: %s\n" % (k, meta[k]) for k in keys)
30 return "".join("%s: %s\n" % (k, meta[k]) for k in keys)
31
31
32 class filelog(revlog.revlog):
32 class filelog(revlog.revlog):
33 def __init__(self, opener, path):
33 def __init__(self, opener, path):
34 revlog.revlog.__init__(self, opener,
34 super(filelog, self).__init__(opener,
35 "/".join(("data", path + ".i")))
35 "/".join(("data", path + ".i")))
36
36
37 def read(self, node):
37 def read(self, node):
38 t = self.revision(node)
38 t = self.revision(node)
39 if not t.startswith('\1\n'):
39 if not t.startswith('\1\n'):
40 return t
40 return t
41 s = t.index('\1\n', 2)
41 s = t.index('\1\n', 2)
42 return t[s + 2:]
42 return t[s + 2:]
43
43
44 def add(self, text, meta, transaction, link, p1=None, p2=None):
44 def add(self, text, meta, transaction, link, p1=None, p2=None):
45 if meta or text.startswith('\1\n'):
45 if meta or text.startswith('\1\n'):
46 text = "\1\n%s\1\n%s" % (_packmeta(meta), text)
46 text = "\1\n%s\1\n%s" % (_packmeta(meta), text)
47 return self.addrevision(text, transaction, link, p1, p2)
47 return self.addrevision(text, transaction, link, p1, p2)
48
48
49 def renamed(self, node):
49 def renamed(self, node):
50 if self.parents(node)[0] != revlog.nullid:
50 if self.parents(node)[0] != revlog.nullid:
51 return False
51 return False
52 t = self.revision(node)
52 t = self.revision(node)
53 m = _parsemeta(t)[0]
53 m = _parsemeta(t)[0]
54 if m and "copy" in m:
54 if m and "copy" in m:
55 return (m["copy"], revlog.bin(m["copyrev"]))
55 return (m["copy"], revlog.bin(m["copyrev"]))
56 return False
56 return False
57
57
58 def size(self, rev):
58 def size(self, rev):
59 """return the size of a given revision"""
59 """return the size of a given revision"""
60
60
61 # for revisions with renames, we have to go the slow way
61 # for revisions with renames, we have to go the slow way
62 node = self.node(rev)
62 node = self.node(rev)
63 if self.renamed(node):
63 if self.renamed(node):
64 return len(self.read(node))
64 return len(self.read(node))
65
65
66 # XXX if self.read(node).startswith("\1\n"), this returns (size+4)
66 # XXX if self.read(node).startswith("\1\n"), this returns (size+4)
67 return revlog.revlog.size(self, rev)
67 return super(filelog, self).size(rev)
68
68
69 def cmp(self, node, text):
69 def cmp(self, node, text):
70 """compare text with a given file revision
70 """compare text with a given file revision
71
71
72 returns True if text is different than what is stored.
72 returns True if text is different than what is stored.
73 """
73 """
74
74
75 t = text
75 t = text
76 if text.startswith('\1\n'):
76 if text.startswith('\1\n'):
77 t = '\1\n\1\n' + text
77 t = '\1\n\1\n' + text
78
78
79 samehashes = not revlog.revlog.cmp(self, node, t)
79 samehashes = not super(filelog, self).cmp(node, t)
80 if samehashes:
80 if samehashes:
81 return False
81 return False
82
82
83 # renaming a file produces a different hash, even if the data
83 # renaming a file produces a different hash, even if the data
84 # remains unchanged. Check if it's the case (slow):
84 # remains unchanged. Check if it's the case (slow):
85 if self.renamed(node):
85 if self.renamed(node):
86 t2 = self.read(node)
86 t2 = self.read(node)
87 return t2 != text
87 return t2 != text
88
88
89 return True
89 return True
90
90
91 def _file(self, f):
91 def _file(self, f):
92 return filelog(self.opener, f)
92 return filelog(self.opener, f)
General Comments 0
You need to be logged in to leave comments. Login now