git.git
18 years agogit-gui: Updated TODO list now that pull is starting to work.
Shawn O. Pearce [Tue, 7 Nov 2006 10:06:40 +0000 (05:06 -0500)]
git-gui: Updated TODO list now that pull is starting to work.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Added support for pulling from default branch of a remote.
Shawn O. Pearce [Tue, 7 Nov 2006 10:02:15 +0000 (05:02 -0500)]
git-gui: Added support for pulling from default branch of a remote.

We now create one menu entry per remote listing the first Pull: or fetch
entry associated with that remote as the branch to pull into the current
branch.

This is actually quite incorrect as we should be using the default
remote branch name listed in branch.<name>.merge for a new-style remote
described in the config file.  But its a good default to get started with.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Cache all repo-config data in an array.
Shawn O. Pearce [Tue, 7 Nov 2006 09:26:02 +0000 (04:26 -0500)]
git-gui: Cache all repo-config data in an array.

We're likely going to need key/value pairs from the repo-config beyond
just remote.*.url, so cache them all up front into a Tcl array where we
have fast access to them without needing to refork a repo-config --list
process.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Automatically reopen any console closed by the user.
Shawn O. Pearce [Tue, 7 Nov 2006 09:19:49 +0000 (04:19 -0500)]
git-gui: Automatically reopen any console closed by the user.

If the user closes a console and we get more ouptut for it then we
will get a Tcl error in the readable event handle for the file channel.
Since this loses the actual output and is quite unfriendly to the end
user instead reopen any console which the user closed prior to the
additional output arriving.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Last minute idea about fetch shortcuts.
Shawn O. Pearce [Tue, 7 Nov 2006 08:30:26 +0000 (03:30 -0500)]
git-gui: Last minute idea about fetch shortcuts.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Added current TODO list.
Shawn O. Pearce [Tue, 7 Nov 2006 08:18:34 +0000 (03:18 -0500)]
git-gui: Added current TODO list.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Don't complain if no .git/remotes exist.
Shawn O. Pearce [Tue, 7 Nov 2006 08:00:20 +0000 (03:00 -0500)]
git-gui: Don't complain if no .git/remotes exist.

The user might be using the new style config syntax remote.name.url
rather than the older standalone remote file.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Check for fetch or push command failure and denote it.
Shawn O. Pearce [Tue, 7 Nov 2006 07:57:46 +0000 (02:57 -0500)]
git-gui: Check for fetch or push command failure and denote it.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Correctly handle CR vs. LF within the console of fetch.
Shawn O. Pearce [Tue, 7 Nov 2006 07:18:18 +0000 (02:18 -0500)]
git-gui: Correctly handle CR vs. LF within the console of fetch.

Because the remote end is likely to send us progress meters by
resetting each line with a CR (and no LF) we should display those
meters by replacing the last line of text with the next line,
just like a normal xterm would do.

This makes the output of fetch look about the same as if we ran it
from within an xterm.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Fix menu item accelerator display on Mac OS X.
Shawn O. Pearce [Tue, 7 Nov 2006 05:53:39 +0000 (00:53 -0500)]
git-gui: Fix menu item accelerator display on Mac OS X.

Apparently accelerators really only work correctly for function keys
(F1-F12) and "Cmd-q".  Apparently wish on Mac OS X reports itself
as unix and the OS is Darwin, this makes it a little difficult to
be sure we are running under Aqua.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Reorganized startup procedure to ensure gitdir is right.
Shawn O. Pearce [Tue, 7 Nov 2006 05:20:56 +0000 (00:20 -0500)]
git-gui: Reorganized startup procedure to ensure gitdir is right.

Because we cd after getting the cdup value from Git we can't try
to get the gitdir until after we perform the cd, as usually the
gitdir is relative to the current working directory.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Worked around environment variable problems on Windows.
Shawn O. Pearce [Tue, 7 Nov 2006 04:47:05 +0000 (23:47 -0500)]
git-gui: Worked around environment variable problems on Windows.

