1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 15:04:49 +01:00
Commit graph

90 commits

Author SHA1 Message Date
Paul Mackerras
e2ed4324b0 First cut at displaying the diffs for a merge.
We display the files where the child differs from the first parent
first in black in the file list window, followed by the second parent
in blue, and so on using different colors for each parent (provided
you don't have more than 6 parents; if you do we cycle around).
2005-07-17 03:39:44 -04:00
Paul Mackerras
14c9dbd69b Make searching in files changed faster, and fix some bugs.
We now kick off a single git-diff-tree -r --stdin and feed it all
the commit pairs we want to know about, instead of doing a separate
git-diff-tree invocation for each.
2005-07-16 21:53:55 -04:00
Paul Mackerras
b74fd57966 Add "Files" and "Pickaxe" to the find menu.
"Files" matches the find string against each of the files modified
by each commit, and can do exact, case-ignoring or regexp matching.

"Pickaxe" uses git-diff-tree -S'string' and can only do exact
matching.  I called it "pickaxe" rather than "find within patch"
since it only finds commits where the string is present in the child
but not the parents or vice versa, and "pickaxe" is what the author
of that feature calls it.
2005-07-16 07:46:13 -04:00
Paul Mackerras
4a2139f52f Add a menu item for writing out a commit to a file.
This just invokes git-diff-tree.  Also changed the readonly entry
widgets in the "write patch" and "generate tag" windows to have
flat relief, so it doesn't look like you should be able to modify
what's in them.
2005-06-29 09:47:48 +10:00
Paul Mackerras
bdbfbe3dc9 Add a menu item for creating tags. 2005-06-27 22:56:40 +10:00
Paul Mackerras
7e952e797c Fix a bug where we would corrupt the stuff read from git-rev-list.
If we have a very long commit message, and we end up getting a
bufferfull of data from git-rev-list that all belongs to one commit,
we ended up throwing away the data from a previous read that should
have been included.  The result was a error message about not being
able to parse the output of git-rev-list.

Also, if the git-rev-list output that we can't parse is long, only put
the first 80 chars in the error message.  Otherwise we end up with an
enormous error window.
2005-06-27 20:04:26 +10:00
Paul Mackerras
74daedb62c Add a menu entry for generating a patch between any two commits. 2005-06-27 19:27:32 +10:00
Paul Mackerras
8a0a74ad77 Fix behaviour in the case where we have no commits to display.
I had code in there to put "No commits selected" on the canvas
but it needed some globals.
2005-06-27 13:38:29 +10:00
Paul Mackerras
e2ede2b9f5 Check for the existence of the git directory on startup.
Check that $GIT_DIR (or .git, if GIT_DIR is not set) is a directory.
This means we can give a more informative error message if the user
runs gitk somewhere that isn't a git repository.
2005-06-27 10:37:11 +10:00
Paul Mackerras
ee3dc72e30 Clear the SHA1 entry field when we go to paste something into it
If the user pastes in the selection (with the middle mouse button) and
it already has 40 characters in it, clear it before pasting.
2005-06-25 16:37:13 +10:00
Paul Mackerras
c8dfbcf995 Add commit row context menu and handle left-click on graph lines
Right-click on a context row now brings up a menu allowing the user to
generate a diff between that row and the selected row.  Left-click on
a graph line shows the parent and children connected by the line in
the details pane.  Left-click on a circle in the graph selects that
commit.  Left-click elsewhere in the graph does nothing.

When displaying a diff, the bottom-right file list box behaves
slightly differently now; instead of eliding all other files' diffs,
it now just scrolls the details pane so that the selected file's diff
starts at the top of the pane.

Since the diffs can be rather large, arrange for an update to be done
every 100ms while reading diffs.

Also removed the CVS revision keywords and bumped the version number
to 1.2.
2005-06-25 15:39:21 +10:00
Paul Mackerras
6c20ff3423 Try to assign colors so crossing lines have different colors
In particular try hard to give different colors to lines that cross
at a corner in one of the lines.
2005-06-22 19:53:32 +10:00
Paul Mackerras
806ce09718 Account for indentation of the checkin comments by git-rev-list
This involves adding indentation when we read a commit with
git-cat-file and trimming the whitespace from the headline.
2005-06-22 18:15:15 +10:00
Paul Mackerras
b490a99176 Use git-rev-list --header.
With --header, git-rev-list gives us the contents of the commit
in-line, so we don't need to exec a git-cat-file to get it, and we
don't need the readobj command either.
Also fixed a residual problem with handling the commit that
has a parent listed twice.
2005-06-22 10:25:38 +10:00
Paul Mackerras
2efef4b9b5 Pass arguments through git-rev-parse.
This allows the user to specify ranges more flexibly; for instance
the user can now do "gitk v2.6.12.." and see all the changes since
2.6.12.
2005-06-21 10:20:04 +10:00
Paul Mackerras
a823a91131 Handle the case of a parent being listed twice in a merge.
This happens in the linux-2.6 tree.  We draw the graph line
double-thick to show that this happened.

Also fix a bug where we got a bogus "No commit information available"
line at the end on simple repositories like this one.
2005-06-21 10:01:38 +10:00
Paul Mackerras
84ba734580 Draw graph lines as one continuous line where possible
Added context menu on lines
Added headline display when the mouse hovers over a line
Removed some debug messages
2005-06-17 00:12:26 +00:00
Paul Mackerras
ea13cba175 Fix operation without libreadobj.so.0.0
Display a watch cursor when reading the commits initially
2005-06-16 10:54:04 +00:00
Paul Mackerras
9ccbdfbfbc Restructure to do incremental drawing
Some speedups from not doing update so often
2005-06-16 00:27:23 +00:00
Paul Mackerras
c2f6a02251 Show heads as well as tags 2005-06-10 07:54:49 +00:00
Paul Mackerras
d4e95cb6cf cope with changed git-diff-tree output format 2005-06-01 00:02:13 +00:00
Paul Mackerras
cfb4563c83 Use git-rev-list instead of git-rev-tree.
Fix bug in changing font size in entry widgets.
Fix bug with B1 click before anything has been drawn.
Use "units" and "pages" instead of "u" and "p" for tk8.5.
2005-05-31 12:14:42 +00:00
Paul Mackerras
887fe3c474 Read tags from .git/refs/tags/* and mark commits with tags
with a label.
Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 07:35:37 +00:00
Paul Mackerras
39ad85705c Accommodate new git-diff-tree output format
Add 'f' key for moving to next file
2005-05-19 12:35:53 +00:00
Paul Mackerras
5842215ee9 Handle \ No newline at end of line lines in diff
Put (deleted) or (created, mode xxx) in header lines
Fix scrolling to bring lines on screen
2005-05-19 10:56:42 +00:00
Paul Mackerras
173860663e More fixes for geometry restoration
Make up/down/pgup/pgdn work again
Return in find string entry does find
Scale circles and lines with font size
Fix scrolling to make entire selected line visible
Use white circle for commits not listed but put in to terminate lines
Fix diff parsing for created and deleted files
2005-05-18 22:51:00 +00:00
Paul Mackerras
df3d83b143 Error popups on error conditions rather than stderr msgs
Stop . bindings firing on find string entry keypresses
Fix geometry saving/restoring a bit
Show the terminal commits
Highlight comment matches in the comment window
2005-05-17 23:23:07 +00:00
Paul Mackerras
0fba86b3a9 save window geometry on exit, and restore it on startup 2005-05-16 23:54:58 +00:00
Paul Mackerras
43bddeb43d Resize the panes in the paned windows (commit list and details)
to keep the proportionality of the pane widths as the overall
window is resized.
2005-05-15 23:19:18 +00:00
Paul Mackerras
e47120cb93 Fix stder -> stderr 2005-05-15 21:49:26 +00:00
Paul Mackerras
276819b35b Bumped version number 2005-05-15 12:57:02 +00:00
Paul Mackerras
1d10f36d7f Made commit list reading asynchronous
Added control+/- to increase/decrease font sizes
Rearranged code a little.
2005-05-15 12:55:47 +00:00
Paul Mackerras
98f350e501 Add a widget to show the SHA1 ID of the current commit
Add a find facility to search within the commits
Cope with multiple starting points.
2005-05-15 05:56:51 +00:00
Paul Mackerras
9a40c50c1e Make behaviour when git-rev-tree fails nicer
Fix crash benh saw with currentid undefined
Add menu with file/quit and help/about items
Add ^Q for quit
2005-05-12 23:46:16 +00:00
Paul Mackerras
e5c2d85644 Show the diffs when a commit is selected
Selecting in the listbox reduces the text view to just the
diff for the file(s) selected
Added -c option for color-by-committer
Added some more key bindings
2005-05-11 23:44:54 +00:00
Paul Mackerras
d2610d110e Make getting file lists asynchronous
Add some scrollbars
2005-05-11 00:45:38 +00:00
Paul Mackerras
b5721c72b7 source ~/.gitk for user-specific option settings
use a panedwindow for the main list with three panes,
and make them scroll together
2005-05-10 12:08:22 +00:00
Paul Mackerras
5ad588de72 Display the list of changed files in a listbox pane. 2005-05-10 01:02:55 +00:00
Paul Mackerras
0327d27a18 Use a panedwindow
Make it cope with commits having parents that aren't listed.
2005-05-10 00:23:42 +00:00
Paul Mackerras
1db95b00a2 Add initial version of gitk to the CVS repository 2005-05-09 04:08:39 +00:00