Merge branch 'lh/cleanup'

* lh/cleanup: (21 commits)
  Reset ctx.repo to NULL when the config parser is finished
  Move cgit_parse_query() from parsing.c to html.c as http_parse_querystring()
  Move function for configfile parsing into configfile.[ch]
  Add cache.h
  Remove global and obsolete cgit_cmd
  Makefile: copy the QUIET constructs from the Makefile in git.git
  Move cgit_version from shared.c to cgit.c
  Makefile: autobuild dependency rules
  Initial Makefile cleanup
  Move non-generic functions from shared.c to cgit.c
  Add ui-shared.h
  Add separate header-files for each page/view
  Refactor snapshot support
  Add command dispatcher
  Remove obsolete cacheitem parameter to ui-functions
  Add struct cgit_page to cgit_context
  Introduce html.h
  Improve initialization of git directory
  Move cgit_repo into cgit_context
  Add all config variables into struct cgit_context
  ...

1 files changed, 5 insertions, 4 deletions

diff --git a/ui-diff.c b/ui-diff.c
index 4fcf852..2a22009 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -2,17 +2,18 @@
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
-
+#include "html.h"
+#include "ui-shared.h"
 
 unsigned char old_rev_sha1[20];
 unsigned char new_rev_sha1[20];
 
 /*
  * print a single line returned from xdiff
  */
 static void print_line(char *line, int len)
@@ -66,23 +67,23 @@ static void header(unsigned char *sha1, char *path1, int mode1,
                 free(abbrev2);
                 if (mode1 != 0 && mode2 != 0) {
                         htmlf(" %.6o", mode1);
                         if (mode2 != mode1)
                                 htmlf("..%.6o", mode2);
                 }
                 html("<br/>--- a/");
                 if (mode1 != 0)
-                        cgit_tree_link(path1, NULL, NULL, cgit_query_head,
+                        cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
                                        sha1_to_hex(old_rev_sha1), path1);
                 else
                         html_txt(path1);
                 html("<br/>+++ b/");
                 if (mode2 != 0)
-                        cgit_tree_link(path2, NULL, NULL, cgit_query_head,
+                        cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
                                        sha1_to_hex(new_rev_sha1), path2);
                 else
                         html_txt(path2);
         }
         html("</div>");
 }
 
 static void filepair_cb(struct diff_filepair *pair)
@@ -102,17 +103,17 @@ static void filepair_cb(struct diff_filepair *pair)
 
 void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
 {
         enum object_type type;
         unsigned long size;
         struct commit *commit, *commit2;
 
         if (!new_rev)
-                new_rev = cgit_query_head;
+                new_rev = ctx.qry.head;
         get_sha1(new_rev, new_rev_sha1);
         type = sha1_object_info(new_rev_sha1, &size);
         if (type == OBJ_BAD) {
                 cgit_print_error(fmt("Bad object name: %s", new_rev));
                 return;
         }
         if (type != OBJ_COMMIT) {
                 cgit_print_error(fmt("Unhandled object type: %s",