Apparently the Cygwin tclsh/wish executables don't pass the environment
that they inherited onto any children that they invoke.  This causes a
problem for some users during 'git fetch' or 'git push' as critical
environment variables like GIT_SSH and SSH_AUTH_SOCK aren't available
to the git processes.

So we work around this by forcing sh to start a login shell, thus
reloading the user's environment, then cd to the current directory,
and finally start the requested process.  Of course this won't
correctly handle any transient environment variables that were
inherited but were not supplied by the user's login shell.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Started construction of fetch and push operations.
Shawn O. Pearce [Tue, 7 Nov 2006 04:13:23 +0000 (23:13 -0500)]
git-gui: Started construction of fetch and push operations.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Misc. nit type of bug fixes.
Shawn O. Pearce [Tue, 7 Nov 2006 03:03:05 +0000 (22:03 -0500)]
git-gui: Misc. nit type of bug fixes.

 * Make sure we are in the top level working directory.  This
   way we can access files using their repository path.

 * Reload the diff viewer if the current file's status has changed;
   as the diff may now be different.

 * Correctly handle the 'AD' file state: added but now gone from
   the working directory.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Implemented amended commits.
Shawn O. Pearce [Tue, 7 Nov 2006 02:34:10 +0000 (21:34 -0500)]
git-gui: Implemented amended commits.

Also fixed a bug related that caused a crash if the file currently
in the diff viewer is no longer modified after the commit.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Finished commit implementation.
Shawn O. Pearce [Tue, 7 Nov 2006 01:50:59 +0000 (20:50 -0500)]
git-gui: Finished commit implementation.

We can now commit any type of commit (initial, normal or merge) using
the same techniques as git-commit.sh does for these types of things.

If invoked as git-citool we run exit immediately after the commit was
finished.  If invoked as git-gui then we stay running.

Also fixed a bug which caused the commit message buffer to be lost
when the application shutdown and restarted.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Verify we should actually perform a commit when asked to do so.
Shawn O. Pearce [Tue, 7 Nov 2006 01:03:36 +0000 (20:03 -0500)]
git-gui: Verify we should actually perform a commit when asked to do so.

A user shouldn't perform a commit if any of the following are true:

 * The repository state has changed since the last rescan.
 * There are no files updated in the index to commit.
 * There are unmerged stages still in the index.
 * The commit message has not been provided.
 * The pre-commit hook is executable and declined.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Corrected keyboard bindings on Windows, improved state management.
Shawn O. Pearce [Tue, 7 Nov 2006 00:12:58 +0000 (19:12 -0500)]
git-gui: Corrected keyboard bindings on Windows, improved state management.

When we are refreshing from the index or updating the index we shouldn't
let the user cause other index based operations to occur as these would
likely conflict with the currently running operations possibly causing
some index changes to be lost.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Fixed UI layout problems on Windows.
Shawn O. Pearce [Mon, 6 Nov 2006 23:22:19 +0000 (18:22 -0500)]
git-gui: Fixed UI layout problems on Windows.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Additional early feature development.
Shawn O. Pearce [Mon, 6 Nov 2006 21:07:32 +0000 (16:07 -0500)]
git-gui: Additional early feature development.

 * Run refresh before diff-index.
 * Load saved commit message during rescan.
 * Save current commit message (if any) during quit.
 * Add Signed-off-by line to commit buffer.
 * Batch update-index invocations through --stdin.
 * Better highlight which file is in the diff viewer.
 * Key bindings for signoff, check-in all and commit.
 * Improved formatting of status table within source.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agogit-gui: Initial revision.
Shawn O. Pearce [Mon, 6 Nov 2006 19:20:27 +0000 (14:20 -0500)]
git-gui: Initial revision.

This is based on Paul Mackerras' gitool prototype which he offered up
to the community earlier in 2006.  Its mostly however a rewrite from
scratch of a Tcl/Tk based graphical interface for Git and the most
common commands users might need to perform.

Currently it can display the status of the current repository, and not
much else.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>