Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/filelog.py @ 1598:14d1f1868bf6
cleanup of revlog.group when repository is local
revlog.group cached every chunk from the revlog, the behaviour was
needed to minimize the roundtrip with old-http.
We now cache the revlog data ~4MB at a time.
The memory used server side when pulling goes down to 35Mo maximum
whereas without the patch more than 160Mo was used when cloning the linux kernel
repository.
The time used by cloning is higher mainly because of the check in revlog.revision.
before
110.25user 20.90system 2:52.00elapsed 76%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+708707minor)pagefaults 0swaps
after
117.56user 18.86system 2:50.43elapsed 80%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+748366minor)pagefaults 0swaps
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 27 Dec 2005 13:09:49 -0600 |
| parents | dca956c9767d |
| children | c21b54f7f7b8 74d3f5336b66 |
| rev | line source |
|---|---|
| 1089 | 1 # filelog.py - file history class for mercurial |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
2 # |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
3 # Copyright 2005 Matt Mackall <mpm@selenic.com> |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
4 # |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
5 # This software may be used and distributed according to the terms |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
6 # of the GNU General Public License, incorporated herein by reference. |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
7 |
| 1089 | 8 import os |
| 262 | 9 from revlog import * |
| 10 from demandload import * | |
| 1089 | 11 demandload(globals(), "bdiff") |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
12 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
13 class filelog(revlog): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
14 def __init__(self, opener, path): |
|
144
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
15 revlog.__init__(self, opener, |
|
786
902b12d55751
Fix the directory and revlog collision problem
mpm@selenic.com
parents:
785
diff
changeset
|
16 os.path.join("data", self.encodedir(path + ".i")), |
|
902b12d55751
Fix the directory and revlog collision problem
mpm@selenic.com
parents:
785
diff
changeset
|
17 os.path.join("data", self.encodedir(path + ".d"))) |
|
902b12d55751
Fix the directory and revlog collision problem
mpm@selenic.com
parents:
785
diff
changeset
|
18 |
|
902b12d55751
Fix the directory and revlog collision problem
mpm@selenic.com
parents:
785
diff
changeset
|
19 # This avoids a collision between a file named foo and a dir named |
|
902b12d55751
Fix the directory and revlog collision problem
mpm@selenic.com
parents:
785
diff
changeset
|
20 # foo.i or foo.d |
|
902b12d55751
Fix the directory and revlog collision problem
mpm@selenic.com
parents:
785
diff
changeset
|
21 def encodedir(self, path): |
|
856
fbe964ae7325
Fixed encoding of directories ending in .d or .i:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
839
diff
changeset
|
22 return (path |
|
fbe964ae7325
Fixed encoding of directories ending in .d or .i:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
839
diff
changeset
|
23 .replace(".hg/", ".hg.hg/") |
|
fbe964ae7325
Fixed encoding of directories ending in .d or .i:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
839
diff
changeset
|
24 .replace(".i/", ".i.hg/") |
|
fbe964ae7325
Fixed encoding of directories ending in .d or .i:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
839
diff
changeset
|
25 .replace(".d/", ".d.hg/")) |
|
786
902b12d55751
Fix the directory and revlog collision problem
mpm@selenic.com
parents:
785
diff
changeset
|
26 |
|
902b12d55751
Fix the directory and revlog collision problem
mpm@selenic.com
parents:
785
diff
changeset
|
27 def decodedir(self, path): |
|
856
fbe964ae7325
Fixed encoding of directories ending in .d or .i:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
839
diff
changeset
|
28 return (path |
|
fbe964ae7325
Fixed encoding of directories ending in .d or .i:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
839
diff
changeset
|
29 .replace(".d.hg/", ".d/") |
|
fbe964ae7325
Fixed encoding of directories ending in .d or .i:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
839
diff
changeset
|
30 .replace(".i.hg/", ".i/") |
|
fbe964ae7325
Fixed encoding of directories ending in .d or .i:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
839
diff
changeset
|
31 .replace(".hg.hg/", ".hg/")) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
32 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
33 def read(self, node): |
| 360 | 34 t = self.revision(node) |
|
686
d7d68d27ebe5
Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents:
681
diff
changeset
|
35 if not t.startswith('\1\n'): |
| 360 | 36 return t |
| 37 s = t.find('\1\n', 2) | |
| 38 return t[s+2:] | |
| 39 | |
| 40 def readmeta(self, node): | |
| 41 t = self.revision(node) | |
|
686
d7d68d27ebe5
Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents:
681
diff
changeset
|
42 if not t.startswith('\1\n'): |
| 1116 | 43 return {} |
| 360 | 44 s = t.find('\1\n', 2) |
| 45 mt = t[2:s] | |
| 1116 | 46 m = {} |
| 360 | 47 for l in mt.splitlines(): |
| 48 k, v = l.split(": ", 1) | |
| 49 m[k] = v | |
| 50 return m | |
| 51 | |
| 52 def add(self, text, meta, transaction, link, p1=None, p2=None): | |
|
686
d7d68d27ebe5
Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents:
681
diff
changeset
|
53 if meta or text.startswith('\1\n'): |
| 360 | 54 mt = "" |
| 55 if meta: | |
| 56 mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ] | |
|
1540
8ca9f5b17257
minor optimization: save some string trash
twaldmann@thinkmo.de
parents:
1117
diff
changeset
|
57 text = "\1\n%s\1\n%s" % ("".join(mt), text) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
58 return self.addrevision(text, transaction, link, p1, p2) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
59 |
| 1116 | 60 def renamed(self, node): |
|
1595
dca956c9767d
Re-enable the renamed check fastpath
Matt Mackall <mpm@selenic.com>
parents:
1541
diff
changeset
|
61 if self.parents(node)[0] != nullid: |
| 1116 | 62 return False |
| 63 m = self.readmeta(node) | |
| 64 if m and m.has_key("copy"): | |
| 65 return (m["copy"], bin(m["copyrev"])) | |
| 66 return False | |
| 67 | |
| 79 | 68 def annotate(self, node): |
| 199 | 69 |
| 70 def decorate(text, rev): | |
| 436 | 71 return ([rev] * len(text.splitlines()), text) |
| 199 | 72 |
| 73 def pair(parent, child): | |
| 436 | 74 for a1, a2, b1, b2 in bdiff.blocks(parent[1], child[1]): |
| 471 | 75 child[0][b1:b2] = parent[0][a1:a2] |
| 76 return child | |
| 199 | 77 |
| 200 | 78 # find all ancestors |
|
216
201115f2859b
hg annotate: actually annotate the given version
mpm@selenic.com
parents:
210
diff
changeset
|
79 needed = {node:1} |
| 199 | 80 visit = [node] |
| 81 while visit: | |
| 82 n = visit.pop(0) | |
| 83 for p in self.parents(n): | |
| 84 if p not in needed: | |
| 85 needed[p] = 1 | |
| 86 visit.append(p) | |
| 200 | 87 else: |
| 88 # count how many times we'll use this | |
| 89 needed[p] += 1 | |
| 199 | 90 |
| 200 | 91 # sort by revision which is a topological order |
| 471 | 92 visit = [ (self.rev(n), n) for n in needed.keys() ] |
| 199 | 93 visit.sort() |
| 94 hist = {} | |
| 95 | |
| 471 | 96 for r,n in visit: |
| 199 | 97 curr = decorate(self.read(n), self.linkrev(n)) |
| 98 for p in self.parents(n): | |
| 99 if p != nullid: | |
| 100 curr = pair(hist[p], curr) | |
| 200 | 101 # trim the history of unneeded revs |
| 102 needed[p] -= 1 | |
| 103 if not needed[p]: | |
| 104 del hist[p] | |
| 199 | 105 hist[n] = curr |
| 106 | |
| 436 | 107 return zip(hist[n][0], hist[n][1].splitlines(1)) |