use state instead of Attic/ to determine file existence if a tag is
specified. git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@154 8cb11bc2-c004-0410-86c3-e597b4017df7remotes/tags/V0_7
parent
5251065e6d
commit
329d20633a
|
@ -932,7 +932,7 @@ def process_rlog_output(rlog, full_name, view_tag, fileinfo, alltags):
|
||||||
|
|
||||||
if rev == revwanted or rev == branchpoint:
|
if rev == revwanted or rev == branchpoint:
|
||||||
fileinfo[info_key] = (rev, entry.date, entry.log, entry.author,
|
fileinfo[info_key] = (rev, entry.date, entry.log, entry.author,
|
||||||
filename)
|
filename, entry.state)
|
||||||
|
|
||||||
if rev == revwanted:
|
if rev == revwanted:
|
||||||
# done with this file now
|
# done with this file now
|
||||||
|
@ -1029,7 +1029,7 @@ def view_directory(request):
|
||||||
subfiles = [ ]
|
subfiles = [ ]
|
||||||
|
|
||||||
attic_files = [ ]
|
attic_files = [ ]
|
||||||
if not hideattic:
|
if not hideattic or view_tag:
|
||||||
try:
|
try:
|
||||||
attic_files = os.listdir(full_name + '/Attic')
|
attic_files = os.listdir(full_name + '/Attic')
|
||||||
except os.error:
|
except os.error:
|
||||||
|
@ -1243,16 +1243,26 @@ def view_directory(request):
|
||||||
continue
|
continue
|
||||||
elif not info:
|
elif not info:
|
||||||
continue
|
continue
|
||||||
|
elif hideattic and view_tag and info[5] == 'dead':
|
||||||
|
continue
|
||||||
num_displayed = num_displayed + 1
|
num_displayed = num_displayed + 1
|
||||||
|
|
||||||
file_url = urllib.quote(file)
|
file_url = urllib.quote(file)
|
||||||
url = file_url + request.qmark_query
|
url = file_url + request.qmark_query
|
||||||
|
|
||||||
if file[:6] == 'Attic/':
|
if view_tag:
|
||||||
attic = ' (in the Attic) ' + attic_toggle_link
|
if info[5] == 'dead':
|
||||||
file = file[6:]
|
attic = ' (not exist) ' + attic_toggle_link
|
||||||
|
else:
|
||||||
|
attic = ''
|
||||||
else:
|
else:
|
||||||
attic = ''
|
if file[:6] == 'Attic/':
|
||||||
|
attic = ' (in the Attic) ' + attic_toggle_link
|
||||||
|
else:
|
||||||
|
attic = ''
|
||||||
|
|
||||||
|
if file[:6] == 'Attic/':
|
||||||
|
file = file[6:]
|
||||||
|
|
||||||
print '<tr bgcolor="%s"><td>' % cfg.colors.even_odd[cur_row % 2]
|
print '<tr bgcolor="%s"><td>' % cfg.colors.even_odd[cur_row % 2]
|
||||||
print '<a name="%s">' % file
|
print '<a name="%s">' % file
|
||||||
|
|
Loading…
Reference in New Issue