Граф коммитов

165 Коммитов

Автор SHA1 Сообщение Дата
Junio C Hamano 3ed02de2f4 Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui:
  git-gui: Allow 'git gui version' outside of a repository
  git-gui: Revert "git-gui: Display all authors of git-gui."
  git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
  git-gui: Allow committing empty merges
2007-03-12 11:43:22 -07:00
Junio C Hamano eec102524f Merge branch 'master' of git://repo.or.cz/git-gui into maint
* 'master' of git://repo.or.cz/git-gui:
  git-gui: Make 'make' quieter by default
  git-gui: Remove unnecessary /dev/null redirection.
  git-gui: Don't create empty (same tree as parent) commits.
  git-gui: Add Reset to the Branch menu.
  git-gui: Relocate the menu/transport menu code.
2007-03-06 00:39:52 -08:00
Junio C Hamano cef19c7af5 Merge git://repo.or.cz/git-gui into maint
* git://repo.or.cz/git-gui:
  Don't modify CREDITS-FILE if it hasn't changed.
2007-02-24 23:33:12 -08:00
Junio C Hamano 5bac4a6719 Merge branch 'master' of git://repo.or.cz/git-gui into maint
* 'master' of git://repo.or.cz/git-gui:
  git-gui: Don't crash in citool mode on initial commit.
  git-gui: Remove TODO list.
  git-gui: Include browser in our usage message.
  git-gui: Change summary of git-gui.
  git-gui: Display all authors of git-gui.
  git-gui: Use mixed path for docs on Cygwin.
  git-gui: Correct crash when saving options in blame mode.
  git-gui: Expose the browser as a subcommand.
  git-gui: Create new branches from a tag.
  git-gui: Prefer version file over git-describe.
  git-gui: Print version on the console.
  git-gui: More consistently display the application name.
  git-gui: Permit merging tags into the current branch.
  git-gui: Basic version check to ensure git 1.5.0 or later is used.
  git-gui: Refactor 'exec git subcmd' idiom.
2007-02-21 11:09:57 -08:00
Junio C Hamano ea44949605 Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
  git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"
2007-02-13 13:48:52 -08:00
Junio C Hamano 67c7575947 Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
  git-gui: Change base version to 0.6.
  git-gui: Guess our version accurately as a subproject.
  git-gui: Handle gitgui tags in version gen.
  git-gui: Generate a version file on demand.
  git-gui: Rename GIT_VERSION to GITGUI_VERSION.
  git-gui: Allow gitexecdir, INSTALL to be set by the caller.
2007-02-12 16:07:29 -08:00
Junio C Hamano b4d2b04c9b Merge git-gui
This merges git-gui project of Shawn as a subproject of git.git
at git-gui/ subdirectory.

This merge only melds two histories together.  The toplevel Makefile
does not even know about git-gui yet.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-11 23:04:00 -08:00
Shawn O. Pearce 41bdcda373 git-gui: Modified makefile to embed version into git-gui script.
We want to embed the version of git-gui directly into the script file,
so that we can display it properly in the about dialog.  Consequently
I've refactored the Makefile process to act like the one in core git.git
with regards to shell scripts, allowing git-gui to be constructed by a
sed replacement performed on git-gui.sh.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-01-21 02:54:18 -05:00
Shawn O. Pearce c25623321d git-gui: Hide the ugly bash command line from the windows desktop icon.
The user really doesn't need to see the technical details of how we
launch git-gui from within their "desktop icon".  Instead we should hide
the command line from being displayed when the icon launches by putting
@ at the start of the line.  If they really need to see the command we
are running they can edit the batch file.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-01-21 02:54:18 -05:00
Shawn O. Pearce 4d583c86ec git-gui: Change more 'include' language to 'add'.
I just found a whole slew of places where we still were using the term
'include' rather than 'add' to refer to the act of updating the index
with modifications from the working directory.  To be consistent with
all Git documentation and command line tools, these should be 'add'.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-01-21 02:54:17 -05:00
Shawn O. Pearce bdadecbae5 git-gui: Work around odd cygpath bug on Windows.
There appears to be a bug on one of my test systems where cygpath with
the --long-name option is generating a corrupt string that does not
actually refer to sh.exe.  This breaks any desktop icon created by
git-gui as the executable we are trying to invoke does not exist.
Since Cygwin is typically installed as C:\cygwin long path names is
probably not actually necessary to link to the shell.

I also added a small echo to the start of the icon script, as it can
take one of my test systems several seconds to startup git-gui.  This
way the user knows we're starting git-gui, and was politely asked to
wait for the action to complete.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-01-21 02:54:17 -05:00
Shawn O. Pearce 68cbfb1391 git-gui: Correct wording of the revert confirmation dialog.
We no longer describe updating the index as including changes, as we
now use the add notation used by core Git's command line tools.  So
its confusing to be talking about unincluded changes within the revert
dialog.  Instead we should used language like 'unadded changes'.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-01-21 02:54:16 -05:00
Shawn O. Pearce 6b0f3f4629 git-gui: Corrected behavior of deleted (but existing in HEAD) files.
Apparently I did not account for the D_ file state.  This can occur when
a file has been marked for deletion by deleting it from the index, and
the file also does not exist in the working directory.  Typically this
happens when the user deletes the file, hits Rescan, then includes the
missing file in the commit, then hits Rescan again.  We don't find the
file in the working directory but its been removed in the index, so the
state becomes D_.

