Bug 96691 - Fixes for custispatcher hack

git-svn-id: svn://svn.office.custis.ru/3rdparty/viewvc.org/trunk@1614 6955db30-a419-402b-8a0d-67ecbb4d7f56
custishacks
vfilippov 2012-11-06 10:41:51 +00:00 committed by Vitaliy Filippov
parent 301ca87070
commit c948ae95a2
1 changed files with 14 additions and 1 deletions

View File

@ -4923,9 +4923,12 @@ def query_custispatcher(request, commits):
return
header_re = re.compile('^\s*_package\s*\(\s*[^,]*,\s*([^,\s]+)', re.M)
by_fn = {}
msgs = {}
for commit in commits:
found = 0
for fileinfo in commit.files:
if fileinfo.file.endswith('.sp4'):
found = 1
fn = _path_join([fileinfo.dir, fileinfo.file])
# Only latest revision of each file
if fn not in by_fn or rev_cmp(by_fn[fn][1], fileinfo.rev) < 0:
@ -4944,9 +4947,19 @@ def query_custispatcher(request, commits):
rfn = '..' + fn[12:]
s = '<put file="'+fn+'" revision="'+fileinfo.rev+'" schema="*'+schema+'" />\n'
by_fn[fn] = [s, fileinfo.rev, schema]
# Put schema OWNER first
elif fileinfo.file.endswith('.xml'):
found = 1
pass
if found:
msgs[re.sub(r'<[^>]*?>', '', commit.short_log).replace('&nbsp;', '').strip()] = 1
r = ''
r2 = ''
# Put commit messages first
# if len(msgs):
# r += '<!-- '
# for i in msgs:
# r +=
# Then schema OWNER
for i in by_fn:
if by_fn[i][2] == 'OWNER':
r += by_fn[i][0]