Commit Graph

169 Commits

Author SHA1 Message Date
German Laullon ac1019d5cc no libgit2 2011-05-20 00:46:13 +02:00
Romain Muller 451335acd3 Build fat and use XCode's 32_64 arch specification style. 2011-05-19 09:21:18 +02:00
Romain Muller 6d8982ab4b Build with WAF outside of source tree.
Update headers and search paths with new build logic.
2011-05-19 09:21:18 +02:00
Victor Jalencas 104681c6c0 Allow the project to be built in directories with spaces in the path name (such as an AFP share mounted as /Network/Servers/servername/Volumes/Macintosh HD/Networkusers/username/…) 2011-05-13 07:44:01 -07:00
Uwe Hees 092418439c Set compiler to LLVM GCC4.2 and build archs to Standard (32bit universal) for the Debug target 2011-05-05 17:55:42 +02:00
Uwe Hees 43ac202144 Merge remote-tracking branch 'refs/remotes/laullon/master' 2011-05-05 11:55:21 +02:00
German Laullon f45ca2791b some cleanup pre 0.8.2 2011-05-03 16:58:33 -07:00
Uwe Hees 636068cb33 Merge remote-tracking branch 'laullon/master' 2011-05-02 09:18:17 +02:00
Alex Brand 1490db8396 Merge branch 'master' into gui-refresh 2011-04-29 22:01:03 +02:00
Uwe Hees f478476df7 Set compiler to LLVM GCC4.2 and build archs to Standard (32bit universal) 2011-04-27 23:12:47 +02:00
German Laullon f6e69682d1 better hide/show splitviews 2011-04-22 15:48:19 -07:00
German Laullon 571082a5d0 Merge branch 'refs/heads/apla-master'
Conflicts:
	GLFileView.m
2011-03-30 11:43:51 -07:00
German Laullon c0965e3770 basic search capability on FileVew 2011-03-30 00:17:14 -07:00
Leszek Ślażyński 21ad166517 Build fixes
- do not analye on every build
- sync submodule url
2011-03-30 06:38:16 +08:00
Leszek Ślażyński f47fd3c696 Feature: reset current branch to here 2011-03-17 11:45:41 -07:00
German Laullon f9ccf1fe8d Solved compilation warnings 2011-03-10 16:04:45 -08:00
German Laullon abbb2081c4 xcode 4 2011-03-10 13:56:09 -08:00
Alex Brand b785abb574 Merge branch 'master' into gui-refresh 2011-03-09 12:15:57 +01:00
German Laullon fb956111f6 ToolBar, icons and selector. 2011-03-02 13:33:07 -08:00
Alex Brand df4c7d30e9 Using iTerm2 as an option 2011-03-01 11:28:04 +01:00
German Laullon 51a2a1858e changing version updater to my server 2011-02-24 21:57:12 -08:00
German Laullom 8c6fda23c6 initial test 2011-02-09 15:44:22 -08:00
German Laullom 2de41fd116 Merge remote branch 'refs/remotes/rastersize/master' into experimental
Conflicts:
	PBGitRepository.h
	PBGitSidebarController.m
	PBSourceViewCell.h
	PBSourceViewCell.m
2011-01-27 16:45:11 -08:00
Aron Cedercrantz 3ebfec6c62 Changed compiler to clang + llvm.
Changed static analyzer property value so it's ran by default.
2011-01-19 13:28:52 +01:00
German Laullom c90c8a722b Merge remote branch 'refs/remotes/hungmac/svn-stashes' into experimental
Conflicts:
	PBGitRepository.h
	PBGitSidebarController.m
	PBSourceViewCell.h
	PBSourceViewCell.m
2011-01-05 13:57:12 -08:00
German Laullon da6a75c607 error control & and html/css/javascript reorder. 2010-12-09 13:12:52 -08:00
Tomasz Krasnyk 33e21e2604 Added new icons for file status. When untracked file is
added to index than it has added file icon.
2010-11-29 00:10:17 +01:00
Tomasz Krasnyk 7deb309dbb Merge branch 'refs/heads/experimental' into stashes
Conflicts:
	GitX.xcodeproj/project.pbxproj
	PBGitCommitView.xib
	PBGitHistoryView.xib
	PBRefController.m
2010-11-28 23:33:06 +01:00
Tomasz Krasnyk be507c8230 - Added controller 4 stashes, submodules, reset management
- Added additional menu for the repository actions
- Added action for 'Revealing in Finder'
2010-11-28 00:41:27 +01:00
Tomasz Krasnyk 17a4935f66 OutlineView for the sidebar menu can be now tacked
Commit on CMD+ENTER
Added images for group items in sidebar menu
2010-11-25 20:35:37 +01:00
Nathan Kinsinger 515b66f09a Fix memory leaks 2010-11-14 17:58:48 -07:00
Tomasz Krasnyk cc5c93c2b6 - stashes can be created with optional message
- added clearing all stashes
- added possibility to ignore files with given extension
- submodules are now showed
- submodules can be opened
2010-11-07 23:37:41 +01:00
krt 0a3b60066c Stashes are shown on in Side controlle 2010-11-06 13:20:13 +01:00
German Laullon cad928126e merger brotherbard:experimetal 2010-09-24 10:25:12 -07:00
German Laullon a78a2c238c blame cosmetics
save the html for debug and CSS edit
2010-09-24 10:17:04 -07:00
German Laullon 6d564bb463 In Xcode put the folder for MGScopeBar in the Aux folder 2010-09-18 11:20:45 -07:00
German Laullon 9200d3e310 blame 2010-09-15 17:00:50 -07:00
German Laullon da97c25a6a initial highlighter file view 2010-09-14 20:38:58 -07:00
Sebastian Staudt 21d1f3989f Added a dialog for failing commit hooks
This enables the user to force a commit (i.e. --no-verify) when either pre-commit or
commit-msg hook fails.
2010-09-13 20:25:42 +02: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 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 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 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
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 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 98920bf0b1 Merge remote branch 'refs/remotes/dgrijalva/stable' into experimental
Conflicts:
	ApplicationController.m
	GitX.xcodeproj/project.pbxproj
	PBGitCommitView.xib
	PBGitHistoryView.xib
	PBGitRevisionCell.m
	PBGitTree.m
	PBGitWindowController.m
	PBViewController.m
	html/views/history/history.js
	html/views/history/index.html
2010-05-29 21:04:21 -06:00
Nathan Kinsinger 6a8f495318 Add support for QuickLook in 10.6+
In 10.6 Apple removed the private QL API that existed in 10.5 and added a new public API. However they did not port the new API back to 10.5 so we have to do some work to get it working in both.

This patch has GitX choose the correct version at run time.
    - The delegate code is based on Apple's QuickLookDownloader example project
    - added three of the public API methods to CWQuickLook.h to avoid warnings about unknown method calls
    - In ApplicationController try to load the public API first then load the private one if it fails
    - Created PBQLTextView, a subclass of NSTextView to allow the space key event to toggle the preview panel
    - PBGitHistoryView.xib:
        - set the text view's class to PBQLTextView
        - connected the history controller to the controller outlet
        - bound the quick look button's enabled binding to File's Owner.selectedCommitDetailsIndex
        - added "Quick Look" to the quick look button's tooltip
    - The commit list table view toggles the panel if the tree view is active
    - changed name of the toggle IBAction method which caused MainMenu.xib and PBGitHistoryView.xib to update
2010-03-22 12:25:02 -06:00