This state should be identical with DD.  I'm not entirely sure why DD
occurs sometimes and D_ others, it would seem like D_ is the state that
should be happening instead of DD, leading me to believe there is a quirk
in git-gui's state manipulation code.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-01-21 02:54:16 -05:00
Shawn O. Pearce 81c0f29a56 git-gui: Run git-gc rather than git-repack.
Now that git 1.5.0-rc1 and later has a 'git gc' command which performs
all important repository management activites (including reflog pruning,
repacking local objects, unnecessary loose object pruning and rerere cache
expiration) we should run 'gc' when the user wants us to cleanup their
object database for them.

I think the name 'gc' is horrible for a GUI application like git-gui,
so I'm labeling the menu action 'Compress Database' instead.  Hopefully
this will provide some clue to the user about what the action does.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-01-21 02:54:16 -05:00
Shawn O. Pearce 51e7e568c0 git-gui: Show all fetched branches for remote pulls.
Loop through every remote.<name>.fetch entry and add it as a valid
option in the Pull menu.  This way users can pull any remote branch
that they track, without needing to leave the gui.  Its a rather crude
work around for not having a full merge interface.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-01-21 02:54:16 -05:00
Shawn O. Pearce 557afe820b git-gui: Created very crude Tools menu, to support miga.
In one particular case I have a tool called 'miga' which users may need
to invoke on their repository.  This is a homegrown tool which is not
(and should be) part of git-gui, but I still want to be able to run it
from within the gui.

Right now I'm taking a shortcut and adding it to the Tools menu if
we are not on Mac OS X and the support script used to launch the tool
exists in the local filesystem.  This is nothing but a complete and
utter hack.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-01-21 02:54:15 -05:00
Shawn O. Pearce eae2ce6192 git-gui: Reworded 'Include' to 'Add' to match core Git.
Now that git-add is a first class citizen in core Git (Nico's 366bfcb6)
users may start to expect the term 'add' to refer to the act of including
a file's changes into a commit.  So I'm replacing all uses of the term
'Include' in the UI with 'Add'.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-01-21 02:54:15 -05:00
Shawn O. Pearce c15ad650c7 git-gui: Auto-update any A? or M? files during rescan.
If the user has partial includes disabled then it doesn't matter what
state the working directory is in; if the file has been included in
the next commit its index state is A or M and we should immediately
run update-index on the working directory file to bring the index in
sync with the working directory.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-27 00:48:49 -05:00
Shawn O. Pearce f70c3a2cac git-gui: Enable resolution of merge conflicts.
If a file has a merge conflict (index state = U) the user will need to
run update-index on that file to resolve all stages down to stage 0,
by including the file in the working directory.

Like core Git we'll just trust the user that their resolution is
correct, and that they didn't just include the file into the commit
while merge conflicts still exist within the file.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-27 00:48:49 -05:00
Shawn O. Pearce 9208487b34 git-gui: Set a proper title on our revert confirm dialog box.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-25 22:52:03 -05:00
Shawn O. Pearce 84e0bf1de4 git-gui: Started implementation of switch_branch.
This implementation of switch_branch is not yet finished, and thus
it throws a "NOT FINISHED" error rather than completing the switch.
But its a rough sketch of the procedure required.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-25 04:04:24 -05:00
Shawn O. Pearce 85ab313ed3 git-gui: Misc. comment and formatting cleanups.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-25 03:38:39 -05:00
Shawn O. Pearce bb1ad51a53 git-gui: Rename all_branches -> all_heads.
Since this list is really the set of refs which match "refs/heads/*" it
really is the set of heads and not necessarily the set of all branches,
as the remote tracking branches are not listed in this set, even if it
appears in the "refs/heads/*" namespace (e.g. an old style repository).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-25 03:35:33 -05:00
Shawn O. Pearce 359ca42a4b git-gui: Automatically skip tracking branches in branch menu.
Since the user should not work on a tracking branch we automatically
hide any branch which is used as a tracking branch by either a
remote.<name>.fetch config entry or by a Pull: line in a remotes file.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-25 03:33:03 -05:00
Shawn O. Pearce 2171bf4b44 git-gui: Abort on not implemented branch switching.
I'm not currently ready to implement branch switching, so I'm just
going to punt on it for now.  :-)

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-25 02:47:18 -05:00
Shawn O. Pearce d90d83a3a9 git-gui: Parse off refs/remotes when showing current branch.
Even though the user shouldn't have a remote branch checked out, if
they do we should still show as short of the branch name as possible.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-25 02:45:19 -05:00
Shawn O. Pearce 700a65ce38 git-gui: Created Branch menu.
This is an early start at branch management from within git-gui.  The
branch menu has create/delete command entries to create and delete
branches as well as a list of radiobutton entries for each branch
found in the repository through for-each-ref.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-24 17:30:12 -05:00
Shawn O. Pearce 9342e26d3a git-gui: Support file state MD (modified/deleted).
Apparently I missed the file state MD, which is a file modified and
updated in the index but then removed from the working directory.  This
should be treated just like AD, an added file which has been deleted from
the working directory.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-24 15:59:34 -05:00
Shawn O. Pearce 8553b772d7 git-gui: Display the current branch.
Users want to know what branch they are sitting on before making a commit,
as they may need to switch to a different branch first.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-24 15:38:18 -05:00
Shawn O. Pearce e734817db0 git-gui: Added revert changes command.
Users sometimes need to be able to throw away locally modified files
in order to go back to the last committed version of that file.  To
perform a revert the user must first uninclude each file from the new
commit as the working file must at least partially match the index,
and we use git-checkout-index to update the working directory.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-23 21:40:45 -05:00
Shawn O. Pearce 4c2035d55e git-gui: Improve pull error dialogs.
Just like prior to a commit its only an informational message that
we refuse to perform a pull on a dirty working directory.  Therefore
we should not use an error icon.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-22 19:24:41 -05:00
Shawn O. Pearce 5040f926f9 git-gui: Don't start 'gitk --all' on Mac OS X.
Since gitk is currently broken on Mac OS X and is unable to start itself
when given command line parameters just don't offer the "Visual All
Branches" menu option on Mac OS X.

