Permalink
Commits on Mar 26, 2011
  1. Merge branch 'stable'

    hjemli committed Mar 26, 2011
  2. Add advice about scan-path in cgitrc.5.txt

    Feh authored and hjemli committed Mar 10, 2011
    Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  3. fix two encoding bugs

    Feh authored and hjemli committed Mar 10, 2011
    reencode() takes three arguments in the order (txt, from, to), opposed to
    reencode_string, which will, like iconv, handle the arguments with from
    and to swapped. Fix that (this makes reencode more intuitive).
    If src and dst encoding are equivalent, don't do any encoding.
    
    If no special encoding parameter is found within the commit, assume
    UTF-8 and explicitly convert to PAGE_ENCODING. The change to reencode()
    mentioned above avoids re-encoding a UTF-8 string to UTF-8, for example.
    
    Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  4. make enable-log-linecount independent of -filecount

    Feh authored and hjemli committed Mar 10, 2011
    You should be able to independently switch file and line count on and
    off. This patch makes the code work like the documentation suggests: no
    dependency for line counts to be displayed only when file counts are.
    
    Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  5. new_filter: correctly initialise all arguments for a new filter

    fhuberts authored and hjemli committed Mar 9, 2011
    Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  6. source_filter: fix a memory leak

    fhuberts authored and hjemli committed Mar 9, 2011
    Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  7. cgitrc.5: tar.xz is a supported snapshot format

    hjemli committed Mar 26, 2011
    When tar.xz support was added in 0642435 (2009-12-08: Add
    .tar.xz-snapshot support), cgitrc.5 was not updated to match. This
    patch fixes the issue.
    
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  8. Fix crash when projectsfile cannot be opened

    stefangehn authored and hjemli committed Mar 26, 2011
    This patch makes cgit properly abort in case the projectsfile cannot
    be opened. Without the added return cgit continues using the projects
    pointer which is NULL and thus causes a segfault.
