OSDN Git Service
Shawn O. Pearce [Tue, 21 Nov 2006 16:57:41 +0000 (11:57 -0500)]
git-gui: Abstract out windows platform test to is_Windows proc.
Like the is_MacOSX proc we shouldn't keep repeating the platform test
for Windows. Instead abstract the code out into a procedure and use
the procedure whenever we need to do something special.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 21 Nov 2006 07:46:51 +0000 (02:46 -0500)]
git-gui: Include the Tcl/Tk version in the about dialog.
Users may need to know what version of Tcl they are running git-gui
under, in case there is an interesting interface quirk or other
compatability problem we don't know about right now that we may
need to explore (and maybe fix). Since its simple enough to show
a line with this version data we should do so.
We also try to reduce the amount of text shown as often the Tcl and Tk
version numbers will be identical; when this happens we should only show
the one version number.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 21 Nov 2006 07:36:55 +0000 (02:36 -0500)]
git-gui: Make the copyright notice serve double duty.
The copyright notice we display in the about dialog should be the same
as the one at the top of our source code. By putting the copyright
notice that appears at the top of our source code into a global variable
rather than a comment we can trivially make them the same at all times.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 21 Nov 2006 07:33:56 +0000 (02:33 -0500)]
git-gui: Be more Macintosh like.
It is tradition for applications to store their about and preferences
menu options within the application menu. This is the first menu in
the menu bar, just after the apple menu. Apparently the way to access
this menu from Tk on Mac OS X systems is to create a special menu whose
name ends in ".apple" and place it into the menu bar.
So now if we are on Mac OS X we move our about menu and our options menu
into the application menu, like other Mac OS X applications.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 21 Nov 2006 04:55:51 +0000 (23:55 -0500)]
git-gui: Added about dialog box.
Created a help menu with an about dialog box. This about dialog
shows the copyright notice for the application, the fact that it
is covered by the GPL v2.0 or later, the authors, and the current
version of Git it is invoking when users perform actions within it.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 21 Nov 2006 04:01:47 +0000 (23:01 -0500)]
git-gui: Rename Project menu to Repository.
Since all of the actions in our Project menu actually apply to the
Git concept of a repository, it is a disservice to our users to
call it "project". This is especially true if Git ever gets any
sort of subproject support, as the term would then most definately
conflict.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 21 Nov 2006 03:22:10 +0000 (22:22 -0500)]
git-gui: Seperate out the database operations in project menu.
The project menu is just too cluttered without using separator entries
to split out the database operations (such as repack and verify) from
the other options in the same menu.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 21 Nov 2006 03:17:15 +0000 (22:17 -0500)]
git-gui: Reworded verify console title.
It would be something of a disservice to our users if we refer to
fsck-objects as "verify". So instead we call it fsck-objects in
the console title, and indicate that's how we are verifying the
object database.
We probably should call our menu option "fsck-objects" or similar
but I really do think that "Verify Database" more accurately describes
the action then "fsck-objects" does, especially to users who aren't
file system developers.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 21 Nov 2006 02:59:19 +0000 (21:59 -0500)]
git-gui: Don't save amended commit message buffer.
Because we don't automatically restart in amend mode when we quit while
in amend mode the commit message buffer shouldn't be saved to GITGUI_MSG
as it would be misleading when the user restarts the application.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 21 Nov 2006 02:43:41 +0000 (21:43 -0500)]
git-gui: Allow users to run fsck-objects from the gui.
I recently found a need to run fsck-objects in a number of repositories
that I also use git-gui against. Tossing in a menu option to invoke
fsck-objects and have its output show up in a console window is simple
enough to do.
We probably need to enhance the console window used by fsck-objects,
like to open up the Git fsck-objects manual page and let the user see
what each message means (such as "dangling commit") and to also let the
user invoke prune, to cleanup any such dangling objects. But right now
I'm going to ignore that problem in favor of getting other more important
features implemented.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 21 Nov 2006 02:27:22 +0000 (21:27 -0500)]
git-gui: Improve handling of merge commits.
Its useful to be able to amend the last commit even if it was a merge
commit, so we really should support that in the gui. We now do so by
making PARENT a list. We always diff against the first parent but we
create a commit consisting of the parent(s) listed in this list, in
order.
We also should recheck the repository state during an amend. Earlier
I was bitten by this exact bug when I switched branches through a
command prompt and then did not do a rescan in git-gui. When I hit
"Amend Last Commit" I was surprised to see information from the prior
branch appear. This was due to git-gui caching the data from the last
rescan and using that data form the amend data load request, rather than
the data of the current branch.
Improved error text in the dialogs used to tell the user why an amend is
being refused by git-gui. In general this is only during an initial
commit (nothing prior to amend) and during a merge commit (it is simply
too confusing to amend the last commit while also trying to complete a
merge).
Fixed a couple of minor bugs in the pull logic. Since this code isn't
really useful nobody has recently tested it and noticed the breakage.
It really needs to be rewritten anyway.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 08:46:29 +0000 (03:46 -0500)]
git-gui: Correct some state matchings for include/remove.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 08:38:48 +0000 (03:38 -0500)]
git-gui: Update in memory states after commit.
In order to allow the user to toggle include/exclude from next commit
for files which were partially included in the last commit we need the
current index mode+sha1 data stored in our file_states array. For
any partially included file we have this information from diff-files,
so we just have to copy it over to the diff-index portion of our state
array.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 07:57:58 +0000 (02:57 -0500)]
git-gui: Restore the all important shebang line.
Accidentally removed by an unnoticed fat finger accident in vi during
commit
1461c5f3.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 07:46:52 +0000 (02:46 -0500)]
git-gui: Refactored diff line display formatting logic.
The tags used for diff formatting (which I inherited from gitool) just
didn't make a whole lot of sense, especially if you wanted to try to
match them to the diff output you were seeing on screen. It did not
help that the diff-index -c output's first two columns are also munged
to make the diff output more user friendly.
So this is a large refactoring of the tags used for diff display. Now
our tag names match what we put in the left column of each line, which
makes it easier to correlate presentation and implementation.
I removed bold font usage from everything except the hunk headers as I
really did not like the way bold font caused column alignments to become
out of whack within the diff viewer. It also drew attention to the parts
of the file which were identically changed in both the index and in the
working directory, yet these are usually the parts I find myself caring
the least about. So its very counter-intuitive.
Lines which are changed differently by both the index and the working
directory are now shown with background colors which span the entire line,
making these lines easier to pick out of the diff. In general these are
the lines that appear to be more interesting to me when looking at the
3-way diff as they are the ones which contain recent and quite different
changes.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 06:23:06 +0000 (01:23 -0500)]
git-gui: Updated TODO list now that a task is complete.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 06:20:42 +0000 (01:20 -0500)]
git-gui: Correct toggling of added/untracked status for new files.
New files also lack index data from diff-files therefore we cannot use
their diff-files index data when we update-index. Instead we can use
the fact that Git has them hardcoded as "0 0{40}" and do the same thing
ourselves. This way you can toggle an untracked file into added status
and back out to untracked.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 06:06:42 +0000 (01:06 -0500)]
git-gui: Describe deleted symlinks in a more friendly way.
Currently core-git's diff utilities report a deleted symlink as a
deleted file with a mode of 120000. This is not nearly as user
friendly as one might like, as the user must remember that 120000
is the UNIX mode bits for a symlink. So instead we transform
the not-so-friendly message from core-git into a slightly more
user friendly "deleted symlink" message.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 06:00:48 +0000 (01:00 -0500)]
git-gui: Fix list loading corruption introduced by
1461c5f3.
Tcl let me assign two different types of values to the variable $n.
Prior to
1461c5f3 $n was the total number of bytes in the string;
but in that commit it also became the current info list for the
current file. This caused $c < $n to fail as $n was now treated
as 0 and we only loaded the first file in each buffer.
So use a different variable, like $i, instead.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 05:46:08 +0000 (00:46 -0500)]
git-gui: Correct toggling of deleted file status.
There was a bug with the way we handled deleted file status. A file
really shouldn't be in D_ state when it has been deleted, instead it
is really DD. Therefore we should have toggled _D to DD, not D_,
thereby letting us toggle back to _D.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 05:37:49 +0000 (00:37 -0500)]
git-gui: Make consecutive icon clicks toggle included status of a file.
If the user clicks on the icon associated with a file we now flip to the
inverse status. Partially included files first fully include, then fully
uninclude, as we don't keep track of intermediate partial inclusions.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 05:29:55 +0000 (00:29 -0500)]
git-gui: Teach the gui how to uninclude a file.
Sometimes the user may want to keep their working directory file to be
the same content but they don't want it to be part of the current commit
anymore. In this case we need to undo any changes made to the index
for that file (by reloading the info from HEAD or removing the file
from the index) but leave the working directory alone.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 04:17:41 +0000 (23:17 -0500)]
git-gui: Don't create PkgInfo on Mac OS X "desktop icons".
Turns out that we really don't need the Contents/PkgInfo file on Mac OS
10.4. The Finder will still launch the application properly without one.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 02:33:04 +0000 (21:33 -0500)]
git-gui: Allow adding untracked files in selection.
The previous implementation of do_include_selection did not actually
add files in state _O (untracked, not added) into the repository when
they were in the selection and Commit->Include Selected Files was used.
This was due to the file state filtering logic being the same as that
of Commit->Include All Files, which only considers existing files.
Also fixed a minor issue with rejected attempts to amend an initial
commit.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 02:13:16 +0000 (21:13 -0500)]
git-gui: Rephrase rescan before commit informational message.
Its not an error that a rescan is required before commit; its just
something we do as a safety feature to try and ensure the user knows
what is going into this commit. So the dialog should use the info
icon (if one is used by the host OS) rather than the error icon.
Its also not "highly likely" that another Git program modified the
repository, its completely the case. There is no reason why the
repository would not match our last scanned state unless another
Git program modified the repository (or someone else did so by hand).
So don't be vague about it, own up to the issue and go on with our
business.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 02:07:05 +0000 (21:07 -0500)]
git-gui: Verify the user has GIT_COMMITTER_IDENT before comitting.
Since git-commit also checks that the user has a GIT_COMMITTER_IDENT
value before it lets the user make a commit we should do the same check
here in git-gui. We cache the result and assume that the user won't
do something which would change the status of GIT_COMMITTER_IDENT while
we are running.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 19 Nov 2006 01:59:49 +0000 (20:59 -0500)]
git-gui: Toggle between new commit and amend commit modes.
I was starting to find it annoying that once you entered the 'Amend Last'
mode there was no way to go back to the 'New Commit' mode without quitting
and restarting git-gui. Its just confusing for the end-user.
Now we can flip back and forth between a new commit and an amend commit
through a pair of radio buttons on the header of the commit buffer area
and through a pair of radio menu buttons in the Commit menu.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 18 Nov 2006 08:41:54 +0000 (03:41 -0500)]
git-gui: Remove completed items from TODO list.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 18 Nov 2006 08:31:25 +0000 (03:31 -0500)]
git-gui: Start UI with the index locked.
Because we immediately start a rescan operation, but do so slightly
delayed (by 1 ms, to let the UI show before we start forking off
git processes), we can't let the user try to activate any of the
restricted GUI commands before the 1 ms timer expires and we kick
off the rescan.
So now we lock the index before we enter the Tk event loop, ensuring
that it is impossible for the user to inject a conflicting UI event
before our rescan can begin.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 18 Nov 2006 08:27:23 +0000 (03:27 -0500)]
git-gui: Misc. comment formatting cleanups.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 18 Nov 2006 08:24:20 +0000 (03:24 -0500)]
git-gui: Add menu option to include only selected files.
When the user selects a number of files they would typically expect
to be able to act on that selection, such as by including those files
into the next commit.
So we now have a menu option under the Commit menu that lets the user
include only the selection, rather than everything. If there is no
selection but there is a file in the diff viewer than we consider that
to be the selection (a selection of 1). Unfortunately we don't disable
this option yet when there's nothing selected to include, but this is
probably not a big deal as there are very few situations where there
are no selected files.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 18 Nov 2006 08:08:51 +0000 (03:08 -0500)]
git-gui: Refactor file state representations.
It just felt wrong to me that I was using _ as part of the mode argument
to display_file to mean "don't care/use existing" and * as part of
the mode argument to mean "force to _".
So instead use ? to mean "don't care/use existing" and _ to mean
"force to _". The code is a lot clearer this way and hopefully it
won't drive another developer insane, as it did me.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 18 Nov 2006 08:03:16 +0000 (03:03 -0500)]
git-gui: Only reshow diff when really necessary.
I noticed that we were reshowing the current diff during a commit;
this occurs because we feed every added and modified file through
update-index just before commit. During the update-index process
we reshow the current diff if the current file in the diff pane
was one of those added or modified files we reprocessed. This
just slows down the UI more than is necessary.
So refactoring update_index so that we don't call reshow_diff
from within that code; instead we do it at a higher level.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 18 Nov 2006 07:50:58 +0000 (02:50 -0500)]
git-gui: Make initial commits work properly.
Apparently I never really tested the logic for making or amending an
initial commit, so although most of the code was here in git-gui it
didn't quite work as it was intended to.
So this is all just bug fixes to make initial commits correctly
generate the list of files going into the initial commit, or to
show a newly added file's diff, and to amend an initial commit.
Because we really want to diff the index against a tree-ish and
there is no such tree-ish on an initial commit we create an empty
tree through git-mktree and diff against that. This unfortunately
creates a dangling tree, which may confuse a new user who uses
git-gui to make a new commit and then immediately afterwards runs
git fsck-objects to see if their object database is corrupt or not.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 18 Nov 2006 06:20:37 +0000 (01:20 -0500)]
git-gui: Display error dialog on Mac OS X when no .git found.
If we can't locate a .git directory for the given directory we need to
show a message to the user to let them know the directory wasn't found.
But since this is before we have shown our main application window we
cannot use that as the parent for the error popup; on Mac OS X this
causes an error and prevents the dialog from showing.
Instead only add -parent . to the popup call if we have mapped (shown)
the main window.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 18 Nov 2006 05:31:00 +0000 (00:31 -0500)]
git-gui: Create a .app file on MacOS X if requested.
If a user works with a repository frequently they may want to just
create an icon they can use to launch git-gui against that repository.
Since we already support this concept on Windows we can do the same on
Mac OS X by creating a .app file with a tiny shell script in it that
sets up the necessary environment then invokes our script.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Thu, 16 Nov 2006 04:52:20 +0000 (23:52 -0500)]
git-gui: Only populate a fetch or push if we have an action.
Don't offer to fetch from a remote unless we have at least one Pull:
line in its .git/remotes/<name> file or at least one configuration
value for remote.<name>.fetch. Ditto for push.
Users shouldn't be fetching or pushing branch groups unless they
have them configured; anything else is just crazy.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Thu, 16 Nov 2006 03:53:53 +0000 (22:53 -0500)]
git-gui: Handle ' within paths when creating Windows shortcuts.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Thu, 16 Nov 2006 03:45:33 +0000 (22:45 -0500)]
git-gui: Protect ourselves from funny GIT_DIR/working directory setups.
Since we have some serious problems with the GIT_DIR environment variable
on Windows we cannot let the user use a non-standard GIT_DIR with their
working directory.
So require that the GIT_DIR name is actually ".git", that it exists,
and that its parent directory is our working directory.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Thu, 16 Nov 2006 03:35:26 +0000 (22:35 -0500)]
git-gui: Create Windows shortcut icons for git-gui.
If we are running on Windows we now offer a 'Create Desktop Icon' menu
item under the Project menu. This pops up a save dialog box letting
the user create a .bat file on their desktop (or somewhere else). The
.bat script will startup Cygwin with a login shell then launch git-gui
in the current working directory.
This is very useful for Windows users who have little to no desire to
start a command window just to run a git-gui session.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Thu, 16 Nov 2006 03:13:45 +0000 (22:13 -0500)]
git-gui: Correctly handle GIT_DIR environment variable.
Some users may want to start us by running "git --git-dir=... gui"
rather than trying to cd into the directory first. This is especially
true if they want to just make a shortcut to our executable on Windows
and always have that associated with a certain repository.
Since Tcl on Windows throws away our environment and doesn't pass it
down to the child process correctly we cannot call git-rev-parse to
get the GIT_DIR environment variable. So instead we ask for it
specifically ourselves; if its not defined then we ask rev-parse.
This should actually reduce startup by 1 fork/exec if we were started
as "git gui" as GIT_DIR will be set for us.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Thu, 16 Nov 2006 01:04:17 +0000 (20:04 -0500)]
git-gui: Created makefile to install the program.
Since we want to be installed in gitexecdir so that "git gui" works we
can guess where that directory is by asking the git wrapper executable
and locating ourselves at the same location using the same install
rules as core git.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Wed, 15 Nov 2006 23:55:05 +0000 (18:55 -0500)]
git-gui: Disable diff actions when no diff is active.
There is no reason why the user should be able to operate on the diff
buffer if there is no currently selected diff; likewise the "File:"
label text appears rather silly looking all by itself when no diff
is being shown in the diff buffer.
So now we only enable widgets (like menu items) if there is a diff
currently showing, and we disable them when a diff isn't showing.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Wed, 15 Nov 2006 23:06:29 +0000 (18:06 -0500)]
git-gui: Automatically update-index all included files before commit.
If the user has "Allow Partially Included Files" disabled (and most
probably will as its the default setting) we should run update-index
on every included file before commit to make sure that any changes
made by the user since the last rescan will still be part of this
commit.
If we don't update-index every modified file the user will likely
become confused when part of their changes were committed and other
parts weren't; and those other parts won't show up until a later
rescan occurs. Since we don't rescan immediately after a commit
this may be a while.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 14 Nov 2006 06:42:32 +0000 (01:42 -0500)]
git-gui: Allow update_index to also run a script when it completes.
Like rescan we also have cases where we need to perform a script
after we have finished updating a number of files in the index. By
changing the parameter structure of update_index we can easily pass
through any script we need to run afterwards, such as picking up
in the middle of a commit, or finishing what is left of a rescan.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 14 Nov 2006 06:29:32 +0000 (01:29 -0500)]
git-gui: Provide an after-rescan script to rescan.
There are some situations where we need to run rescan and have it do
more than just updating the status in the UI when its complete. To
help with that this changes the rescan procedure to take a script which
it will run at the global level as soon as the rescan is done and the
UI has finished updating with the results. This is useful for example
if we performed a rescan as part of a commit operation; we can go back
to the commit where we left off when the rescan got initiated.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 14 Nov 2006 06:19:03 +0000 (01:19 -0500)]
git-gui: Refactor update_status -> rescan.
Since we refer to the act of updating our memory structures with index
and working directory differences as a rescan in the UI its probably
a good idea to make the related procedures have the same name.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 21:06:38 +0000 (16:06 -0500)]
git-gui: Implemented multiple selection in file lists.
Because I want to let users apply actions to more than one file at
a time we really needed a concept of "the current selection" from
the two file lists.
Since I'm abusing a Tk text widget for the file displays I can't
really use the Tk selection to track which files are picked and
which aren't. So instead we keep this in an array to tell us
which paths are currently selected and we use an inverse fg/bg
for the selected file display. This is common most operating
systems as a selection indicator.
The selection works like most users would expect; single click will
clear the selection and pick only that file, M1-click (aka Ctrl-click
or Cmd-click) will toggle the one file in/out of the selection, and
Shift-click will select the range between the last clicked file and
the currently clicked file.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 19:37:41 +0000 (14:37 -0500)]
git-gui: Narrow the no differences information message.
On Mac OS X the no differences informational message was linewrapped
at the wrong points due to the limited width of the system dialog,
yet the LFs embedded in the message (where I linewrapped it manually)
were also being honored. This resulted in a very difficult to read
paragraph of text.
So this narrows the text down by another 10 columns or so, making it
more readable.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 19:25:53 +0000 (14:25 -0500)]
git-gui: Refactor mouse clicking on file names/icons.
I'm not a huge fan of putting the left and right mouse actions into
the same procedure. Originally this is how Paul had implemented the
logic in gitool and I had carried some of that over into git-gui, but
now that I'm getting ready to implement right mouse click features to
act on files I really should split this apart.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 09:22:42 +0000 (04:22 -0500)]
git-gui: By default don't allow partially included files.
The concept of the Git index is confusing for many users, especially
those who are newer to Git.
Since git-gui is (at least partially) intended to be used by newer
users who don't need the complexity of the index to be put in front
of them early on, we should hide it by making any partially included
file fully included as soon as we identify it. To do this we just
run a quick update_index pass on any file which differs both in the
index and the working directory, as these files have already been
at least partially included by the user.
A new option has been added in the options dialog (gui.partialinclude)
which lets the user enable accessing the index from git-gui. This
just disables the automatic update_index pass on partially included
files.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 05:48:44 +0000 (00:48 -0500)]
git-gui: Reverted file name text field to a label.
So although a text field with a flat relief looks like a label on
Windows it doesn't on Mac OS X. The Aqua version of Tk is still
drawing a border around the text field and that makes the diff pane
header look pretty ugly.
Earlier I had made the file name area into a text widget so the user
could highlight parts of it and copy them onto the clipboard; but with
the context menu being present this isn't quite as necessary as the user
can copy the file name to the clipboard using that instead. So although
this is a small loss in functionality for non-Mac OS X systems I think it
is still reasonable.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 03:41:34 +0000 (22:41 -0500)]
git-gui: Minor UI layout improvements for console windows.
Moved the Close button over to the lower right corner where our
Cancel/Save buttons are in the options dialog. This should fit
better with our own look and feel as well as that of most apps
on Mac OS X and Windows.
Also set the lower status bar in a console window to indicate the
process is working and that the user should wait for it to finish.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 03:06:37 +0000 (22:06 -0500)]
git-gui: Display status on left in diff header.
Because the Tk pack layout manager gives all space to the right/bottom
most widget during expand/contract of the frame we were adding and
removing all space from the status area of the bar and not from the
file name, which is what we actually wanted.
A simple enough fix is to just put the status of the given file on
the left side of the diff viewer header rather than on the right.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 02:49:49 +0000 (21:49 -0500)]
git-gui: Correct language for M_/A_ status codes.
When I changed from 'check in' to 'include' I missed the human friendly
status displayed in the right side of the diff viewer heading. It was
still reporting 'Checked in' for a fully included file, which is not
what we wanted it to say.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 02:11:12 +0000 (21:11 -0500)]
git-gui: Allow the user to copy name of the file in the diff viewer.
There's a lot of reasons why the user might need to obtain the
complete (or just part of) path of a file which they are currently
viewing in the diff viewer pane. So now we allow selection on this
widget by using a text widget instead of a label. We also offer a
context menu which has actions for copying the selection or the entire
value onto the clipboard.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 00:33:33 +0000 (19:33 -0500)]
git-gui: Use a smaller pipe buffer for update-index.
When we shove a large number of files at update-index and they have
very short path names we are likely going to fit a large number of
them into the pipe buffer very early; thereby seeing a huge progress
update followed by lots of waiting between progress updates due to
the latency of update-index.
Using a smaller buffer should help smooth out the progress updates
as we are better able to keep tabs on the update-index process'
progress through our list of paths.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 00:29:04 +0000 (19:29 -0500)]
git-gui: Sort the list of paths being updated in the index.
Its a little surprising to see the UI update the icons for files
in random order, due to the fact that the files are updating in
the order they appear within the array (which is based on a hash
function and not order). So sort the list of files before we send
any to update-index so the order of operation is means something to
the user.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Mon, 13 Nov 2006 00:20:02 +0000 (19:20 -0500)]
git-gui: Allow the user to control the number of context lines in a diff.
When displaying a diff the Git default of 3 line of context may not be
enough for a user to see what has actually changed. Consequently we
set our own program default to 5 lines of context and then allow the
user to adjust this on a per-repository and global level through our
options dialog.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 23:51:38 +0000 (18:51 -0500)]
git-gui: Cleanup diff construction code to prepare for more options.
I'd like to allow the user to have more control over how we format
the diff in the diff viewer; to that end we need to add additional
options to the diff-index command line as we construct the command
for execution.
So cleanup the command handling code now to use lappend so we can
come back and add in our additional options.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 23:22:59 +0000 (18:22 -0500)]
git-gui: Reshow diff if we sent the file to update-index.
We can't ask the diff viewer to recompute the diff until after our
update-index child process terminates, as the diff programs need to
be able to read the updated index in order to generate the correct
diff. This is actually why we prevent diffs from being generated
while there is an update lock on the index, which is why we ignored
our own show_diff invocation in the middle of the write_update_index
event handler.
So now we mark a flag if we identify that the file currently in the
diff viewer was also sent to update-index; then later when the
update-index process has terminated we update the diff viewer if
the flag is true.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 23:16:45 +0000 (18:16 -0500)]
git-gui: Always use eq/ne for string comparsions.
This is one of those stupid Tcl mistakes that an experienced Tcl
programmer just wouldn't make. We should always use eq and ne to
compare string values (and never == or !=) as when we use ==/!=
Tcl will attempt to convert either side to numeric if one of the
two sides looks like a numeric. This could cause some trouble if
a file named "1" exists and a different file named "1.0" also exists;
their paths are equal according to == but not according to eq.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 23:08:10 +0000 (18:08 -0500)]
git-gui: Added post-commit invocation after the commit is done.
Since git-commit.sh invokes hooks/post-commit after running git rerere
we should do the same if its available and executable.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 23:03:19 +0000 (18:03 -0500)]
git-gui: Remove the commit_active global variable.
We were originally trying to use $commit_active to tell us if there was
a commit currently in progress, just so we didn't attempt to start a
second (parallel) one by mistake. But really the index lock handles
this for us as it won't let us lock the index if it is already locked
for update. So this can't happen.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 22:58:08 +0000 (17:58 -0500)]
git-gui: Run the pre-commit hook in the background.
I started to notice on Windows that commits took a lot longer to get
going than on my Mac OS X system. The real reason is the repositories
that I'm testing with on Windows all enabled the standard pre-commit hook
while my test repository on Mac OS X doesn't have it executable (so its
not running). So the Windows repositories are spending this
lag time running that hook.
Now we run the pre-commit hook in the background, allowing the UI to
update and tell the user we are busy doing things.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 21:53:19 +0000 (16:53 -0500)]
git-gui: Allow the user to disable diff stat summary during pull.
Because the pull diffstat summary can take as long as the pull itself
some users may just choose to disable the summary and save themselves
an extra few seconds during each pull. This is especially true if the
user really doesn't care about the other files being modified, as due
to their project organizational structure they aren't really responsible
for their content.
This adds an option to the options panel which lets the user disable
the diffstat summary (and thus we pass --no-summary to git-pull) but
there does appear to be a bug in the config saving code where we did
not set the local repo config differently from the global config.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 21:24:52 +0000 (16:24 -0500)]
git-gui: Don't load the global options unless necessary.
Since git-repo-config will supply us a union of both the global and
the local repository configuration data when we invoke it during startup
there is no reason to go get the global configuration with an extra call
to repo-config unless the user is trying to view & edit all options in
the options dialog.
Since skipping this extra repo-config invocation save us a little bit of
time its nice to be able to avoid it when we are invoked as git-citool
and won't be running very long.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 21:20:36 +0000 (16:20 -0500)]
git-gui: Hide non-commit related commands when invoked as git-citool.
If the user is invoking us as git-citool then they want to perform a
single commit and exit quickly. Since we are about to be a very short
lived process we should do what we can to avoid spending CPU time setting
up menus which the user will never use, like the fetch/push/pull menus.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 20:45:35 +0000 (15:45 -0500)]
git-gui: Correct bugs in font config handling.
Apparently Tcl is being helpful on Windows during exec and is throwing a
\ in front of every { it finds in the string. I'm guessing they think
the value might be read by another Tcl program? Anyway, Git faithfully
stores the \{ sequence and sends it back that way to Tcl, at which point
Tcl parses the list wrong and starts to break it in the middle of any
element which contains spaces. Therefore a list such as:
-family {Times New Roman}
gets broken up into the pairs:
{-family \{Times}
{New Roman}
which is very incorrect. So now we replace all { and } with "", at which
point Tcl doesn't throw \ in front of the " on the way out to Git yet it
reads it correctly as a list on the way back in.
I also found and fixed a bug in the way we restored the fonts when the
user presses Restore Defaults in the options dialog.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 20:04:15 +0000 (15:04 -0500)]
git-gui: Use 'after 1' to post UI rather than tkwait.
The tkwait visibility command and Windows doesn't seem to realize
the window is visible, consequently we are never finishing our
initialization by calling update_status.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 11:53:56 +0000 (06:53 -0500)]
git-gui: Added Options... menu item to end of diff context menu.
Since the font name can only be chosen from within the options dialog
giving the user fast access to this dialog from within a context menu
that already talks about increasing and decreasing the font size may
help users to locate the font name setting as well.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 11:46:26 +0000 (06:46 -0500)]
git-gui: Minor options dialog UI cleanups.
Display the name of "this" repository rather than the quite ambiguous
string "This". The idea is that seeing the name of the directory the
repository is stored in should help jog the user's memory about what
they are setting options for.
Also place the options dialog immediately over the git-gui main window
when it gets opened. This way the user isn't scrolling very far away
to gain access to the window. At least on my Mac OS X system not doing
this makes the options dialog open rather far away, thus requiring lots
of mouse activity to reach it.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 11:35:14 +0000 (06:35 -0500)]
git-gui: Supply progress feedback when running update-index.
The git-update-index process can take a while to process a large
number of files; for example my laptop would probably need almost
an hour to chug through 20,000 modified files. In these incredibly
large cases the user should be given at least some feedback to let
them know the application is still working on their behalf, even if
it won't them do anything else (as the index is locked).
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 10:27:00 +0000 (05:27 -0500)]
git-gui: Allow the user to manipulate the fonts from the options panel.
This turned out to take a lot more time than I thought it would take;
but now users can edit the main UI font and the diff/fixed with font
by changing both the family name and/or the point size of the text.
We save the complete Tk font specification to the user's ~/.gitconfig
file upon saving options. This is probably more verbose than it needs
to be as there are many useless options recorded (e.g. -overstrike 0)
that a user won't really want to use in this application.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 08:47:00 +0000 (03:47 -0500)]
git-gui: Refactor options menu into an options dialog.
I decided that the options menu was going to turn into a mess after
a while as I start to add additional features to git-gui. The better
approach would be to create a dialog that lets the user edit the options,
including their --global options.
We also wisely let the user press Cancel (or destroy the window) to abort
any sort of option editing session, without the options being changed.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 07:30:02 +0000 (02:30 -0500)]
git-gui: Use arrow cursor rather than left_ptr.
Arrow is available on all Tk platforms and is mapped to the native
system cursor on Windows and Mac OS X. Consequently its the better
cursor choice as it should match whatever the system has configured
for the standard pointing thingy.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 07:27:28 +0000 (02:27 -0500)]
git-gui: Rename quitting global to is_quitting.
This is a boolean value; naming it as such is a good thing.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 07:22:21 +0000 (02:22 -0500)]
git-gui: Improve right click context menu binding on all platforms.
Apparently <Button-3> doesn't work on my single button PowerBook
mouse under Mac OS X. I'm guessing this is because Tk is stealing
every event and doesn't realize that Control-Button-1 is actually
supposed to invoke the context menu on this platform.
So now we have a utility procedure is_MacOSX to guess if we are
running on a Mac OS X system, and if so setup Control-Button-1 to
also activate what Button-3 should have. This does mean that I need
to stay away from using Control-Button-1 as a binding in any other
context. Of course we should use $M1B for that, which is M1 (aka
Command) on Mac OS X so that shouldn't prove to be a problem.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 05:40:38 +0000 (00:40 -0500)]
git-gui: Make use of the Tk font system rather than faking it.
The native Tk font system is actually quite powerful and has the nice
property that modifications to a named font are immediately reflected
throughout all widgets currently displayed. This really saves us
from needing to write all of the reconfigure code as part of our font
display.
I also fixed the way we detect and apply the system font on the main
UI widgets as although it worked on a Windows 2000 system it does not
work at all on my Mac OS 10.4 system.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 02:52:06 +0000 (21:52 -0500)]
git-gui: Refresh a file if it has an empty diff.
When the user has enabled the Trust File Modification Timestamp option
then we may display a file as being modified yet that file may not have
a difference. When the user clicks on that file we wind up displaying
an empty diff viewer, which makes no sense to the user.
So instead if we get an empty diff and the user has this option enabled
and the file's current state is _M (no change in index but the working
file appears modified) then run a quick update-index on just that file
and remove it from the list of modified files. We also give the user
a quick dialog stating we are removing it, and why.
Usually I don't run into this situation when I have the Trust File
Modification Timestamp option enabled, so its not that annoying to
have a dialog pop open to remind me why there are no differences.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 02:14:28 +0000 (21:14 -0500)]
git-gui: Allow the user to change the diff viewer font size.
Because the diff area is one of the most important areas to be able to
read users should be able to increase or decrease the size of the font
used within that area.
Currently we save that back to the global configuration, even if it
may have originated from the local repository configuration. This
is probably going to be considered to be a bug by at least one user
who wants some sort of different font within a given repository, but
I'm just going to ignore the problem for now.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 02:02:37 +0000 (21:02 -0500)]
git-gui: Honor system font and let user configure fonts.
Rather than hardcoding our fonts to something that I thought was
reasonable, guess font_ui off the font used by the system in the
menu bar. This way the application conforms by default to whatever
the user's desktop is setup to.
We also now let the user supply font configuration through their
repository configuration as gui.fontui (the overall UI font) and
gui.fontdiff (the font used for the diff viewer).
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 01:45:52 +0000 (20:45 -0500)]
git-gui: Corrected font used for options menu items.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 01:44:03 +0000 (20:44 -0500)]
git-gui: Teach sign off to be more intelligent.
When we sign off on a commit we want to add a blank line between
whatever is in the commit buffer and the new Signed-off-by line,
unless there already is a Signed-off-by (or Acked-by) tag at the end
of the buffer already. This change makes us do the right thing more
often.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 01:33:30 +0000 (20:33 -0500)]
git-gui: Fix mouse cursor behavior when in widgets.
The mouse cursor (at least on Windows) seemed to be picking up the
cursor from the sash controls and then never resetting itself back
to the standard text cursor (the I-beam) when it was over a text area
that the user can edit (like the commit buffer) or over a text area
the user can copy from (like the diff viewer).
So now we always set the cursor to left_ptr (which according to the Tk
documentation should be available everywhere) and only for the two text
areas which we use to list file names, as the user clicks in these but
is not permitted to select text.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 01:24:23 +0000 (20:24 -0500)]
git-gui: Added context menus for consoles and commit message buffer.
This change adds a context menu to the commit message buffer providing
fast access to the contents of the Edit menu, and to the console text
buffer, providing easy ways to copy selections of the buffer or the
entire buffer.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 01:00:35 +0000 (20:00 -0500)]
git-gui: Misc. bug fixes for mouse click crashes.
Make sure the file_lists array has both elements set at all times,
otherwise we get Tcl errors during mouse clicks in the file list
areas due to the list not being defined.
Also added M1-A as a keyboard binding within the console window
text area. This lets users select all text easily and copy it
to the clipboard.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 00:40:33 +0000 (19:40 -0500)]
git-gui: Misc. formatting cleanups.
A number of lines were line wrapping in a rather ugly way when opened
in vim with line numbers enabled, so I split most of these lines over
two lines using a sensible wrapping policy.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 00:32:24 +0000 (19:32 -0500)]
git-gui: Simplified format of geometry configuration.
The gui.geometry config value was starting to contain
the odd string \\{ as part of its value due to the
way the Tcl lists were being supplied to git repo-config.
Now we write out only three values: the overall window
geomtry, the y position of the horizontal sash, and
the x position of the vertical sash. All other data is
skipped, which makes the gui.geometry value simpler.
While debugging this I noticed that the save_my_config
procedure was being invoked multiple times during exit
due to do_quit getting invoked over and over again. So
now we set a flag in do_quit and don't perform any of our
"at exit" type of logic if we've already been through the
do_quit procedure once.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 00:10:10 +0000 (19:10 -0500)]
git-gui: Cleaned up error message formatting.
Added an extra blank line between the first line of each error message
and the rest of the message, as usually the rest of the message is
coming from Tcl or is the stderr output of a git command we tried to
invoke. This makes it easier to read the output (if any).
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 12 Nov 2006 00:03:06 +0000 (19:03 -0500)]
git-gui: Use native tk_messageBox for errors.
Rather than drawing our own toplevel for error messages we really
should just use the the native tk_messageBox command to display
any error messages.
Major benefits for doing so are:
- automatically centers over main window;
- less code required on our part in git-gui;
- includes a nifty error icon on most systems;
- better fits the look-and-feel of the operating system.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 11 Nov 2006 23:46:52 +0000 (18:46 -0500)]
git-gui: Rename difffont/mainfont variables.
I found difffont to be a very awkward varible name, due to the use
of three f's in a row. So use easier to read variable names.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 11 Nov 2006 23:42:42 +0000 (18:42 -0500)]
git-gui: Use catch rather than array names to check file.
When we reshow the current diff file it can be faster to just fetch
the value from the file_states array than it is to ask for all paths
whose name exactly matches the one we want to show. This is because
[array names -exact] is O(n) in the number of files.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 11 Nov 2006 23:38:00 +0000 (18:38 -0500)]
git-gui: Efficiently update the UI after committing.
When we commit we know that whatever was in the index went as part
of the commit. Since we generally assume that the user does not
update the index except through our user interface we can be reasonably
certain that any file which was marked as A/M/D in the index will have
had that A/M/D state changed to an _ (not different) by the commit.
We can use this knowledge to update the user interface post commit
by simply updating the index part of the file state of all files whose
index state was A/M/D to _ and then removing any file memory any which
wound up with a final state of __ (not different anywhere). Finally we
redraw the file lists and update the diff view.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 11 Nov 2006 22:59:34 +0000 (17:59 -0500)]
git-gui: Correctly handle files containing LF in their name.
If we are given a file whose path name contains an LF (\n) we now
escape it by inserting the common escape string \n instead of the
LF character whenever we display the name in the UI. This way the
text fields don't start to span multiple lines just to display one
file, and it keeps the line numbers correct within the file lists.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 11 Nov 2006 22:52:16 +0000 (17:52 -0500)]
git-gui: Always indicate the file in the diff viewer.
When we did a rescan to update the file lists we lost the tag which
indicated which file was currently in the diff viewer. This occurs
because we delete every line from the two file list boxes (thus
removing the tag) and then redisplay the diff in the diff viewer
but then fail to restore the tag in the file list.
Now we restore that tag by searching for the file in the file lists
and adding the tag back when the diff viewer displays something.
We also no longer obtain the file path directly from the file list
text box. Instead we now keep two Tcl lists, one for each file list,
holding the file names in sorted order. These lists can be searched
with the native [lsearch -sorted] operation (which should be faster
than our crude bsearch) or can be quickly accessed by index to return
the file path. This should help make things safer should we ever be
given a file name which contains an LF within it (as that would span
two lines in the file list, not one).
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 11 Nov 2006 22:46:04 +0000 (17:46 -0500)]
git-gui: Updated TODO list now that geometry is stored.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 11 Nov 2006 21:16:25 +0000 (16:16 -0500)]
git-gui: Clear undo/redo stack when loading a message file from disk.
If we load a message file (e.g. MERGE_MSG) or we have just finished
making a commit and are clearing out the commit buffer we should also
clear out the undo/redo stack associated with that buffer. The prior
undo/redo stack has no associated with the new content and therefore
is not useful to the user.
Also modified the sign-off operation to perform the entire update in
a single undo/redo operation, allowing the user to undo the signoff
in case they didn't actually want to do that.
I also noticed what may be a crash on Windows related to the up and
down arrow keys navigating within the diff viewer. Since I got back
no stack trace (just an application exit with a loss of the commit
message) I suspect that the binding to scroll the text widget crashed
with an error and the wish process just terminated. So now we catch
(and ignore) any sort of error related to the arrow keys in the diff
viewer.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 11 Nov 2006 20:51:41 +0000 (15:51 -0500)]
git-gui: Created edit menu and basic editing bindings.
Users have come to expect basic editing features within their
applications, such as cut/copy/paste/undo/redo/select-all. I
found these features to be lacking in git-gui so now we have
them.
I also added basic keyboard bindings for the diff viewing area
so that the arrow keys move around single units (lines or columns)
and the M1-X/C keys will copy the selected text and the M1-A key
will select the entire diff.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 11 Nov 2006 20:16:01 +0000 (15:16 -0500)]
git-gui: Change accelerator for "Include All" to M1-I.
Now that we call the update-index all files action "Include All" it
makes more sense to make this M1-I (so Control-I or Command-I depending
on platform) than M1-U, which stood for update but is somewhat confusing
to users.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>