Commit Graph

956 Commits

Author SHA1 Message Date
Nathan Kinsinger 5ddbcd18ef Disable deleting and pushing the detached HEAD 2010-09-12 20:39:47 -06:00
Nathan Kinsinger 8bb1173942 Allow the stage view's context slider to move from 0 to 10 2010-09-12 19:33:05 -06:00
Nathan Kinsinger c605b74476 Add a File Path search mode
Highlights any commit that touches a file.

The "Show history of file" context menu item will now set the path search instead of creating a rev specifier.
2010-09-12 19:33:01 -06:00
Felix Holmgren d77d85b807 Make the context slider work again 2010-09-12 19:32:58 -06:00
Nathan Kinsinger 18725fdd65 Prevent drag and drop of tags and remote branches
Moving an annotated tag would convert it to a lightweight tag and lose the tags message.

Given that tags are meant to represent a fixed point in the history and remote branches represent the state of the remote I'm disabling moving them.
2010-09-12 19:32:53 -06:00
Nathan Kinsinger b28afa1644 Add the contextual menu to the other columns of the commit list
Now all the columns have the menu for the commit, not just the subject column.
2010-09-12 19:32:50 -06:00
Nathan Kinsinger e56ca103ca Add search commands to the gitx cli
-s or --search= for searching in subject, author or SHA
-S or --Search= for git's pickaxe string matching
-r or --regex= for git's pickaxe regex matching
2010-09-12 19:32:47 -06:00
Nathan Kinsinger 71cdb0dbe0 Add search modes for git pickaxe
Add two new search modes to search the commits for strings that were added or removed in a commit.
    - match by string or an extended POSIX regex (see man git-log -S<string> and --pickaxe-regex)
    - include the modes in the search menu
    - store the current mode in user defaults
    - show progress indicator when search takes time
2010-09-12 19:32:44 -06:00
Nathan Kinsinger 62aa99b761 Add a recent searches menu to the search field 2010-09-12 19:32:40 -06:00
Nathan Kinsinger 4fad6b60a3 Improve search UI
Previously searching would filter the commits in the commit tableview to only show the commits that matched the search. However the context of where those commits exist in the history is lost.

With this patch all the commits are shown but the commits that match the search are highlighted with a light blue background. In addition there is a forward/back button to step through the matches.

A new search controller:
    - keeps track of the matching results
    - finds the next or previous result
    - displays the number of matches found or "Not found"
    - shows/hides the # of matches text and the next/last stepper button
    - shows a small bezel style window with a rewind icon indicating that the selection has cycled (pressing next when at the last match or previous when at the first)
    - sets up the search predicate which covers Subject, Author and SHA (previously this was three different searches)
    - stores search results in an NSIndexSet to make finding if a row is in the set faster (needed at drawing time)

Highlighting of search result rows is done in PBCommitList -drawRow:clipRect:

PBGitTextFieldCell is a subclass of NSTextFieldCell that disables the cell's selection highlighting.

Supporting Find Next and Find Previous (cmd-g and cmd-shift-g) menu commands required changing the action method of the menu items because NSTextFields (seem to) actively disable items in the Find menu.

rewindImage.pdf created by Nathan Kinsinger
2010-09-12 19:32:36 -06:00
Nathan Kinsinger 80596add94 Improved sidebar icons for Branch, Remote Branch and Tags
Icons by Thorsten Seitz <thorsten@portableinnovations.de>
2010-09-12 19:32:31 -06:00
Nathan Kinsinger 17f50e3f7e Add --init and --clone to gitx CLI and Applescript
Allows creating repositories from the command line, Applescript, or the scripting bridge. These are basic commands, if you need to use commandline options then use git itself.
2010-09-12 19:32:26 -06:00
Nathan Kinsinger b9232721d0 Add "--git-dir=" to gitx CLI
Allows specifying a repository in a particular location for the gitx operation.
2010-09-12 19:32:23 -06:00
Nathan Kinsinger e60bb3226c Refactor the gitx CLI to use apple events and the scripting bridge
Sending the arguments with the openURL:... message allows the repository document to modify it's UI without the UI flashing between states as it opens.

Covers all the existing functionality of the CLI, but modifies:
    - "--all" "--local" "--branch" change the branch filter
    - cleaned up the usage (help) text and added info on missing commands
    - looks up the full ref name of refs so the name of a branch or tag can be entered (the user can enter "master" instead of "refs/heads/master")

Modified the History Controller to watch for and react to branch filter changes.