Commits on Mar 5, 2011
  1. CGIT 0.9

    hjemli committed Mar 5, 2011
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  2. Update README

    hjemli committed Mar 5, 2011
  3. ui-diff.c: avoid html injection

    ljanyst authored and hjemli committed Mar 5, 2011
    When path-filtering was used in commit-view, the path filter was
    included without proper html escaping. This patch closes the hole.
    
    Signed-off-by: Lukasz Janyst <ljanyst@cern.ch>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  4. Merge branch 'stable'

    hjemli committed Mar 5, 2011
  5. CGIT 0.8.3.5

    hjemli committed Mar 5, 2011
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  6. Avoid trailing slash in virtual-root

    hjemli committed Mar 5, 2011
    When setting virtual-root from cgitrc, care is taken to avoid trailing
    slashes. But when no virtual-root setting is specified, SCRIPT_FILE
    from the web server is used without similar checks. This patch fixes the
    inconsistency, which could lead to double-slashes in generated links.
    
    Noticed-by: Wouter Van Hemel <wouter@duodecim.org>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  7. do not infloop on a query ending in %XY, for invalid hex X or Y

    Jim Meyering authored and hjemli committed Feb 28, 2011
    When a query ends in say %gg, (or any invalid hex) e.g.,
    http://git.gnome.org/browse/gdlmm/commit/?id=%gg
    convert_query_hexchar calls memmove(txt, txt+3, 0), and then returns
    txt-1, so the loop in http_parse_querystring never terminates.  The
    solution is to make the memmove also copy the trailing NUL.
    * html.c (convert_query_hexchar): Fix off-by-one error.
    
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Commits on Feb 19, 2011
  1. Merge branch 'br/misc'

    hjemli committed Feb 19, 2011
    * br/misc:
      Use transparent background for the cgit logo
      ssdiff: anchors for ssdiff
      implement repo.logo and repo.logo-link
  2. Use transparent background for the cgit logo

    aldot authored and hjemli committed Dec 23, 2010
    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  3. ssdiff: anchors for ssdiff

    aldot authored and hjemli committed Dec 23, 2010
    Emit anchors to the respective revisions in side-by-side diff view
    
    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  4. implement repo.logo and repo.logo-link

    aldot authored and hjemli committed Dec 23, 2010
    Allow for per repo logo and logo-link; Use global logo and logo-link per
    default.
    
    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  5. ui-shared: silence warning

    aldot authored and hjemli committed Dec 23, 2010
    warning: format ‘%ld’ expects type ‘long int’, but argument 2 has type
    ‘size_t’
    
    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  6. Merge branch 'jh/scan-path'

    hjemli committed Feb 19, 2011
    * jh/scan-path:
      scan_path(): Do not recurse into hidden directories by default
      scan_path(): Improve handling of inaccessible directories
  7. scan_path(): Do not recurse into hidden directories by default

    jherland authored and hjemli committed Nov 15, 2010
    Paths that start with a period ('.') are considered hidden in the Unix world.
    scan_path() should arguably not recurse into these directories by default.
    This patch makes it so, and introduces the "scan-hidden-path" config variable
    for overriding the new default and revert to the old behaviour (scanning _all_
    directories, including hidden .directories).
    
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Lars Hjemli <larsh@prediktor.no>
  8. Makefile: Make `make get-git` work under OpenBSD.

    Lukas Fleischer authored and hjemli committed Jan 19, 2011
    OpenBSD tar(1) defaults to read from "/dev/rst0" when not specifying an
    filename and thus fails to extract the Git sourcecode when not passing
    stdin as input file descriptor explicitly.
    
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  9. Merge branch 'jh/graph'

    hjemli committed Feb 19, 2011
    * jh/graph:
      ui-log: Move 'Age' column when commit graph is present
      ui-log: Line-wrap long commit subjects when showmsg is enabled
      ui-log: Colorize commit graph
      ui-log: Implement support for commit graphs
      ui-log: Change display of full commit messages (and notes)
    
    Conflicts:
    	cgit.css
  10. Merge branch 'lh/improve-range-search'

    hjemli committed Feb 19, 2011
    * lh/improve-range-search:
      html.c: use '+' to escape spaces in urls
      ui-log.c: improve handling of range-search argument
      Add vector utility functions
  11. Use GIT-1.7.4

    hjemli committed Feb 19, 2011
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Commits on Nov 16, 2010
  1. scan_path(): Improve handling of inaccessible directories

    jherland authored and Lars Hjemli committed Nov 15, 2010
    When scanning a tree containing inaccessible directories (e.g. '.ssh'
    directories in users' homedirs, or repos with explicitly restricted access),
    scan_path() currently causes three lines of "Permissions denied" errors to be
    printed to the CGI error log per inaccessible directory:
    
      Error checking path /home/foo/.ssh: Permission denied (13)
      Error checking path /home/foo/.ssh/.git: Permission denied (13)
      Error opening directory /home/foo/.ssh: Permission denied (13)
    
    This is a side-effect of calling is_git_dir(path) and
    is_git_dir(fmt("%s/.git", path) _before_ we try to opendir(path).
    
    By placing the opendir(path) before the two is_git_dir() calls, we reduce the
    noise to a single line per inaccessible directory:
    
      Error opening directory /home/foo/.ssh: Permission denied (13)
    
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Lars Hjemli <larsh@prediktor.no>
  2. ui-log: Move 'Age' column when commit graph is present

    jherland authored and hjemli committed Nov 15, 2010
    When the commit graph is present, we prefer to draw it along the left edge,
    and moving the 'Age' column to the right of the 'Author' column, like in gitk.
    
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  3. ui-log: Line-wrap long commit subjects when showmsg is enabled

    jherland authored and hjemli committed Nov 15, 2010
    When showmsg is disabled ui-log truncates long commit subjects. This is good.
    However, the same is not desirable when showmsg is enabled, since you then
    end up with a truncated commit subject followed by the rest of the commit
    message below.
    
    Instead, when showmsg is enabled (and we're using all this space to display
    the entire commit message, anyway), line-wrap the commit subject instead of
    truncating it.
    
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  4. ui-log: Colorize commit graph

    jherland authored and hjemli committed Nov 15, 2010
    Use the existing coloring logic in Git's graph code to color the lines
    between commits in the commit graph.
    
    Whereas Git normally uses ANSI color escapes to produce colors, we here
    use graph_set_column_colors() to replace those with HTML color escapes,
    that embed the graph lines in <span> tags that apply the desired color
    using CSS.
    
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  5. ui-log: Implement support for commit graphs

    jherland authored and hjemli committed Nov 15, 2010
    Teach CGit to print an ASCII art commit graph to the left of the commit
    message, similar to 'git log --graph'. The graph adds extra lines (table
    rows) to the log when needed to add/remove/shuffle edges in the graph.
    
    When 'showmsg' is enabled, the graph is automatically padded to account
    for the extra lines added by the commit message/notes.
    
    This feature is controlled by a new config variable: "enable-commit-graph"
    (disabled by default), and individual repos can control it by setting
    "repo.enable-commit-graph".
    
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  6. ui-log: Change display of full commit messages (and notes)

    jherland authored and hjemli committed Nov 15, 2010
    When showmsg is enabled, ui-log (in addition to the table row containing
    the details of the current commit) adds a second table row containing the
    remainder of the commit message, and yet another table row containing the
    commit notes (if any). The vertical margins between commit subject, commit
    message and commit notes are controlled by CSS.
    
    In preparation for the commit graph (which will be printed to the left of
    the commit message/notes) we need to eliminate these vertical margins (as
    they would produce ugly gaps in the commit graph) and instead achieve them
    by adding newlines to the commit message/notes. Furthermore, we can no
    longer print the "Notes:" header in the "Age" column, since the graph will
    be drawn between the "Age" column and the "Commit message" column.
    
    This patch therefore prepares the commit message and commit notes in a
    single buffer (properly formatting the notes using the NOTES_SHOW_HEADER
    and NOTES_INDENT flags to format_note()), and then prints the entire
    buffer into a single table row.
    
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
  7. ui-stats: Remove unnecessary #include

    jherland authored and hjemli committed Nov 15, 2010
    <string-list.h> is already #included from cgit.h
    
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Commits on Nov 9, 2010
  1. html.c: use '+' to escape spaces in urls

    hjemli committed Nov 9, 2010
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>