Once this feature of gitk is fixed we should change this section of code
to make sure a working version of gitk will be executed before we offer
the option up to the user.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-21 22:58:28 -05:00
Shawn O. Pearce d075242923 git-gui: Added menu command to visualize all branches.
Sometimes its useful to start gitk with the --all option, to view all of
the known branches and tags within this repository.  Rather than making
the user startup gitk and then edit the view we can pass the option along
for them.

This also makes it slightly more explicit, that when gitk starts up by
default its showing the current branch and not everything.  Yes gitk
isn't showing that to the user, but the fact that the user had to make
a decision between seeing this current branch or all branches will
hopefully make them study gitk's display before jumping to a conclusion.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-21 22:34:27 -05:00
Shawn O. Pearce b673bbc59c git-gui: Refactor M1 binding selection.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-21 22:34:27 -05:00
Shawn O. Pearce 1d8b3cbf28 git-gui: Warn Cygwin users about possible environment issues.
Because the Tcl binary distributed with Cygwin tends to not pass along
its own environment (the env array) to its children, its unlikely that
any Git commands spawned by git-gui will receive the same environment
variables that git-gui itself received from the shell which started it.

If the user is counting on environment variables to pass down, like say
GIT_INDEX_FILE, they may not, so we warn them during git-gui startup
that things may not work out as the user intended.  Perhaps one day
when git-gui and git are running on native Windows (rather than through
the Cygwin emulation layers) things will work better.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-21 15:28:14 -05:00
Shawn O. Pearce 3add5d3517 git-gui: Correct is_MacOSX platform test.
Darwn based UNIX systems are not necessarily Mac OS X.  However the only
windowing system used by Tk that is Mac OS X is 'aqua', and only 'aqua'
exists on Mac OS X.  Therefore this is a more reliable test for the
Macintosh platform.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-21 12:00:50 -05:00
Shawn O. Pearce 7b85a17b86 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>
2006-11-21 11:57:41 -05:00
Shawn O. Pearce 53f7a33bdc 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>
2006-11-21 02:46:51 -05:00
Shawn O. Pearce bdc9ea2024 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>
2006-11-21 02:36:55 -05:00
Shawn O. Pearce 0c8d7839c9 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>
2006-11-21 02:33:56 -05:00
Shawn O. Pearce 82aa23545f 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>
2006-11-21 00:22:35 -05:00
Shawn O. Pearce a4abfa62d6 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>
2006-11-21 00:22:35 -05:00
Shawn O. Pearce 75e355d6be 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>
2006-11-21 00:22:34 -05:00
Shawn O. Pearce 93a7991205 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>
2006-11-21 00:22:34 -05:00
Shawn O. Pearce 21d7744fbc 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>
2006-11-21 00:22:34 -05:00
Shawn O. Pearce 444f92d097 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>
2006-11-21 00:22:34 -05:00
Shawn O. Pearce f18e40a1a6 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>
2006-11-21 00:22:33 -05:00
Shawn O. Pearce 375f38828e git-gui: Correct some state matchings for include/remove.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2006-11-19 03:46:29 -05:00
Shawn O. Pearce a29481e212 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>
2006-11-19 03:38:48 -05:00
Shawn O. Pearce bd11b82db8 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>
2006-11-19 02:57:58 -05:00