Skip to content

G
git

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

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

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

切换分支/标签
  1. 29 6月, 2007 1 次提交
  3. 28 6月, 2007 5 次提交
  5. 27 6月, 2007 14 次提交
  7. 26 6月, 2007 1 次提交
    • P
      gitk: Add a progress bar to show progress while resetting · 706d6c3e
      由 Paul Mackerras 提交于 
      Since git reset now gets chatty while resetting, we were getting errors
reported when a reset was done using the "reset branch to here" menu
item.  With this we now read the progress messages from git reset and
update a progress bar.  Because git reset outputs the progress messages
to standard error, and Tcl treats messages to standard error as error
messages, we have to invoke git reset via a shell and redirect standard
error into standard output.

This also fixes a bug in computing descendent heads when head ids
are changed via a reset.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      706d6c3e
  9. 25 6月, 2007 1 次提交
    • S
      Teach bash how to complete +refspec on git-push · 161fea83
      由 Shawn O. Pearce 提交于 
      Using `git push origin +foo` to forcefully overwrite the remote
branch named foo is a common idiom, especially since + is shorter
than the long option --force and can be specified on a per-branch
basis.

We now complete `git push origin +foo` just like we do the standard
`git push origin foo`.  The leading + on a branch refspec does not
alter the completion.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
      161fea83
  11. 24 6月, 2007 7 次提交
  13. 23 6月, 2007 11 次提交
    • P
      gitk: Improve handling of whitespace and special chars in filenames · 9396cd38
      由 Paul Mackerras 提交于 
      The main thing here is better parsing of the diff --git lines in the
output of git diff-tree -p.  We now cope with filenames in quotes with
special chars escaped.  If the filenames contain spaces they aren't
quoted, however, which can create difficulties in parsing.  We get
around the difficulties by detecting the case when the filename hasn't
changed (chop the part after "diff --git " in two and see if the halves
match apart from a/ in one and b/ in the other), and if it hasn't
changed, we just use one half.  If the filename has changed we wait
for the "rename from" and "rename to" lines, which give the old and
new filenames unambiguously.

This also improves the parsing of the output of git diff-tree.
Instead of using lindex to extract the filename, we take the part from
the first tab on, and if it starts with a quote, we use [lindex $str 0]
to remove the quotes and convert the escapes.

This also gets rid of some unused tagging of the diff text, uses
[string compare] instead of [regexp] in some places, and fixes the
regexp for detecting the @@ hunk-separator lines (the regexp wasn't
accepting a single number, as in "-0,0 +1" for example).
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      9396cd38
    • P
      gitk: Fix bug causing nearby tags/heads to sometimes not be displayed · f3326b66
      由 Paul Mackerras 提交于 
      When we compute descendent heads and descendent/ancestor tags, we
cache the results.  We need to be careful to invalidate the cache
when we add stuff to the graph.  Also make sure that when we cache
descendent heads for a node we only cache the heads that are actually
descendents of that node.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      f3326b66
    • P
      gitk: Limit how often we change the canvas scrolling region · a2c22362
      由 Paul Mackerras 提交于 
      For some unknown reason, changing the scrolling region on the canvases
provokes multiple milliseconds worth of computation in the X server,
and this can end up slowing gitk down significantly.  This works around
the problem by limiting the rate at which we update the scrolling region
after the first 100 rows to at most 2 per second.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      a2c22362
    • P
      gitk: Add a "reset branch to here" row context-menu operation · 6fb735ae
      由 Paul Mackerras 提交于 
      This adds an entry to the menu that comes up when the user does a
right-click on a row.  The new entry allows the user to reset the
currently checked-out head to the commit for the row that they did
the right-click on.  The user has to select what type of reset to
do, and confirm the reset, via a dialog box that pops up.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      6fb735ae
    • P
      gitk: Get rid of the childlist variable · 6a90bff1
      由 Paul Mackerras 提交于 
      The information in childlist is a duplicate of what's in the children
array, and it wasn't being accessed often enough to be really worth
keeping the list around as well.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      6a90bff1
    • P
      gitk: Speed up the reading of references · 62d3ea65
      由 Paul Mackerras 提交于 
      We were doing two execs for each tag - one to map the tag ID to a
commit ID and one to read the contents of the tag for later display.
This speeds up the process by not reading the contents of the tag
(instead it is read later if needed), and by using the -d flag to
git show-ref, which gives us refs/tags/foo^{} lines which give us
the commit ID.  Also this uses string operations instead of regexps.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      62d3ea65
    • P
      gitk: Show local uncommitted changes as a fake commit · 219ea3a9
      由 Paul Mackerras 提交于 
      If there are local changes in the repository, i.e., git-diff-index HEAD
produces some output, then this optionally displays an extra row in
the graph as a child of the HEAD commit (but with a red circle to
indicate that it's not a real commit).  There is a checkbox in the
preferences window to control whether gitk does this or not.

Clicking on the extra row shows the diffs between the working directory
and the HEAD (using git diff-index -p).  The right-click menu on the
extra row allows the user to generate a patch containing the local diffs,
or to display the diffs between the working directory and any commit.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      219ea3a9
    • P
      gitk: New algorithm for drawing the graph lines · 322a8cc9
      由 Paul Mackerras 提交于 
      This only draws as much of the graph lines as is visible.  This can
happen by adding coordinates on to an existing graph line or by
creating a new line.  This means that we only need to have laid out
and optimized as much of the graph as is actually visible in order to
draw it, including the lines (previously we didn't draw a graph
line until we had laid out and optimized to the end of a segment of
the line, i.e. down to a down-arrow or to the row where the line's
commit is displayed).  This also lets us get rid of the linesegends
list, and gives us an easy workaround for the X server bug that
causes long lines to be misdrawn.  This also gets rid of the use
of rowoffsets in drawlineseg et al.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      322a8cc9
    • P
      gitk: Store ids in rowrangelist and idrowranges rather than row numbers · 66e46f37
      由 Paul Mackerras 提交于 
      This removes the need for insertrow to go through rowrangelist and
idrowranges and adjust a lot of entries.  The first entry for a given
id is now the row number of the first child, not that row number + 1,
and rowranges compensates for that so its callers didn't have to
change.  This adds a ranges argument to drawlineseg so that we can
avoid calling rowranges a second time inside drawlineseg (all its
callers already called rowranges).
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      66e46f37
    • P
      gitk: Disable the head context menu entries for the checked-out branch · 00609463
      由 Paul Mackerras 提交于 
      Neither the "check out this branch" nor the "remove this branch"
menu item can be used on the currently-checked out branch, so disable
them.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      00609463
    • P
      gitk: Cope with commit messages with carriage-returns and initial blank lines · 43c25074
      由 Paul Mackerras 提交于 
      In some repositories imported from other systems we can get carriage
return characters in the commit message, which leads to a multi-line
headline being displayed in the summary window, which looks bad.
Also some commit messages start with one or more blank lines, which
leads to an empty headline.  This fixes these problems.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      43c25074