git/lib/diff.tcl, branch gitgui-0.14.0

git-gui: handle meta diff header lines only in the header section

2011-01-28T09:01:17Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: handle special content lines only in the diff header section

2011-01-28T09:01:17Z

These two also stop the diff header. Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: always reset the current tag

2011-01-28T09:01:17Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: move 3way diff autodetect up

2011-01-28T09:01:17Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: there is no "mode *" diff header line

2011-01-28T09:01:17Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: name also new symlinks so

2011-01-28T09:01:17Z

and rename them only in the diff header Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: handle index lines only in the diff header

2011-01-28T09:01:17Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: rework handling of diff header

2011-01-28T09:01:17Z

The fix in ca53c3f (Fix diff parsing for lines starting with "--" or "++", 2008-09-05) got a bug report from Johannes Sixt, that new files in the index now looks like: new file mode 100644 --- /dev/null +++ b/foo @@ -0,0 +1 @@ +foo The introduced problem was that the 'in-diff-header'-flag was unconditially disabled. Now it is only disabled when a hunk line is detected. And also re-enabled when we encounter a new diff header. The second part solves also the issue reported by me for diffs with file type changes (i.e. the ''error: Unhandled 2 way diff marker: {d}"', which comes from the second 'diff --git' line). Reported-by: Johannes Sixt Reported-by: Bert Wesarg Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: Fix use of hunk tag for non-hunk content.

2010-12-06T22:01:01Z

The hunk tag d_@ lost its blue forground color in "apply color information from git diff output" (2010-10-22, 8f85599). But this tag was also used for non-hunk content like untracked file mime types or git submodules. Introduce a new tag for this type of content which has the blue forground again. Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: Fix use of renamed tag.

2010-12-06T21:09:53Z

The d======= was renamed to d= in 4590307. Fix this. Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts