Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 11 5月, 2013 4 次提交
  3. 01 4月, 2013 1 次提交
    • G
      gitk: Move hard-coded colors to .gitk · 252c52df
      由 Gauthier Östervall 提交于 
      The Preferences dialog gives control of the colors of some elements of
the gitk user interface, but many are hard-coded in the gitk script.
In order to allow these to be customized through the gitk config
file, these other colors are stored in variables which can be set
in the config file, thus providing a way for color schemes to be stored
and shared.

For win32, this makes the default foreground color that of window text
rather than button text.
Signed-off-by: NGauthier Östervall <gauthier@ostervall.se>
[paulus@samba.org: Reworded commit message to be clearer,
 changed filesepfgcolor to black]
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      252c52df
  5. 30 1月, 2013 1 次提交
  7. 02 1月, 2013 1 次提交
    • P
      gitk: Display important heads even when there are many · 386befb7
      由 Paul Mackerras 提交于 
      When there are more than $maxrefs descendant heads to display in the
Branches field of the commit display, we currently just display "many",
which is not very informative.  To make the display more informative,
we now look for "master" and whichever head is currently checked out,
and display them even if there are too many heads to display them all.
The display then looks like "Branches: master and many more (33)" for
instance.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      386befb7
  9. 01 1月, 2013 2 次提交
    • P
      gitk: Improve display of list of nearby tags and heads · d34835c9
      由 Paul Mackerras 提交于 
      This provides a control in the preferences pane for the limit on
how many tags or heads are displayed with the commit details under
the Branch(es), Precedes and Follows headings.  This limit is now
saved in ~/.gitk so that changes are persistent.

This also applies word-wrapping to the list of tags or heads under
the Branch, Precedes and Follows headings, so that long lists are
more readable.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      d34835c9
    • P
      gitk: Fix display of branch names on some commits · d809fb17
      由 Paul Mackerras 提交于 
      Sometimes the code that divides commits up into arcs creates two
successive arcs, but the commit between them (the commit at the end
of the first arc and the beginning of the second arc) has only one
parent and one child.  If that commit is also the head of one or more
branches, those branches get omitted from the "Branches" field in the
commit display.

The omission occurs because the commit gets erroneously identified as
a commit which is part-way along an arc in [descheads].  This fixes it
by changing the test to look at the arcouts array, which only contains
elements for the commits at the start or end of an arc.
Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      d809fb17
  11. 22 10月, 2012 6 次提交
  13. 23 9月, 2012 4 次提交
  15. 12 9月, 2012 1 次提交
  17. 09 9月, 2012 2 次提交
  19. 04 8月, 2012 1 次提交
  21. 25 4月, 2012 1 次提交
  23. 03 4月, 2012 2 次提交
  25. 24 3月, 2012 1 次提交
    • M
      gitk: Teach gitk to respect log.showroot · b2b76d10
      由 Marcus Karlsson 提交于 
      In early days, all projects managed by git (except for git itself) had the
product of a fairly mature development history in their first commit, and
it was deemed unnecessary clutter to show additions of these thousands of
paths as a patch.

"git log" learned to show the patch for the initial commit without requiring
--root command line option at 0f03ca94 (config option log.showroot to show
the diff of root commits, 2006-11-23).

Teach gitk to respect log.showroot.

[paulus@samba.org: Cleaned up the Tcl a bit, use --bool on the
 git config call]
Signed-off-by: NMarcus Karlsson <mk@acc.umu.se>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      b2b76d10
  27. 23 3月, 2012 1 次提交
    • P
      gitk: Add menu items for comparing a commit with the marked commit · 6febdede
      由 Paul Mackerras 提交于 
      Sometimes one wants to see the different between two commits that are
a long distance apart in the graph display.  This is difficult to do
with the "Diff this -> selected" and "Diff selected -> this" menu
items because the need to maintain the selection means that one can't
use the find facilities or the reference list window to navigate from
one to the other.

This provides an alternative using the mark.  Having found one commit,
one marks it with the "Mark this commit" menu item, then navigates to
the other commit and uses the new "Diff this -> marked commit" and/or
"Diff marked commit -> this" menu items.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      6febdede
  29. 19 3月, 2012 7 次提交
  31. 08 10月, 2011 1 次提交
    • J
      gitk: Make vi-style keybindings more vi-like · 811c70fc
      由 Jonathan Nieder 提交于 
      When commit 6e2dda35 (Add new keybindings, 2005-09-22) added vi-style
keybindings to gitk (an excellent idea!), instead of adopting the
usual "hjkl = left, down, up, right" bindings used by less, vi, rogue,
and many other programs, it used "ijkl = up, left, down, right" to
mimic the inverted-T formation of the arrow keys on a qwerty keyboard,
in the style of Lode runner.  So using 'j' and 'k' to scroll through
commits produces utterly confusing results to the vi user, as 'k'
moves down and 'j' moves to the previous commit.

Luckily most non-vi-users are probably using an alternate set of keys
(cursor keys or z/x + n/p) anyway.  Switch to the expected vi/nethack
convention.
Requested-by: NJosh Triplett <josh@joshtriplett.org>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      811c70fc
  33. 24 7月, 2011 4 次提交
    • Y
      gitk: Make "touching paths" search support backslashes · de665fd3
      由 Yggy King 提交于 
      Gitk can search for commits touching a specified path. The search text is
always treated as a regular expression, regardless of the matching option
selected (Exact, IgnCase, or Regexp). In particular, backslashes escape
the next character. This is inconvenient on Windows systems, where backslashes
are the norm for path specifiers, for example when copy/pasting from
Windows Explorer or a cmd shell -- these copy-pasted paths must be manually
modified in the gitk search text edit box before they will work.

This change uses the match option "Exact" to mean that a slash is a slash,
not part of a regular expression. Backslashes are converted to frontslashes
before searching, thus allowing easy copy/pasting of paths on Windows
systems. If the previous behaviour of "touching paths" search is desired,
simply select the "Regexp" search mode.

One potential drawback is that the default setting for the match option
($findtype in the code) is "Exact", and so this change alters the default
behaviour, which may confuse users and lead to bug reports.
Signed-off-by: NYggy King <yggy@zeroandone.ca>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      de665fd3
    • M
      gitk: Show modified files with separate work tree · 74cb884f
      由 Martin von Zweigbergk 提交于 
      "git rev-parse --is-inside-work-tree" is currently used to determine
whether to show modified files in gitk (the red and green fake
commits). This does not work if the current directory is not inside
the work tree, as can be the case e.g. if GIT_WORK_TREE is
set. Instead, check if the repository is not bare and that we are not
inside the .git directory.
Signed-off-by: NMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      74cb884f
    • M
      gitk: Simplify calculation of gitdir · 86e847bc
      由 Martin von Zweigbergk 提交于 
      Since 5024baa4 ([PATCH] Make gitk work when launched in a subdirectory,
2007-01-09), gitk has used 'git rev-parse --git-dir' to find the .git
directory. However, gitk still first checks for the $GIT_DIR
environment variable and that the value returned from git-rev-parse
does not point to a file. Since git-rev-parse does both of these
checks already, the checks can safely be removed from gitk. This makes
the gitdir procedure small enough to inline.

This cleanup introduces a UI regression in that the error message will
now be "Cannot find a git repository here." even in the case where
GIT_DIR points to a file, for which the error message was previously
"Cannot find the git directory \"%s\".". It should be noted, though,
that even before this patch, 'gitk --git-dir=path/to/some/file' would
give the former error message.
Signed-off-by: NMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      86e847bc
    • M
      gitk: Run 'git rev-parse --git-dir' only once · da616db5
      由 Martin von Zweigbergk 提交于 
      It seems like gitk has been setting the global variable 'gitdir' at
startup since aa81d974 (gitk: Fix Update menu item, 2006-02-28).  It
should therefore no longer be necessary to call the procedure with the
same name (more than once to set the global variable).  Remove the
other call sites and use the global variable instead.
Signed-off-by: NMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      da616db5