Skip to content

G
git

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

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

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

切换分支/标签
  1. 19 11月, 2009 1 次提交
  3. 14 11月, 2009 6 次提交
  5. 03 11月, 2009 5 次提交
  7. 21 9月, 2009 1 次提交
  9. 10 9月, 2009 2 次提交
    • P
      gitk: Don't compare fake children when comparing commits · aa43561a
      由 Paul Mackerras 提交于 
      This fixes a bug where the compare-commits function would advance
to a fake node (one representing local changes, either checked in
but not committed, or not checked in) and then get an error when
trying to get the patch-id.  This fixes it by only considering the
real children of each commit.
Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      aa43561a
    • P
      gitk: Show diff of commits at end of compare-commits output · c21398be
      由 Paul Mackerras 提交于 
      When comparing a string of commits, when we find two non-merge commits
that differ, we now write the two commits to files and diff the files.
This pulls out the logic for creating a temporary directory from
external_diff into a separate procedure so that the new diffcommits
procedure can use it.

Because the diff command returns an exit status of 1 when the files
differ, and Tcl treats that as an error, this adds catch {} around the
close statements in getblobdiffline.

At present this only removes the temporary files when gitk exits.  It
should remove them when the diff is done.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      c21398be
  11. 07 9月, 2009 1 次提交
    • P
      gitk: Show diff of commits at end of compare-commits output · 4a3da5d9
      由 Paul Mackerras 提交于 
      When comparing a string of commits, when we find two non-merge commits
that differ, we now write the two commits to files and diff the files.
This pulls out the logic for creating a temporary directory from
external_diff into a separate procedure so that the new diffcommits
procedure can use it.

Because the diff command returns an exit status of 1 when the files
differ, and Tcl treats that as an error, this adds catch {} around the
close statements in getblobdiffline.

At present this only removes the temporary files when gitk exits.  It
should remove them when the diff is done.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      4a3da5d9
  13. 05 9月, 2009 2 次提交
  15. 14 8月, 2009 1 次提交
  17. 13 8月, 2009 4 次提交
    • T
      gitk: Parse arbitrary commit-ish in SHA1 field · 9bf3acfa
      由 Thomas Rast 提交于 
      We only accepted either SHA1s or heads/tags that have been read.  This
meant the user could not, e.g., enter HEAD to go back to the current
commit.

This adds code to call out to git rev-parse --verify if all other
methods of interpreting the string the user entered fail.
(git-rev-parse alone is not enough as we really want a single
revision.)

The error paths change slighly, because we now know from the rev-parse
invocation whether the expression was valid at all.  The previous
"unknown" path is now only triggered if the revision does exist, but
is not in the current view display.
Signed-off-by: NThomas Rast <trast@student.ethz.ch>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      9bf3acfa
    • T
      gitk: Fix direction of symmetric difference in optimized mode · 2b1fbf90
      由 Thomas Rast 提交于 
      ee66e089 (gitk: Make updates go faster, 2008-05-09) implemented an
optimized mode where gitk parses the arguments with rev-parse, and
manually reads history in chunks.  As mentioned in the commit message,
symmetric differences are a problem there:

    One wrinkle is that we have to turn symmetric diff arguments (of the
    form a...b) back into symmetric diff form so that --left-right still
    works, as git rev parse turns a...b into a b ^merge_base(a,b).

However, git-rev-parse returns a...b in the swapped order

    b a ^merge_base(a,b)

This has been the case since at least 1f8115b1 (the state of master at
the time of the abovementioned ee66e089; Merge branch 'maint',
2008-05-08).  So gitk flipped the sides of symmetric differences
whenever it was in optimized mode.

Fix this by swapping the sides of the reconstruction code.
Signed-off-by: NThomas Rast <trast@student.ethz.ch>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      2b1fbf90
    • T
      gitk: New option to hide remote refs · ffe15297
      由 Thomas Rast 提交于 
      In repositories with lots of remotes, looking at the history in gitk
can be borderline insane with all the red labels for remote refs.
Introduce a new option in the preferences that makes gitk ignore
remote refs entirely, so they don't take up space in the display.
Wished-for-by: NThell Fowler <tbfowler4@gmail.com>
Signed-off-by: NThomas Rast <trast@student.ethz.ch>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      ffe15297
    • J
      gitk: Do not hard-code "encoding" in attribute lookup functions · 097e1118
      由 Johannes Sixt 提交于 
      Commit 39ee47ef (Clean up file encoding code and add enable/disable option,
2008-10-15) rewrote the attribute lookup functions gitattr and
cache_gitattr, but in the process hard-coded the attribute name "encoding"
instead of using the functions' parameters. This fixes it.

This is not a serious regression because currently all callers look only
for "encoding".

Further note that this fix assumes that future callers will not pass an
attribute name that contains regex special characters.
Signed-off-by: NJohannes Sixt <j6t@kdbg.org>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      097e1118
  19. 25 5月, 2009 3 次提交
  21. 19 5月, 2009 1 次提交
  23. 16 5月, 2009 5 次提交
  25. 01 5月, 2009 3 次提交
  27. 21 4月, 2009 1 次提交
    • P
      gitk: Fix compare-commits function when we have local changes · 6f63fc18
      由 Paul Mackerras 提交于 
      This fixes a bug in the compare-commits function added in commit
010509f2 ("gitk: Add a command to compare two strings of commits")
where gitk would show an error dialog if the comparison of commits
got to a fake commit (one showing local changes).  It extends
getpatchid to handle these fake commits by using [diffcmd] to get
the git diff command variant to use, and also handles the situation
where an error occurs.

Now that we can have the fake commit IDs showing up, which are
00..00 and 00..01, the short ID is ambiguous.  To make sure the links
point to the right commit, this adds a new [appendshortlink] procedure
which takes the full link destination, and uses that rather than
appendwithlinks.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      6f63fc18
  29. 17 4月, 2009 4 次提交