1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-13 20:53:02 +01:00
Commit graph

208 commits

Author SHA1 Message Date
Shawn O. Pearce
bd1e2b4028 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>
2006-11-07 03:05:17 -05:00
Shawn O. Pearce
e57ca85e11 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>
2006-11-07 03:05:17 -05:00
Shawn O. Pearce
ec6b424abb 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>
2006-11-07 03:05:17 -05:00
Shawn O. Pearce
6e27d826c8 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>
2006-11-07 03:05:16 -05:00
Shawn O. Pearce
e210e67451 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>
2006-11-07 03:05:16 -05:00
Shawn O. Pearce
6f6eed286f git-gui: Fixed UI layout problems on Windows.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-07 03:05:16 -05:00
Shawn O. Pearce
131f503b72 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>
2006-11-06 16:08:26 -05:00
Shawn O. Pearce
cb07fc2a29 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>
2006-11-06 14:20:27 -05:00