vitalif
/
viewvc-4intranet
mirror of https://github.com/vitalif/viewvc-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

* viewcvs/lib/vclib/__init__.py (Repository.rawdiff), 

* viewcvs/lib/vclib/svn/__init__.py (SubversionRepository.rawdiff),
* viewcvs/lib/vclib/svn_ra/__init__.py (SubversionRepository.rawdiff),
* viewcvs/lib/vclib/ccvs/__init__.py (CCVSRepository.rawdiff),
* viewcvs/lib/vclib/bincvs/__init__.py (BinCVSRepository.rawdiff):
  For clarity, replace uses of the term 'path' with 'path_parts' in the
  Repository.rawdiff() stub and implementations.


git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1104 8cb11bc2-c004-0410-86c3-e597b4017df7
remotes/tags/1.0.0-rc1
cmpilato 2005-09-26 16:07:17 +00:00
parent d7429e31ae
commit 1b967b1a09
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vclib/__init__.py
View File

@ -99,7 +99,7 @@ class Repository:
options is a dictionary of implementation specific options
"""
def rawdiff(self, path1, rev1, path2, rev2, type, options={}):
def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
"""Return a diff (in GNU diff format) of two file revisions
type is the requested diff type (UNIFIED, CONTEXT, etc)

6
lib/vclib/bincvs/__init__.py
View File

@ -244,7 +244,7 @@ class BinCVSRepository(CVSRepository):
source = blame.BlameSource(self.rcsfile(path_parts, 1), rev)
return source, source.revision
def rawdiff(self, path1, rev1, path2, rev2, type, options={}):
def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
"""see vclib.Repository.rawdiff docstring
Option values recognized by this implementation:
@ -255,8 +255,8 @@ class BinCVSRepository(CVSRepository):
if options.get('ignore_keyword_subst', 0):
args.append('-kk')
rcsfile = self.rcsfile(path1, 1)
if path1 != path2:
rcsfile = self.rcsfile(path_parts1, 1)
if path_parts1 != path_parts2:
raise NotImplementedError, "cannot diff across paths in cvs"
args.extend(['-r' + rev1, '-r' + rev2, rcsfile])

2
lib/vclib/ccvs/__init__.py
View File

@ -105,7 +105,7 @@ class CCVSRepository(CVSRepository):
return filtered_revs
def rawdiff(self, path1, rev1, path2, rev2, type, options={}):
def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
"""see vclib.Repository.rawdiff docstring
"""
raise NotImplementedError, \

6
lib/vclib/svn/__init__.py
View File

@ -550,14 +550,14 @@ class SubversionRepository(vclib.Repository):
source = BlameSourceKludge(self.svn_client_path, self.rootpath, path, rev)
return source, revision
def rawdiff(self, path1, rev1, path2, rev2, type, options={}):
def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
"""see vclib.Repository.rawdiff docstring
option values returned by this implementation
diffobj - reference to underlying FileDiff object
"""
p1 = self._getpath(path1)
p2 = self._getpath(path2)
p1 = self._getpath(path_parts1)
p2 = self._getpath(path_parts2)
args = vclib._diff_args(type, options)
# Need to keep a reference to the FileDiff object around long

6
lib/vclib/svn_ra/__init__.py
View File

@ -514,14 +514,14 @@ class SubversionRepository(vclib.Repository):
return blame_data, rev
def rawdiff(self, path1, rev1, path2, rev2, type, options={}):
def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
"""see vclib.Repository.rawdiff docstring
option values returned by this implementation
diffobj - reference to underlying FileDiff object
"""
p1 = self._getpath(path1)
p2 = self._getpath(path2)
p1 = self._getpath(path_parts1)
p2 = self._getpath(path_parts2)
args = vclib._diff_args(type, options)
# Need to keep a reference to the FileDiff object around long