Commit dda57f98 authored by Philip Thiem's avatar Philip Thiem

get_svn_method now direectly called svn_utils.parse_revision

--HG--
extra : rebase_source : c902dd83f2c3df73f3a6f84e08bd8a77b201cc21
parent b46fff3b
...@@ -5,6 +5,7 @@ from glob import glob ...@@ -5,6 +5,7 @@ from glob import glob
import os, re, sys, pkg_resources import os, re, sys, pkg_resources
from glob import glob from glob import glob
from setuptools.svn_utils import SVNEntries from setuptools.svn_utils import SVNEntries
from setuptools import svn_utils
READMES = ('README', 'README.rst', 'README.txt') READMES = ('README', 'README.rst', 'README.txt')
...@@ -69,7 +70,7 @@ def externals_finder(dirname, filename): ...@@ -69,7 +70,7 @@ def externals_finder(dirname, filename):
def entries_finder(dirname, filename): def entries_finder(dirname, filename):
for record in SVNEntries.load(dirname).get_undeleted_records(): for record in SVNEntries.load(dirname).get_undeleted_records():
yield joinpath(dirname, record) yield joinpath(dirname, record)
finders = [ finders = [
(convert_path('CVS/Entries'), (convert_path('CVS/Entries'),
......
...@@ -185,9 +185,6 @@ class SVNEntriesText(SVNEntries): ...@@ -185,9 +185,6 @@ class SVNEntriesText(SVNEntries):
def is_valid(self): def is_valid(self):
return bool(self.get_sections()) return bool(self.get_sections())
def get_url(self):
return self.get_sections()[0][4]
def parse_revision_numbers(self): def parse_revision_numbers(self):
revision_line_number = 9 revision_line_number = 9
rev_numbers = [ rev_numbers = [
...@@ -213,11 +210,6 @@ class SVNEntriesXML(SVNEntries): ...@@ -213,11 +210,6 @@ class SVNEntriesXML(SVNEntries):
def is_valid(self): def is_valid(self):
return True return True
def get_url(self):
"Get repository URL"
urlre = re.compile(r'url="([^"]+)"')
return urlre.search(self.data).group(1)
def parse_revision_numbers(self): def parse_revision_numbers(self):
revre = re.compile(r'committed-rev="(\d+)"') revre = re.compile(r'committed-rev="(\d+)"')
return [ return [
...@@ -295,13 +287,6 @@ class SVNEntriesCMD(SVNEntries): ...@@ -295,13 +287,6 @@ class SVNEntriesCMD(SVNEntries):
def get_url(self):
"Get repository URL"
url_element = self.get_dir_data().getElementsByTagName("url")[0]
url_text = [t.nodeValue for t in url_element.childNodes
if t.nodeType == t.TEXT_NODE]
return "".join(url_text)
def __get_cached_revision(self): def __get_cached_revision(self):
return self.revision return self.revision
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment