delta/git.git, branch jn/gitweb-side-by-side-diff

gitweb: Add navigation to select side-by-side diff

2011-10-31T22:22:58+00:00

Add to the lower part of navigation bar (the action specific part)
links allowing to switch between 'inline' (ordinary) diff and
'side by side' style diff.

It is not shown for combined / compact combined diff.

Signed-off-by: Kato Kazuyoshi 
Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"

2011-10-31T22:22:58+00:00

Use href(-replay->1,...) in (sub)navigation links (like changing style
of view, or going to parent commit) so that extra options are
preserved.

This is needed so clicking on such (sub)navigation link would preserve
style of diff; for example when using "side-by-side" diff style then
going to parent commit would now also use this style.

Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

t9500: Add basic sanity tests for side-by-side diff in gitweb

2011-10-31T22:22:58+00:00

Test that side-by-side diff can deal with incomplete lines (and while
at it with pure addition, pure removal, and change), and with merge
commits, producing no errors or warnings.

Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

t9500: Add test for handling incomplete lines in diff by gitweb

2011-10-31T22:22:57+00:00

Check that "commitdiff" action in gitweb can handle (without errors)
incomplete lines as added and removed lines, and as context lines.

Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

gitweb: Give side-by-side diff extra CSS styling

2011-10-31T22:22:57+00:00

Use separate background colors for pure removal, pure addition and
change for side-by-side diff.  This makes reading such diff easier,
allowing to easily distinguish empty lines in diff from vertical
whitespace used to align chunk blocks.

Note that if lines in diff were numbered, the absence of line numbers
[for one side] would help in distinguishing empty lines from vertical
align.

Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

gitweb: Add a feature to show side-by-side diff

2011-10-31T22:22:56+00:00

This commits adds to support for showing "side-by-side" style diff.
Currently you have to hand-craft the URL; navigation for selecting
diff style is to be added in the next commit.

The diff output in unified format from "git diff-tree" is reorganized to
side-by-side style chunk by chunk with format_sidebyside_diff_chunk().
This reorganization requires knowledge about diff line classification,
so format_diff_line() was renamed to process_diff_line(), and changed to
return tuple (list) consisting of class of diff line and of
HTML-formatted (but not wrapped in ...) diff
line.  Wrapping is now done by caller, i.e. git_patchset_body().

Gitweb uses float+margin CSS-based layout for "side by side" diff.

You can specify style of diff with "ds" ('diff_style') query
parameter.  Currently supported values are 'inline' and 'sidebyside';
the default is 'inline'.

Another solution would be to use "opt" ('extra_options') for that...
though current use of it in gitweb seems to suggest that "opt" is more
about passing extra options to underlying git commands, and "git diff"
doesn't support '--side-by-side' like GNU diff does, (yet?).

Signed-off-by: Kato Kazuyoshi 
Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

gitweb: Extract formatting of diff chunk header

2011-10-31T22:22:55+00:00

Refactor main parts of HTML-formatting for diff chunk headers
(formatting means here adding links and syntax hightlighting) into
separate subroutines:

 * format_unidiff_chunk_header for ordinary diff,
 * format_cc_diff_chunk_header for combined diff
   (more than one parent)

This makes format_diff_line() subroutine easier to follow.

Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

gitweb: Refactor diff body line classification

2011-10-31T22:22:55+00:00

Simplify classification of diff line body in format_diff_line(),
replacing two long if-elsif chains (one for ordinary diff and one for
combined diff of a merge commit) with a single regexp match.  Refactor
this code into diff_line_class() function.

While at it:

* Fix an artifact in that $diff_class included leading space to be
  able to compose classes like this "class=\"diff$diff_class\"', even
  when $diff_class was an empty string.  This made code unnecessary
  ugly: $diff_class is now just class name or an empty string.

* Introduce "ctx" class for context lines ($diff_class was set to ""
  in this case before this commit).

Idea and initial code by Junio C Hamano, polish and testing by Jakub
Narebski.  Inspired by patch adding side-by-side diff by Kato Kazuyoshi,
which required $diff_class to be name of class without extra space.

Signed-off-by: Junio C Hamano 
Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

Git 1.7.8-rc0

2011-10-31T02:14:24+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jk/git-tricks'

2011-10-31T02:13:13+00:00

* jk/git-tricks:
  completion: match ctags symbol names in grep patterns
  contrib: add git-jump script
  contrib: add diff highlight script