Commit Graph

1003 Commits

Author SHA1 Message Date
David Parry 3ee7fb3042 Added aliases for 'm' & 'h' for objc.
Added a hash of possible values to select the correct brush based on the suffix.
This fixes a problem where some suffixes did not match brush aliases.
2010-11-24 13:25:35 +11:00
David Parry 09e25adfd8 Changed name of README to README.markdown, so that Github automatically
formats it.
2010-11-24 11:17:43 +11:00
David Parry e12180ae3e Now importing all the syntax highlighting brush files, so we can use the one we need
for the given file type.
2010-11-24 11:15:15 +11:00
David Parry 4e208d5b55 Reading the full file path, extracting the suffix, then using that to pick the brush
for syntax highlighting.
2010-11-24 11:14:21 +11:00
David Parry 14a1b611be Now passing the full file path to the Javascript "showFile" method, so
we can use the file suffix to determine which syntax highlighting to use.
2010-11-24 11:12:31 +11:00
Nathan Kinsinger 9dd29f6048 Fix creating Gists
GitHub changed their site to use SSL.

On error GitHub may return the "All Gists" page which will have several "gist: #", so check for the edit link instead.
2010-11-17 19:53:29 -07:00
Nathan Kinsinger b41da9e23e Fix the File/Tree view's vertical split view
It will now remember it's position and the divider will not move when the window resizes.
2010-11-17 19:53:25 -07:00
Nathan Kinsinger c545832108 Fix the Stage view's horizontal split view
It will now remember it's position and the divider will keep its position relative to the bottom when the window resizes.
2010-11-17 19:53:22 -07:00
Nathan Kinsinger b11d4f7485 Fix the history view's horizontal split view
Save the position correctly (it wasn't saving before). Restore the position sometime after awakeFromNib otherwise the superview's size will not have been set yet.

Also constrain the divider from moving unless the lower view is too small.
2010-11-17 19:53:18 -07:00
Nathan Kinsinger 621b4e6bc8 Use Command-U for the Clone menu item 2010-11-17 19:53:09 -07:00
Simeon Leifer d91ed3d8c3 set state (checkmark) on view menu items to reflect active view 2010-11-17 19:50:55 -07:00
Simeon Leifer 395877f005 explicitly disable external diff so we get the results we need even if the user has an external diff configured 2010-11-17 19:50:51 -07:00
Nathan Kinsinger 62319b8cd9 Allow suppressing some of the modal warnings
This allows the user to suppress the display of some of the warning dialogs (like "Confirm before Push"). They can be reset with Reset Warnings in the General preferences.
2010-11-17 19:50:48 -07:00
Kevin Ballard e168123c0e Draw commit message line more accurately
When drawing the commit message line, the given rect should not be used
for anything other than clipping. According to the comment, the code that
draws the line relies on the text view always drawing complete lines.
However, it also draws fragments, specifically when the insertion point
is flashing. By ignoring the given rect, not only is our line more accurate
in its positioning, but we also handle the case where the insertion point
is sitting on top of the line.
2010-11-17 19:50:40 -07:00
Nathan Kinsinger 7123fd6519 Add a "Report a problem" item to the Help menu
Opens the GitX Lighthouse page.
2010-11-14 17:59:11 -07:00
Nathan Kinsinger 0807099dc3 Send the CFBundleGitVersion string along with the other sparkle profile info 2010-11-14 17:59:03 -07:00
Nathan Kinsinger 515b66f09a Fix memory leaks 2010-11-14 17:58:48 -07: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
Nathan Kinsinger 59c4983b51 Bugfix: only exit the handleSTDINDiff() if there is an actual diff 2010-09-20 22:36:06 -06:00
Nathan Kinsinger d00dbe42b3 Always pull all tracking branches from the remote
'git pull remote branch' will not update the remote's tracking branches, only the selected local branch. It may not be readily apparent that this happened. So remove the cases where GitX would pull just a single branch and always pull all the tracking branches.

The current checked out branch will still be updated as normal.
2010-09-19 22:51:14 -06:00
Nathan Kinsinger e388434a49 When creating a tracking branch pre-fill the branch name in the create branch sheet 2010-09-19 22:49:44 -06:00
Nathan Kinsinger 929f9fc0f5 Show the branch that will be tracked when creating a tracking branch 2010-09-19 22:49:37 -06:00
Nathan Kinsinger 6f83f2382c Bugfix: Rebasing the head ref
Only use the ref being rebased onto otherwise git will create a detached HEAD.
2010-09-19 14:33:33 -06:00
German Laullon cbf7cd3fbf cosmetic 2010-09-19 13:18:40 -07:00
German Laullon 6cf9cc13c8 SyntaxHighlighter 3.0.83 2010-09-19 13:01:26 -07:00
German Laullon bcee4aa91e html and code parse errors... 2010-09-19 12:17:18 -07:00
Nathan Kinsinger 9a9de9577c Bugfix: crasher on 10.5 due to webkit and the <button> element
Something in webkit doesn't like the button html element nor the -webkit-appearance: button css tag. Ends up crashing in one of various WebCore::ThemeMac::paint functions.

This would crash for anyone on 10.5 with the Gist it button enabled (which it is by default so that means anyone who ran it for the first time).

Changing the button back to the way it was before SHA:b557d6b5c6e675216d340d20833f39d0096b7ccc
2010-09-18 19:17:12 -06: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 a7faf4f06a Remove the Quick Look button from the upper history toolbar and put it in the file list's bar 2010-09-18 11:20:22 -07:00
German Laullon 3a25496020 log format use %aN for the author name so that git uses the names from .mailmap 2010-09-18 11:19:29 -07:00
German Laullon 3f4c435d5f blame command should be "blame -p SHA -- filename" 2010-09-18 11:18:57 -07:00
German Laullon d1298a6c57 remove the "author" and "summary" labels 2010-09-18 11:18:21 -07:00
Nathan Kinsinger 3933744ba9 Merge remote branch 'refs/remotes/koraktor/no-verify' into experimental 2010-09-18 11:28:02 -06:00
Johannes Gilger 5194d5c5c9 History: Show author/committer according to .mailmap
This does not affect the display of the diff, since it is done with git
show --pretty=raw.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2010-09-17 23:47:17 -06:00
Johannes Gilger 95b48779e8 Diff-View: Honor whitespace preference
This honors the preferences for showing differences in whitespacing when
using diff between single revisions/branches.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2010-09-17 23:47:02 -06:00
Johannes Gilger f2cf438179 History-View: Clear list of files on showDiff
This clears the list of files before redrawing the showDiff method.

Fixes Lighthouse ticket #263

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2010-09-17 23:46:12 -06:00
Johannes Gilger 2852ecbf01 History: Correctly wrap lots of tags
When there are many tags in a commit we want them to wrap.

This fixes lighthouse ticket #220.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2010-09-17 23:46:01 -06:00
Nathan Kinsinger f4a6d3fe0b Set the working directory for arguments sent from the cli
This allows running the gitx cli in a subdirectory and specifying file paths in that directory without having to type out the full path.
2010-09-17 23:45:19 -06:00
German Laullon 1a4a179e9a History 2010-09-16 22:54:28 -07:00
German Laullon 9200d3e310 blame 2010-09-15 17:00:50 -07:00
German Laullon 84ea632031 NGScopeBar 2010-09-15 17:00:07 -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
Sebastian Staudt ed833164d9 Also display output of commit-msg hook 2010-09-13 09:16:49 +02:00
Joshua Bleecher Snyder 8637a21c3b Display output of pre-commit hook 2010-09-13 09:16:49 +02:00
Nathan Kinsinger 8591effc91 Bugfix: include missing scripting method definitions 2010-09-12 22:28:53 -06:00
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