# 
# 
# patch "TODO"
#  from [9caf49f2ed434f3943a89b627d974c02f597ed49]
#    to [31c3c8566030e347f799e29f5076f1811fd68fb7]
# 
# patch "common.py"
#  from [1462ca963d4b3959019bb0ac26a5311f6f2bd406]
#    to [b5a9eb0d651eb4f1a41e94376d35b31f5c8efe5d]
# 
============================================================
--- TODO	9caf49f2ed434f3943a89b627d974c02f597ed49
+++ TODO	31c3c8566030e347f799e29f5076f1811fd68fb7
@@ -8,7 +8,9 @@ NEW VERSION
  * Read-only WebDAV support
  * Put copyright notices on the files, mostly so I can keep track 
    of where they end up.
- 
+ * remove the leading path from subdirectories in file browser
+ * page showing the tags for a given branch
+
 BUGS:
 
  * HEAD just does GET; we should really do HEAD properly. Also, we 
============================================================
--- common.py	1462ca963d4b3959019bb0ac26a5311f6f2bd406
+++ common.py	b5a9eb0d651eb4f1a41e94376d35b31f5c8efe5d
@@ -46,162 +46,3 @@ def ago(event):
         seconds = (ago.seconds - (minutes * 60))
         rv = "%s" % (plural(minutes, "minute", "minutes"))
     return rv
