Show More
@@ -21,14 +21,14 b' class filelog(revlog):' | |||||
21 |
|
21 | |||
22 | def read(self, node): |
|
22 | def read(self, node): | |
23 | t = self.revision(node) |
|
23 | t = self.revision(node) | |
24 |
if |
|
24 | if t[:2] != '\1\n': | |
25 | return t |
|
25 | return t | |
26 | s = t.find('\1\n', 2) |
|
26 | s = t.find('\1\n', 2) | |
27 | return t[s+2:] |
|
27 | return t[s+2:] | |
28 |
|
28 | |||
29 | def readmeta(self, node): |
|
29 | def readmeta(self, node): | |
30 | t = self.revision(node) |
|
30 | t = self.revision(node) | |
31 |
if |
|
31 | if t[:2] != '\1\n': | |
32 | return t |
|
32 | return t | |
33 | s = t.find('\1\n', 2) |
|
33 | s = t.find('\1\n', 2) | |
34 | mt = t[2:s] |
|
34 | mt = t[2:s] | |
@@ -38,7 +38,7 b' class filelog(revlog):' | |||||
38 | return m |
|
38 | return m | |
39 |
|
39 | |||
40 | def add(self, text, meta, transaction, link, p1=None, p2=None): |
|
40 | def add(self, text, meta, transaction, link, p1=None, p2=None): | |
41 |
if meta or text |
|
41 | if meta or text[:2] == '\1\n': | |
42 | mt = "" |
|
42 | mt = "" | |
43 | if meta: |
|
43 | if meta: | |
44 | mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ] |
|
44 | mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ] | |
@@ -398,7 +398,7 b' class dirstate:' | |||||
398 | for dir, subdirs, fl in os.walk(f): |
|
398 | for dir, subdirs, fl in os.walk(f): | |
399 | d = dir[len(self.root) + 1:] |
|
399 | d = dir[len(self.root) + 1:] | |
400 | for sd in subdirs: |
|
400 | for sd in subdirs: | |
401 |
if |
|
401 | if ignore(os.path.join(d, sd +'/')): | |
402 | subdirs.remove(sd) |
|
402 | subdirs.remove(sd) | |
403 | for fn in fl: |
|
403 | for fn in fl: | |
404 | fn = util.pconvert(os.path.join(d, fn)) |
|
404 | fn = util.pconvert(os.path.join(d, fn)) | |
@@ -436,7 +436,7 b' class dirstate:' | |||||
436 | def opener(base): |
|
436 | def opener(base): | |
437 | p = base |
|
437 | p = base | |
438 | def o(path, mode="r"): |
|
438 | def o(path, mode="r"): | |
439 |
if p |
|
439 | if p[:7] == "http://": | |
440 | f = os.path.join(p, urllib.quote(path)) |
|
440 | f = os.path.join(p, urllib.quote(path)) | |
441 | return httprangereader.httprangereader(f) |
|
441 | return httprangereader.httprangereader(f) | |
442 |
|
442 | |||
@@ -465,7 +465,7 b' class RepoError(Exception): pass' | |||||
465 | class localrepository: |
|
465 | class localrepository: | |
466 | def __init__(self, ui, path=None, create=0): |
|
466 | def __init__(self, ui, path=None, create=0): | |
467 | self.remote = 0 |
|
467 | self.remote = 0 | |
468 |
if path and path |
|
468 | if path and path[:7] == "http://": | |
469 | self.remote = 1 |
|
469 | self.remote = 1 | |
470 | self.path = path |
|
470 | self.path = path | |
471 | else: |
|
471 | else: | |
@@ -504,7 +504,7 b' class localrepository:' | |||||
504 |
|
504 | |||
505 | def ignore(self, f): |
|
505 | def ignore(self, f): | |
506 | if not self.ignorefunc: |
|
506 | if not self.ignorefunc: | |
507 | bigpat = [] |
|
507 | bigpat = ["^.hg/$"] | |
508 | try: |
|
508 | try: | |
509 | l = file(self.wjoin(".hgignore")) |
|
509 | l = file(self.wjoin(".hgignore")) | |
510 | for pat in l: |
|
510 | for pat in l: | |
@@ -518,12 +518,10 b' class localrepository:' | |||||
518 | else: |
|
518 | else: | |
519 | bigpat.append(util.pconvert(pat[:-1])) |
|
519 | bigpat.append(util.pconvert(pat[:-1])) | |
520 | except IOError: pass |
|
520 | except IOError: pass | |
521 | if bigpat: |
|
521 | ||
522 |
|
|
522 | s = "(?:%s)" % (")|(?:".join(bigpat)) | |
523 |
|
|
523 | r = re.compile(s) | |
524 |
|
|
524 | self.ignorefunc = r.search | |
525 | else: |
|
|||
526 | self.ignorefunc = lambda x: False |
|
|||
527 |
|
525 | |||
528 | return self.ignorefunc(f) |
|
526 | return self.ignorefunc(f) | |
529 |
|
527 |
General Comments 0
You need to be logged in to leave comments.
Login now