git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tim Henigan <tim.henigan@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Paul Mackerras <paulus@samba.org>,
	Junio C Hamano <gitster@pobox.com>,
	j.sixt@viscovery.net, markb@berlios.de
Subject: [PATCH/RFC resend] gitk: Ignore limitdiffs option when displaying  commit file list
Date: Mon, 29 Mar 2010 10:29:06 -0400	[thread overview]
Message-ID: <32c343771003290729x49407af7hf404b60203d123ac@mail.gmail.com> (raw)

When gitk is invoked with a path argument (e.g. gitk gitk-git),
the path is used to filter the list of files displayed in the
lower right window.  If a file does not start with the specified
substring, it is not displayed.  This is counter-intuitive for
a couple reasons:
 1) The files continue to be listed in the diff window.
 2) Merge commits (i.e. commits with more than 1 parent) still
    show the complete list of files in the lower right since
    these commits are processed by 'mergediff' rather than
    the 'startdiff' function.

With this change, the complete list of files affected by a
commit will always be shown in the lower right window.

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
---

This is a resend with Paul Mackerras added to the CC list.

I noticed this issue recently when trying gitk.  After some research, I found
this thread [1] which explained the issue.  However, the operation still does
not seem consistent.  This patch fixes the "problem" that I encountered, but
I can't help wondering:
   1) I am breaking another feature?  Especially since the
        '$vfilelimit($curview) ne {}' check is now ignored.
   2) Can the limitdiffs option be completely removed?  If not, the behavior
       of startdiff and mergediff should at least be made consistent.

I copied the people that were involved in the earlier thread [1].

[1] http://thread.gmane.org/gmane.comp.version-control.git/133088

 gitk-git/gitk |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/gitk-git/gitk b/gitk-git/gitk
index 1f36a3e..518061e 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -7450,17 +7450,7 @@ proc gettreediffline {gdtf ids} {
       return [expr {$nr >= $max? 2: 1}]
    }
    close $gdtf
-    if {$limitdiffs && $vfilelimit($curview) ne {}} {
-       set flist {}
-       foreach f $treediff {
-           if {[path_filter $vfilelimit($curview) $f]} {
-               lappend flist $f
-           }
-       }
-       set treediffs($ids) $flist
-    } else {
-       set treediffs($ids) $treediff
-    }
+    set treediffs($ids) $treediff
    unset treepending
    if {$cmitmode eq "tree" && [llength $diffids] == 1} {
       gettree $diffids
--
1.7.0.3.291.g5e4f6.dirty

                 reply	other threads:[~2010-03-29 14:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=32c343771003290729x49407af7hf404b60203d123ac@mail.gmail.com \
    --to=tim.henigan@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j.sixt@viscovery.net \
    --cc=markb@berlios.de \
    --cc=paulus@samba.org \
    /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.
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 NNTP newsgroup(s).