From 1b75ada8808157bdd40cd00b4a9c7b35f0d7f368 Mon Sep 17 00:00:00 2001 From: vfilippov Date: Thu, 29 Sep 2011 15:29:29 +0000 Subject: [PATCH] Bug 82651 - Remove rest of UTF-8 ugly hacks git-svn-id: svn://svn.office.custis.ru/3rdparty/viewvc.org/trunk@1396 6955db30-a419-402b-8a0d-67ecbb4d7f56 --- lib/vclib/ccvs/bincvs.py | 2 +- lib/vclib/ccvs/blame.py | 2 ++ lib/vclib/ccvs/ccvs.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/vclib/ccvs/bincvs.py b/lib/vclib/ccvs/bincvs.py index 3dce52cc..ca5ba1f7 100644 --- a/lib/vclib/ccvs/bincvs.py +++ b/lib/vclib/ccvs/bincvs.py @@ -337,7 +337,7 @@ class BinCVSRepository(BaseCVSRepository): % (string.join(path_parts, "/"))) from vclib.ccvs import blame - source = blame.BlameSource(self.rcsfile(path_parts, 1), rev) + source = blame.BlameSource(self.rcsfile(path_parts, 1), rev, self.guesser) return source, source.revision def revinfo(self, rev): diff --git a/lib/vclib/ccvs/blame.py b/lib/vclib/ccvs/blame.py index 4714da6f..f602bc41 100644 --- a/lib/vclib/ccvs/blame.py +++ b/lib/vclib/ccvs/blame.py @@ -451,6 +451,8 @@ class BlameSource: if self.guesser: thisline = self.guesser.utf8(self.lines[idx]) + else: + thisline = self.lines[idx] ### TODO: Put a real date in here. item = vclib.Annotation(thisline, line_number, rev, prev_rev, author, None) diff --git a/lib/vclib/ccvs/ccvs.py b/lib/vclib/ccvs/ccvs.py index 28dc46ee..42a8bf7d 100644 --- a/lib/vclib/ccvs/ccvs.py +++ b/lib/vclib/ccvs/ccvs.py @@ -158,7 +158,7 @@ class CCVSRepository(BaseCVSRepository): if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check raise vclib.Error("Path '%s' is not a file." % (string.join(path_parts, "/"))) - source = blame.BlameSource(self.rcsfile(path_parts, 1), rev) + source = blame.BlameSource(self.rcsfile(path_parts, 1), rev, self.guesser) return source, source.revision def revinfo(self, rev):