The GitX.h file is generated by the 'sdp' tool in a run script build phase called 'Generate Scripting Bridge Header' based on the content of GitX.sdef. It is used by the Scripting Bridge so that other apps (in this case the gitx CLI) can call Applescript commands on GitX in objective-c.
2010-09-12 19:32:19 -06:00
Nathan Kinsinger beaa591b53 Include the CFBundleGitVersion in the version command of the CLI
CFBundleGitVersion has the git description information in it.
2010-09-12 19:32:15 -06:00
Nathan Kinsinger 88b2983a4c Add a Short SHA column to the commit list
Shows only the first 10 characters of the full SHA hash so as to take up less room. Show or hide it using the contextual menu for the table header.
2010-09-12 19:32:11 -06:00
Nathan Kinsinger 2bdfaa096b Fix sorting of the subject column.
Was broken back in 4e4ffcc.
2010-09-12 19:32:07 -06:00
Nathan Kinsinger f8e63e2c9c Remove the isReachable test for gravatar.com
If there is no network connection then the reachability test will take the system default time (90 seconds I think?) to time out. During this time the UI is blocked (spinning beach ball).

The test was being done even if gravatar use was turned off. It doesn't really matter if the site is unreachable, the image will not load but that's not a big deal.
2010-09-12 19:32:04 -06:00
Nathan Kinsinger e281c983d6 Add a relative date column to the commits list table view
Shows a relative time ("x minutes ago", "Yesterday", "x days ago", "x years ago").
    - Sort the column on the commit's date and not on the string value
    - Use a custom formatter connected to the cell in the XIB
    - Show or hide using the contextual menu for the table header
2010-09-12 19:31:40 -06:00
Nathan Kinsinger 986f49f70a Don't allow drag-n-drop for the checked out branch.
Moving the checked out branch would cause odd things to happen to git's index.
2010-08-22 14:14:49 -06:00
Eric Allen c077f234ea Allow zero lines of context
Hunk/line patches don't generally have context

Before this, every attempt to stage a hunk or line was met with
"patch failed" using git 1.6.6
2010-08-22 11:57:40 -06:00
Marc Liyanage d4cb11bb8b Add "Copy SHA" alternate menu item to main menu, with default binding Cmd-Option-C. It copies just the leading 7 characters of the SHA instead of the whole commit info. 2010-08-22 08:26:13 -06:00
Sebastian Staudt caa6ed01f9 Don't follow symlinks when setting Git path
This allows using /usr/local/bin/git (using Homebrew) to work across updates
2010-08-22 07:54:03 -06:00
Nathan Kinsinger 2529c02814 Fix getting the correct git directory
If the path already includes the .git directory then rev-parse will return "." to mean the current directory.
2010-08-22 07:52:15 -06:00
Nathan Kinsinger 7b17eec476 Fix spelling error 2010-08-22 07:52:04 -06:00
Nathan Kinsinger 92a44542ae Fix crashes from NSInvalidArgumentException
This happens when running the gitx cli tool from a directory that does not contain a git repository.
2010-08-22 07:51:49 -06:00
Mikhail Emelchenkov d968f8f0c7 Fix a freeze when staging/unstaging thousands of files 2010-08-22 07:51:15 -06:00
Nicholas Riley 7f17378a86 Don't remove a file from "Unstaged Changes" when attempting to discard changes if it is a new file; it'll just reappear when you refresh. 2010-08-22 07:51:10 -06:00
Nicholas Riley 11c68b728d Fix vertical alignment of multiline Subjects in history. 2010-08-22 07:51:03 -06:00
Nathan Kinsinger 9e3e2725c0 Fix issues reported by Xcode's build and analyze
Using the LLVM GCC 4.2 compiler.
2010-08-22 07:50:42 -06:00
Jan Weiß 28f4c49b48 Fixing compiler warnings. 2010-08-22 07:50:25 -06:00
Nathan Kinsinger 07651211fd Fix "Duplicate declaration of method" error when using LLVM
The class method and the instance method had different types for the window controller. The instance method should be using the NSWindowController since the sheet can be shown in a non PBGitWindowController window (the PBCloneRepositoryPanel).
2010-08-22 07:46:12 -06:00
Michael Dippery f254fd1564 .gitignore: Ignore everything but Xcode project settings 2010-07-24 12:22:18 -06:00
Nathan Kinsinger 282cc7cd25 Bugfix: fix incorrect path to PBGitXMessageSheet.xib 2010-07-15 05:26:41 -06:00
Nathan Kinsinger 549f2c1d6a Show long messages and errors in a scroll view
This stops really long sheets when the output from git is very long.
2010-07-05 09:26:50 -06:00
Nathan Kinsinger 66e260fa69 Resize the remote progress sheet if the description is larger than the text field 2010-07-05 09:26:47 -06:00
Nathan Kinsinger 6809ac31c6 Prettify the SSH password window
- use something close to the standard HIG spacing
    - add the app's icon and a title so people know what app is asking for a password
    - save the position of the window and only center the window if the user hasn't moved it before
    - the NSSecureTextField spews some garbage to STDERR which GitX would show in the success/failure sheet so close STDERR