-
-def link(mt, link_type, link_to, description = None, no_quote = False):
-    hq = html_escape()
-    if not no_quote and description != None: description = hq(description)
-    if link_type == "revision":
-	rv = '<a href="revision.psp?id=%s">' % (urllib.quote(link_to))
-	if description != None: rv += description
-	else: rv +=  hq(link_to[:8]) + ".."
-	rv += '</a>'
-	if description == None: rv = '[' + rv + ']'
-    elif link_type == "diff" or link_type == "download_diff":
-	link_to = map(urllib.quote, filter(lambda x: x != None, link_to))
-	if link_type == "diff":
-	    handler = "diff.psp"
-	else:
-	    handler = "getdiff.py"
-	uri = '%s?id1=%s&amp;id2=%s' % (handler, link_to[0], link_to[1])
-	if len(link_to) == 3:
-	    uri += '&amp;fname=%s' % (link_to[2])
-	rv = '<a href="' + uri + '">'
-	if description != None: rv += description
-	else: rv += "diff"
-	rv += '</a>'
-    elif link_type == "download":
-	if type(link_to) == type([]):
-	    rv = '<a href="getfile.py?id=%s&amp;path=%s">' % (urllib.quote(link_to[0]), 
-							      urllib.quote(link_to[1]))
-	    link_id = link_to[0]
-	else:
-	    rv = '<a href="getfile.py?id=%s">' % (urllib.quote(link_to))
-	    link_id = link_to
-	if description != None: rv += description + "</a>"
-	else: rv = "[" + rv + hq(link_id[:8]) + ".." + "</a>]"
-    elif link_type == "file":
-	revision_id, path = link_to
-	rv = '<a href="file.psp?id=%s&amp;path=%s">' % (urllib.quote(revision_id), 
-							urllib.quote(path))
-	if description != None: rv += description + "</a>"
-	else: rv = "[" + rv + hq(path + '@' + revision_id[:8]) + ".." + "</a>]"
-    elif link_type == "fileinbranch":
-	branch, path = link_to
-	rv = '<a href="fileinbranch.psp?branch=%s&amp;path=%s">' % (urllib.quote(branch), 
-								    urllib.quote(path))
-	if description != None: rv += description + "</a>"
-	else: rv = "[" + rv + hq(path + '@' + branch) + "</a>]"
-    elif link_type == "branch":
-	rv = '<a href="branch.psp?branch=%s">' % (urllib.quote(link_to))
-	if description != None: rv += description
-	else: rv +=  hq(link_to)
-	rv += '</a>'
-    elif link_type == "tar":
-	rv = '<a href="gettar.py?id=%s">' % (urllib.quote(link_to))
-	if description != None: rv += description
-	else: rv = "tar of [" + rv + hq(link_to[:8]) + "..]" + "</a>]"
-	rv += '</a>'
-    elif link_type == "headofbranch":
-	rv = '<a href="headofbranch.psp?branch=%s">' % (urllib.quote(link_to))
-	if description != None: rv += description
-	else: rv +=  "head of " + hq(link_to)
-	rv += '</a>'
-    elif link_type == "manifest":
-	if type(link_to) == type([]):
-	    link_to, path = link_to
-	    rv = '<a href="manifest.psp?id=%s&amp;path=%s">' % (urllib.quote(link_to), urllib.quote(path))
-	else:
-	    rv = '<a href="manifest.psp?id=%s">' % (urllib.quote(link_to))
-	if description != None: rv += description
-	else: rv +=  hq(link_to[:8]) + ".."
-	rv += '</a>'
-	if description == None: rv = '[' + rv + ']'
-    else:
-	rv = '<span style="color:red;">Unknown link type: %s</span>' % (hq(link_type))
-    return '<span class="%s">%s</span>' % (hq(link_type+'Link'), rv)
-
-def html_escape():
-    "returns a function stolen from pydoc that can be used to escape HTML"
-    return lambda x: type_wrapper(escape_function, x)
-
-from enscriptlangs import enscript_langs
-from utility import run_command
-import mimetypes
-import config
-import pipes
-
-# is it binary?
-def is_binary(str):
-    nontext_chars = "\x01\x02\x03\x04\x05\x06\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1c\x1d\x1e\x1f"
-    check = {}
-    for char in nontext_chars:
-	check[char] = True
-	for i in str:
-	    if check.has_key(i): return True
-    return False
-
-# hm, later on might make this be some javascript that does an call back to the server.
-# then could have a pull down to let people choose which enscript encoding to use, and 
-# just update the DOM with the new data.
-def colourise_code(req, hq, matching_file_id, path, contents, filter=None):
-    mime_type = mimetypes.guess_type(path)[0]
-    if mime_type == None: mime_type = 'text/plain'
-    if mime_type == 'image/png' or mime_type == 'image/jpeg' or mime_type == 'image/gif':
-	display_as_image = True
-    else: display_as_image = False
-    
-    # okay; can we guess a valid enscript filter to run this through?
-    tsp = mime_type.split('/', 1)
-    if filter == None and tsp[0] == 'text':
-	candidate = tsp[1]
-	if candidate.startswith('x-'): candidate = candidate[2:]
-	if candidate.endswith('src'): candidate = candidate[:-3]
-	if candidate.endswith('hdr'): candidate = candidate[:-3]
-	if candidate == 'c++': candidate = 'cpp' # ugly
-	if candidate in enscript_langs: filter = candidate
-    if filter == None:
-	# heh, will at least work for lua files
-	last_dot = path.rfind('.')
-	if last_dot == -1: last_dot = 0
-	candidate = path[last_dot:]
-	if candidate in enscript_langs: filter = candidate
-
-    # if no filter then let's check if it's binary or not; if not binary 
-    # we'll just treat it as text; otherwise display a warning and a download 
-    # link
-    if filter == None and not is_binary(contents):
-	filter = 'text'
-
-    req.write('''<div style="border-color: black; border-style: solid; border-width: 1px; padding-left: 0.5em; padding-right: 0.5em;">''')
-    if display_as_image:
-	req.write('''<img border='0' src='getfile.py?id=%s&path=%s' />''' % (urllib.quote(matching_file_id), urllib.quote(path)))
-    elif filter != None:
-	def start_code():
-	    req.write('<PRE style="padding: 0;">')
-	def stop_code():
-	    req.write('</PRE>')
-	def text():
-	    start_code()
-	    req.write(hq(contents))
-	    stop_code()
-	def enscript():
-	    command = config.enscript_path + ' -o - --color --language=html'
-	    command += ' --highlight=%s' % (pipes.quote(filter))
-	    result = run_command(command, to_child=contents)
-	    if result['exitcode'] != 0:
-		raise Exception('Error running enscript (%s) : "%s".' % (hq(command), hq(result['childerr'])))
-	    in_contents = False
-	    for line in result['fromchild'].split('\n'):
-		if line.startswith('<PRE>'):
-		    in_contents = True
-		    start_code()
-		elif line.startswith('</PRE>'): 
-		    in_contents = False
-		    stop_code()
-		elif in_contents:
-		    req.write(line + '\r\n')
-	if filter == "text": text()
-	else: enscript()
-    else:
-	req.write('''<p style="text-align: center"><em>This file seems to binary and not suitable for display in the browser. You must %s the file and use a suitable viewer.</em></p>''' % (link("download", [matching_file_id, path], "download")))
-    req.write('''</div>''')