From: Jakub Narebski <jnareb@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Jakub Narebski <jnareb@gmail.com>
Subject: [gsoc2012 wiki PATCH] "Graphical diff in git-gui" project
Date: Sun, 11 Mar 2012 23:30:55 +0100 [thread overview]
Message-ID: <1331505055-12231-1-git-send-email-jnareb@gmail.com> (raw)
In-Reply-To: <20120302091114.GA3984@sigill.intra.peff.net>
---
I don't have much hope that we can find a student that would be
interested in this feature and knows Tcl/Tk enough so that hs or she
can atually implement it...
But I can hope.
SoC-2012-Ideas.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/SoC-2012-Ideas.md b/SoC-2012-Ideas.md
index 9ad449f..bea2c09 100644
--- a/SoC-2012-Ideas.md
+++ b/SoC-2012-Ideas.md
@@ -421,6 +421,68 @@ Write a tool that can be used for the task, and optionally wrap an interactive U
Programming language: Any
Possible mentors: ???
+Graphical diff in git-gui
+-------------------------
+
+[git-gui] is a portable Tcl/Tk based graphical interface to Git,
+focused on commit generation and single file annotation. It is part
+of Git, even though it is developed in a [separate repository].
+
+git-gui can show differences as syntax-highlighted unified diff. The
+goal of this project would be to add graphical side-by-side diff.
+One possibility is to make use of [TkDiff] code (a graphical diff and
+merge tool), which is also GPL licensed.
+
+The project would consist of the following steps (not all must be
+implemented during Google Summer of Code):
+
+ * Add "git gui diff" subcommand, which would show single file
+ side-by-side graphical compare or/and graphical diff.
+
+ Graphical part and code for side-by-side compare (showing full
+ contents of both files) can be taken from TkDiff, while graphical
+ side-by-side diff (showing changes plus context) can be translated
+ from gitweb's side-by-side diff code.
+
+ * Integrate graphical diff with main git-gui application (including
+ switching between side-by-side and unified diff).
+
+ * Add highlighting of changes in diff both to side-by-side
+ (new code), and to unified diff (current code).
+
+ It can be done using code for TkDiff (perhaps with Git performing
+ word diff instead of doing it in Tcl), or/and using algorithm from
+ gitweb and diff-highlight in contrib. The difference is that one
+ uses word diff or character diff to highlight changes, the other
+ just skips common prefix and suffix.
+
+ * Add graphical merge / graphical 3-way diff support. Both are to be
+ used in case a file has textual conflicts; graphical merge also
+ includes resolving a merge by taking 'our' side, 'their' side (or
+ optionally also 'ancestor' side), or by editing merge result.
+
+ * Graphical side-by-side tree level diff, or side-by-side directory
+ listing with differences highlighted.
+
+ UI can be taken from two-panel filemanagers (like MC, or Total
+ Commander), or from synchronization tools (like e.g. Unison).
+
+ The difficulty can be in showing rename and copy detection results,
+ and in showing type (filemode) changes.
+
+The minimum would be to implement side-by-side diff or side-by-side
+compare of two files, without highlighting changes (diff refinement
+highlighting) in the form of separate "`git gui diff <file>`"
+command.
+
+[git-gui]: http://schacon.github.com/git/git-gui.html
+[separate repository]: http://repo.or.cz/w/git-gui.git
+[TkDiff]: http://freecode.com/projects/tkdiff
+
+Programming language: Tcl/Tk
+Proposed by: Jakub Narębski
+Possible mentor(s): Pat Thoyts, Paul Mackerras (?)
+
Other sources of inspiration
----------------------------
--
1.7.9
prev parent reply other threads:[~2012-03-11 22:31 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-02 9:11 GSoC 2012 application process Jeff King
2012-03-02 11:05 ` [git wiki PATCH 1/3] "Improving parallelism in various commands" project Thomas Rast
2012-03-02 11:05 ` [git wiki PATCH 2/3] "Designing a faster index format" project Thomas Rast
2012-03-02 11:08 ` Jeff King
2012-03-02 18:24 ` Junio C Hamano
2012-03-03 3:30 ` Nguyen Thai Ngoc Duy
2012-03-02 11:05 ` [git wiki PATCH 3/3] "Improving the `git add -p` interface" project Thomas Rast
2012-03-02 14:29 ` [git wiki PATCH 1/3] "Improving parallelism in various commands" project Nguyen Thai Ngoc Duy
2012-03-02 17:35 ` James Pickens
2012-03-02 14:52 ` GSoC 2012 application process Nguyen Thai Ngoc Duy
2012-03-02 21:48 ` Junio C Hamano
2012-03-03 0:09 ` Jeff King
2012-03-03 21:14 ` [git wiki PATCH] "Modernizing and expanding Git.pm" project Jakub Narebski
2012-03-03 22:23 ` Jeff King
2012-03-04 23:35 ` [git wiki PATCH] Teaching "--3way" to "git apply" Junio C Hamano
2012-03-05 5:33 ` Jeff King
2012-03-05 8:05 ` Thomas Rast
2012-03-05 10:02 ` Jeff King
2012-03-05 13:38 ` GSoC 2012 application process Matthieu Moy
2012-03-05 13:58 ` Jeff King
2012-03-05 14:42 ` Matthieu Moy
2012-03-05 23:53 ` Jeff King
2012-03-07 14:36 ` GSoC backup admin Jeff King
2012-03-07 15:27 ` Shawn Pearce
2012-03-08 21:18 ` [gsoc2012 wiki PATCH] "Use JavaScript library / framework in gitweb" project Jakub Narebski
2012-03-09 7:24 ` Jeff King
2012-03-10 0:46 ` [gsoc2012 wiki PATCH] "`git instaweb --serve`" project Jakub Narebski
2012-03-11 22:30 ` Jakub Narebski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331505055-12231-1-git-send-email-jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).