Skip to content

G
git

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

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

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

切换分支/标签
  1. 27 6月, 2007 5 次提交
  3. 16 6月, 2007 9 次提交
  5. 13 6月, 2007 2 次提交
  7. 12 6月, 2007 6 次提交
  9. 11 6月, 2007 6 次提交
  11. 10 6月, 2007 1 次提交
  13. 08 6月, 2007 2 次提交
    • J
      checkout: do not get confused with ambiguous tag/branch names · 5035242c
      由 Junio C Hamano 提交于 
      Although it is not advisable, we have always allowed a branch
and a tag to have the same basename (i.e. it is not illegal to
have refs/heads/frotz and refs/tags/frotz at the same time).
When talking about a specific commit, the interpretation of
'frotz' has always been "use tag and then check branch",
although we warn when ambiguities exist.

However "git checkout $name" is defined to (1) first see if it
matches the branch name, and if so switch to that branch; (2)
otherwise it is an instruction to detach HEAD to point at the
commit named by $name.  We did not follow this definition when
$name appeared under both refs/heads/ and refs/tags/ -- we
switched to the branch but read the tree from the tagged commit,
which was utterly bogus.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      5035242c
    • S
      git-gui: Changed blame header bar background to match main window · d80ded01
      由 Shawn O. Pearce 提交于 
      The main window's diff header bar background switched from orange
to gold recently, and I liked the effect it had on readability of
the text.  Since I wanted the blame viewer to match, here it is.

Though this probably should be a user defined color, or at least
a constant somewhere that everyone can reference.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
      d80ded01
  15. 07 6月, 2007 5 次提交
  17. 06 6月, 2007 4 次提交
    • S
      git-gui: Favor the original annotations over the recent ones · 0f32da53
      由 Shawn O. Pearce 提交于 
      Usually when you are looking at blame annotations for a region of
a file you are more interested in why something was originally
done then why it is here now.  This is because most of the time
when we get original annotation data we are looking at a simple
refactoring performed to better organize code, not to change its
semantic meaning or function.  Reorganizations are sometimes of
interest, but not usually.

We now show the original commit data first in the tooltip.  This
actually looks quite nice as the original commit will usually have an
author date prior to the current (aka move/copy) annotation's commit,
so the two commits will now tend to appear in chronological order.

I also found myself to always be clicking on the line of interest
in the file column but I always wanted the original tracking data
and not the move/copy data.  So I changed our default commit from
$asim_data (the simple move/copy annotation) to the more complex
$amov_data (the -M -C -C original annotation).
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
      0f32da53
    • S
      git-gui: Improve our labeling of blame annotation types · 949da61b
      由 Shawn O. Pearce 提交于 
      It feels wrong to call the -M -C -C annotations "move/copy tracking"
as they are actually the original locations.  So I'm relabeling
the status bar to show "copy/move tracking annotations" for the
current file (no -M -C -C) as that set of annotations tells us who
put the hunk here (who moved/copied it).  I'm now calling the -M
-C -C pass "original location annotations" as that's what we're
really digging for.

I also tried to clarify some of the text in the hover tooltip.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
      949da61b
    • S
      git-gui: Use three colors for the blame viewer background · 5d198d67
      由 Shawn O. Pearce 提交于 
      To prevent neighboring lines that are different commits from using
the same background color we now use 3 colors and assign them
by selecting the color that is not used before or after the line
in question.  We still color "on the fly" as we receive hunks from
git-blame, but we delay our color decisions until we are getting
the original location data (the slower -M -C -C pass) as that is
usually more fine-grained than the current location data.

Credit goes to Martin Waitz for the tri-coloring concept.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
      5d198d67
    • S
      git-gui: Jump to original line in blame viewer · 0dfed77b
      由 Shawn O. Pearce 提交于 
      When the user clicks on a commit link within one of the columns
in the blame viewer we now jump them not just to that commit/file
pair but also to the line of the original file.  This saves the
user a lot of time, as they don't need to search through the new
file data for the chunk they were previously looking at.

We also restore the prior view when the user clicks the back button
to return to a pior commit/file pair that they were looking at.

Turned out this was quite tricky to get working in Tk.  Every time
I tried to jump the text widgets to the correct locations by way
of the "yview moveto" or "see" subcommands Tk performed the change
until the current event finished dispatching, and then reset the
views back to 0, making the change never take place.  Forcing Tk
to run the pending events before we jump the UI resolves the issue.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
      0dfed77b