summaryrefslogtreecommitdiff
path: root/gitk
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/gitk/gitkLinus Torvalds2005-07-181-81/+434
|\
| * Make the diff display less gaudy.Paul Mackerras2005-07-181-14/+32
| | | | | | | | | | The old style is still available as an option (we still need a preferences window so we can set/clear it though).
| * Allow short SHA1 IDs in the SHA1 entry field.Paul Mackerras2005-07-181-1/+18
| |
| * Fix display of mode changes in details pane.Paul Mackerras2005-07-171-33/+13
| | | | | | | | | | Also simplified the parsing of the git-diff-tree -p output and got rid of the unused 'seenfile' variable.
| * First cut at displaying the diffs for a merge.Paul Mackerras2005-07-171-19/+34
| | | | | | | | | | | | | | 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).
| * Make searching in files changed faster, and fix some bugs.Paul Mackerras2005-07-161-43/+137
| | | | | | | | | | | | 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.
| * Add "Files" and "Pickaxe" to the find menu.Paul Mackerras2005-07-161-18/+247
| | | | | | | | | | | | | | | | | | | | | | "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.
* | Make gitk use --topo-order instead of --merge-orderLinus Torvalds2005-07-061-1/+1
|/ | | | | | | | | | It's cheaper to calculate, and doesn't give different results depending on the order of the arguments passed in (and is thus more appropriate for something like gitk that can validly take the unordered "--all" flag to show all branches). The previous dup fix seems to have fixed --topo-order. Holler if you still see problems.
* Add a menu item for writing out a commit to a file.Paul Mackerras2005-06-291-9/+66
| | | | | | | 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.
* Add a menu item for creating tags.Paul Mackerras2005-06-271-43/+140
|
* Fix a bug where we would corrupt the stuff read from git-rev-list.Paul Mackerras2005-06-271-2/+7
| | | | | | | | | | | | 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.
* Add a menu entry for generating a patch between any two commits.Paul Mackerras2005-06-271-0/+87
|
* Fix behaviour in the case where we have no commits to display.Paul Mackerras2005-06-271-10/+17
| | | | | I had code in there to put "No commits selected" on the canvas but it needed some globals.
* Check for the existence of the git directory on startup.Paul Mackerras2005-06-271-1/+11
| | | | | | 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.
* Clear the SHA1 entry field when we go to paste something into itPaul Mackerras2005-06-251-0/+8
| | | | | If the user pastes in the selection (with the middle mouse button) and it already has 40 characters in it, clear it before pasting.
* Add commit row context menu and handle left-click on graph linesPaul Mackerras2005-06-251-86/+180
| | | | | | | | | | | | | | | | | | | 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.
* Try to assign colors so crossing lines have different colorsPaul Mackerras2005-06-221-11/+71
| | | | | In particular try hard to give different colors to lines that cross at a corner in one of the lines.
* Account for indentation of the checkin comments by git-rev-listPaul Mackerras2005-06-221-1/+6
| | | | | This involves adding indentation when we read a commit with git-cat-file and trimming the whitespace from the headline.
* Use git-rev-list --header.Paul Mackerras2005-06-221-94/+94
| | | | | | | | 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.
* Pass arguments through git-rev-parse.Paul Mackerras2005-06-211-4/+12
| | | | | | 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.
* Handle the case of a parent being listed twice in a merge.Paul Mackerras2005-06-211-58/+78
| | | | | | | | 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.
* Draw graph lines as one continuous line where possiblePaul Mackerras2005-06-171-30/+122
| | | | | | Added context menu on lines Added headline display when the mouse hovers over a line Removed some debug messages
* Fix operation without libreadobj.so.0.0Paul Mackerras2005-06-161-4/+13
| | | | Display a watch cursor when reading the commits initially
* Restructure to do incremental drawingPaul Mackerras2005-06-161-318/+438
| | | | Some speedups from not doing update so often
* Show heads as well as tagsPaul Mackerras2005-06-101-11/+43
|
* cope with changed git-diff-tree output formatPaul Mackerras2005-06-011-7/+4
|
* Use git-rev-list instead of git-rev-tree.Paul Mackerras2005-05-311-56/+63
| | | | | | 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.
* Read tags from .git/refs/tags/* and mark commits with tagsPaul Mackerras2005-05-211-17/+132
| | | | | with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
* Accommodate new git-diff-tree output formatPaul Mackerras2005-05-191-3/+28
| | | | Add 'f' key for moving to next file
* Handle \ No newline at end of line lines in diffPaul Mackerras2005-05-191-20/+41
| | | | | Put (deleted) or (created, mode xxx) in header lines Fix scrolling to bring lines on screen
* More fixes for geometry restorationPaul Mackerras2005-05-181-35/+66
| | | | | | | | | 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
* Error popups on error conditions rather than stderr msgsPaul Mackerras2005-05-171-70/+139
| | | | | | | 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
* save window geometry on exit, and restore it on startupPaul Mackerras2005-05-161-10/+63
|
* Resize the panes in the paned windows (commit list and details)Paul Mackerras2005-05-151-2/+56
| | | | | to keep the proportionality of the pane widths as the overall window is resized.
* Fix stder -> stderrPaul Mackerras2005-05-151-3/+3
|
* Bumped version numberPaul Mackerras2005-05-151-3/+3
|
* Made commit list reading asynchronousPaul Mackerras2005-05-151-89/+160
| | | | | Added control+/- to increase/decrease font sizes Rearranged code a little.
* Add a widget to show the SHA1 ID of the current commitPaul Mackerras2005-05-151-30/+197
| | | | | Add a find facility to search within the commits Cope with multiple starting points.
* Make behaviour when git-rev-tree fails nicerPaul Mackerras2005-05-121-3/+53
| | | | | | Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
* Show the diffs when a commit is selectedPaul Mackerras2005-05-111-53/+202
| | | | | | | 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
* Make getting file lists asynchronousPaul Mackerras2005-05-111-34/+81
| | | | Add some scrollbars
* source ~/.gitk for user-specific option settingsPaul Mackerras2005-05-101-43/+64
| | | | | use a panedwindow for the main list with three panes, and make them scroll together
* Display the list of changed files in a listbox pane.Paul Mackerras2005-05-101-8/+66
|
* Use a panedwindowPaul Mackerras2005-05-101-20/+32
| | | | Make it cope with commits having parents that aren't listed.
* Add initial version of gitk to the CVS repositoryPaul Mackerras2005-05-091-0/+418
View Lorry Controller Status