2010-07-05 09:26:41 -06:00
Uli Kusterer a6b5705a5f First stab at an executable that can be put into the SSH_ASKPASS environment variable to make GitX ask for passwords.
Set the environment variables for our tool. We have a rudimentary but working password panel now. Prettification later.

Label on password window so it's less cryptic.
2010-07-04 22:12:59 -06:00
Nathan Kinsinger de7d74cac8 Update build settings to include x86_64 arch
Set the debug configuration to NATIVE_ARCH_ACTUAL because NATIVE_ARCH will always be i386

Move the "compile libgit2" script build phase to it's own target. By setting the script to run in it's own target we get the ability to clean it durning the clean phase (normal build phase scripts don't run during clean). This will be needed if someone has built GitX prior to this commit because the object files will be for the old architectures.

Also give an error if there is no git repository. This is from several questions I've received after someone has downloaded the source from github instead of cloning the project. The problem is that there is no submodule setting to update.
2010-07-04 22:12:56 -06:00
Nathan Kinsinger d81645e411 Include the DSYM file while compiling the release build 2010-07-04 22:12:52 -06:00
Nathan Kinsinger 81d7e78e7d Select the commit as soon as it is available when updating the commit list
This is important for large repositories as the commit will be selected when it is added instead of waiting for all the commits to be loaded.

Stop attempts to select the current commit again if it's already selected.

No longer need the updatedGraph property on the history list.
2010-07-04 22:12:46 -06:00
Nathan Kinsinger 69827e920e Performance improvements for graphing commits
The big improvement is reusing the PBGraphCellInfo (~8-10%)
2010-07-04 22:12:42 -06:00
Nathan Kinsinger 7c62337ab9 Update commits every 0.1 sec instead of every 1000 commits
Slower machines will update more often and faster ones will do more work in each update.
2010-07-04 22:12:29 -06:00
Nathan Kinsinger 53d92fb73e Cleanup the views when the repository window closes and stop memory leaks.
- make sure to remove themselves from KV and notification center observers
    - add the PBWebHistoryController to PBHistoryController so it can be told to close
    - replaced the -removeView methods with -closeView (-removeView was not being used)
    - clear any obj-c objects set in web scripting objects

This last item seems to be the reason that the web controllers and the current commit did not get collected which then held the repository document from being collected as well.
2010-07-04 09:46:22 -06:00
Nathan Kinsinger a849424a46 Add a cleanup method to the history list.
The cleanup method cancels any background threads and removes KV observers when the repository document is closed.

Also removed KV observers that are no longer needed.
2010-07-04 09:46:15 -06:00
Nathan Kinsinger c17215e55e Create wrapper class around git_oid and use it
This is a convenience class to replace using NSStrings to store and compare SHAs. PBGitSHA has a much faster isEqual: function.

It is <NSCopying> compliant and implements isEqual: and hash so it can be used as a key in dictionaries.
2010-07-04 09:46:12 -06:00
Nathan Kinsinger e067390fb2 Bugfix: Stop committer names from getting mangled
If the commit's detail is not UTF8 then PBWebHistoryController's commitDetailsLoaded: method will drop down to Latin1. That can cause character's in the committer's name to not be converted correctly.

Move parsing the name to PBGitRevList where the correct encoding can be determined.
2010-07-04 09:46:07 -06:00
Nathan Kinsinger 1bad051779 Bugfix: fix duplicate commits in the history view
1) stop a threading issue with old commits being added after the commits array was reset
    2) stop using --early-output (shouldn't there be an incremental output option???)
2010-07-04 09:45:52 -06:00
Pieter de Bie 25caa849fe Fix safari 5 render issue 2010-07-04 09:45:49 -06:00
Nathan Kinsinger fb5f9a5cd5 Cache the lane colors
To reduce the number of objects created and destroyed while scrolling through the history list.

Also use a more descriptive name.
2010-07-04 09:45:45 -06:00