Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 398056 - "symbolstore.py does not recognize srcdirs with SVN when using svn-ssh". r+a=luser.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@237620 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bent.mozilla%gmail.com 2007-10-11 21:54:03 +00:00
parent 6ec6463c85
commit 3eb5ca1152
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/toolkit/crashreporter/tools/symbolstore.py
View File

@ -180,6 +180,16 @@ class SVNFileInfo(VCSFileInfo):
repo = None
svndata = {}
# This regex separates protocol and optional username/password from a url.
# For instance, all the following urls will be transformed into
# 'foo.com/bar':
#
# http://foo.com/bar
# svn+ssh://user@foo.com/bar
# svn+ssh://user:pass@foo.com/bar
#
rootRegex = re.compile(r'^\S+?:/+(?:[^\s/]*@)?(\S+)$')
def __init__(self, file):
""" We only want to run subversion's info tool once so pull all the data
here. """
@ -187,15 +197,15 @@ class SVNFileInfo(VCSFileInfo):
VCSFileInfo.__init__(self, file)
if os.path.isfile(file):
_regex = re.compile(r'^(.+):\s(.+)$')
command = os.popen("svn info %s" % file, "r")
for line in command:
match = _regex.match(line.strip())
if match:
key = match.group(1)
if key in ["Repository Root", "Revision", "URL"]:
self.svndata[key] = match.group(2)
# The last line of the output is usually '\n'
if line.strip() == '':
continue
# Split into a key/value pair on the first colon
key, value = line.split(':', 1)
if key in ["Repository Root", "Revision", "URL"]:
self.svndata[key] = value.strip()
exitStatus = command.close()
if exitStatus:
@ -204,7 +214,7 @@ class SVNFileInfo(VCSFileInfo):
def GetRoot(self):
key = "Repository Root"
if key in self.svndata:
match = re.match(r'^\w+:\/+(\S+)', self.svndata[key])
match = self.rootRegex.match(self.svndata[key])
if match:
return match.group(1)
print >> sys.stderr, "Failed to get SVN Root for %s" % self.file