From 329d20633a2a7129f22a04a2aa4484d79967757b Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 27 Apr 2001 08:26:14 +0000 Subject: [PATCH] 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-e597b4017df7 --- cgi/viewcvs.cgi | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/cgi/viewcvs.cgi b/cgi/viewcvs.cgi index 66bfb3a3..80106234 100755 --- a/cgi/viewcvs.cgi +++ b/cgi/viewcvs.cgi @@ -932,7 +932,7 @@ def process_rlog_output(rlog, full_name, view_tag, fileinfo, alltags): if rev == revwanted or rev == branchpoint: fileinfo[info_key] = (rev, entry.date, entry.log, entry.author, - filename) + filename, entry.state) if rev == revwanted: # done with this file now @@ -1029,7 +1029,7 @@ def view_directory(request): subfiles = [ ] attic_files = [ ] - if not hideattic: + if not hideattic or view_tag: try: attic_files = os.listdir(full_name + '/Attic') except os.error: @@ -1243,16 +1243,26 @@ def view_directory(request): continue elif not info: continue + elif hideattic and view_tag and info[5] == 'dead': + continue num_displayed = num_displayed + 1 file_url = urllib.quote(file) url = file_url + request.qmark_query - if file[:6] == 'Attic/': - attic = ' (in the Attic) ' + attic_toggle_link - file = file[6:] + if view_tag: + if info[5] == 'dead': + attic = ' (not exist) ' + attic_toggle_link + else: + attic = '' else: - attic = '' + if file[:6] == 'Attic/': + attic = ' (in the Attic) ' + attic_toggle_link + else: + attic = '' + + if file[:6] == 'Attic/': + file = file[6:] print '' % cfg.colors.even_odd[cur_row % 2] print '' % file