Commit Graph

173 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 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
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
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 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 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
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
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 da97c25a6a initial highlighter file view 2010-09-14 20:38:58 -07: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
Felix Holmgren d77d85b807 Make the context slider work again 2010-09-12 19:32:58 -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 7b17eec476 Fix spelling error 2010-08-22 07:52:04 -06:00
Nicholas Riley 11c68b728d Fix vertical alignment of multiline Subjects in history. 2010-08-22 07:51:03 -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
Pieter de Bie 25caa849fe Fix safari 5 render issue 2010-07-04 09:45:49 -06:00
André Berg 71c0f30ae5 Stability: employ more sanity checks when parsing author details from history.js 2010-06-27 06:30:28 -06:00
Nathan Kinsinger c19d2c8058 Add Diff to contextual menus
- added to menus for refs, commits, and files
    - show a message when there are no changes
2010-03-13 22:16:24 -07:00
Nathan Kinsinger 0cd02c13db Stop the top of diffs in the stage view from being cut off 2010-03-13 22:15:43 -07:00
Nathan Kinsinger 9689c430ef Clean up the commit file list
- remove the underline from file names (makes them easier to read)
    - add icons to replace the file modification buttons (icons by Nathan Kinsinger)
2010-03-13 22:15:40 -07:00
Nathan Kinsinger 9a536fc92a Clean up the commit message
- allow the commit message text to wrap
    - use Menlo on systems that have it
2010-03-13 22:15:37 -07:00
Nathan Kinsinger b557d6b5c6 Clean up the commit header
- make the "Gist it" button a Mac OS X style button
    - remove the default name from each field
    - move the author's gravatar and include the committer's
        - move the gravatar to the left of the author's name
        - add a gravatar for the committer
        - move the author and commiter info to it's own table to allow for putting the gravatar image in a center column
        - setGravatar() now uses the email address passed in
2010-03-13 22:15:34 -07:00
Nathan Kinsinger 370c1322c4 Add a space before the file name. 2010-02-19 22:54:43 -07:00
Pieter de Bie 1854fc0bd0 Merge branch 'pu/pb/index_refactor'
* pu/pb/index_refactor: (24 commits)
  PBGitIndex: post notifications when index stuff fails
  GitIndexController: reorder methods a bit, remove unnecessary stuff
  PBGitIndex: Migrate discardChanges to the GitIndex
  CommitController: Make commit message editable after commit failed
  GitIndex: Fix a few comments
  GitIndex: explicitly tell when stuff is updated
  Remove cruft
  Show previous commit message when amending
  CommitController: Empty commit title when commit is successful
  CommitView: Remove cruft
  Add failed commit notifications
  GitIndex: add commit notifications
  CommitController: Add status messages for index operations
  GitIndex: Add a few notifications
  CommitView: Migrate patch apply stuff to GitIndex
  GitIndex: Add support for applying patches
  CommitController: Replace commit method with the one from GitIndex
  GitIndex: add basic commit method
  GitIndexController: Migrate stageFiles functions to GitIndex
  GitIndex: Add methods to stage and unstage files
  ...

Conflicts:
	PBGitCommitController.m
	PBGitIndexController.h
	PBGitIndexController.m
2009-09-17 23:47:43 +02:00
Pieter de Bie 5972bd4f7f HistoryView: Don't show the 'loading commit' thing until after 500 ms.
This was annoying me a lot, so it's in stable :)

Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
2009-09-17 23:40:38 +02:00
Pieter de Bie 0363eea494 HistoryView: don't load in commit information in a separate thread anymore
I've seen this hang or crash a few times, so I hope this works better.
Instead of running a task in a separate thread, we just let it go through
the run loop and catch it when the task is done.

This ruins the second subview in the history view, but I don't think
anybody ever used that, so I'm going to remove it.
2009-09-17 23:29:06 +02:00
Pieter de Bie 64a52ad9e0 CommitView: Migrate diff displaying away from IndexController 2009-09-13 16:55:38 +02:00
Johannes Gilger 4544816ac8 GitX.css: Set a default-font for body
Some people have had Serif-fonts in their interface where no specific
fonts for classes/ids were specified. This sets the default-font to
'Lucida Grande' in order to have a nice non-serif on any system.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-09 23:03:03 +02:00
Pieter de Bie 53ca665271 Delete this test file.
I don't think we need it anymore. Otherwise, we can alway
get it back.
2009-09-08 15:53:43 +02:00
Johannes Gilger d3cb020598 commit.js: Fix discardHunk functionality
When rewriting big parts of commit.js, JD forgot to use the new function
for the "Discard hunk" functionality as well. This fixes that.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-03 10:13:44 +02:00
Pieter de Bie 85fcee1710 DiffHighlighter: Remove weird end line
This was added in 1688c2a (diffHighlighter.js: Record the line index as attribute.),
I guess by accident
2009-08-28 00:34:30 +02:00
JD Smith ab47c14d6e commit.js: Interface for selecting lines to (un-)stage. 2009-07-08 17:22:09 -04:00
JD Smith 62333bf51b commit.js: Refactor hunk retrieval.
To work with subhunks, allow passing a header line explicitly to search for.
2009-06-21 02:36:02 +01:00
JD Smith 1688c2a359 diffHighlighter.js: Record the line index as attribute. 2009-06-21 02:35:58 +01:00
JD Smith bcc652bacf commit view: Ensure buttons display on top of text
... but beneath title line.
2009-06-21 02:26:32 +01:00
Pieter de Bie 64182ea911 Merge commit 'origin/jg/tree_context'
* commit 'origin/jg/tree_context':
  HistoryController: Add "Open Files" menu item
  WebHistoryView: Also use the tree context menu
  HistoryController: Use a programatically created context menu
  WebHistoryController: Refactor menu search to be recursive
  HistoryController: Add some marks
  PBGitHistory: Add "Show in Finder" to files
  Display context menu in the history tree to show related commits
  History fileview: select current item on rightclick
2009-06-20 22:28:19 +01:00
Pieter de Bie 6fd339756e Merge branch 'stable'
* stable:
  PBGitConfig: Add missing sentinel
  Remove use of deprecated stringWithCString
  HistoryView: only add parents if parents array exists
  keyboardNavigation: Fix keys 'c' and 'v' from webView
  Site: add link to Twitter

Conflicts:
	Site/text/contact.markdown
2009-06-20 21:34:49 +01:00
Pieter de Bie a002e3316c WebHistoryView: Also use the tree context menu 2009-06-16 19:41:57 +01:00
Pieter de Bie 5f97caabd1 HistoryView: only add parents if parents array exists
This used to break if a commit had no parents. This wasn't noticed
before because the breakage is only minor -- the only way you see it
is because the detail view didn't scroll up afterwards.
2009-06-12 00:15:00 +01:00
Pieter de Bie 5090d4f159 Merge branch '5a88e3d' (early part)
* '5a88e3d' (early part):
  keyboardNavigation: Fix keys 'c' and 'v' from webView
  PBGitWindowController: Use beginSheetModalForWindow instead of runModal
2009-06-11 23:22:36 +01:00
Steven Michalske 58ac6ed1ff HistoryView: Change the way the HEAD is displayed
It used to be displayed in bold, but this can be easily overlooked when
visualizing all branches. It's easier to see the HEAD when it has its own
colour.
2009-06-11 19:50:45 +01:00
Johannes Gilger 60908fd143 keyboardNavigation: Fix keys 'c' and 'v' from webView
This fixes two small bugs:
1. The JavaScript-method is called "showDiff" instead of "showDiffs"
since cfbcfc1f38. That's why the 'v' button didn't work since then.
2. Commit f05d0188fc introduced an error when trying to access
"event" for key-presses from Cocoa, which resulted in an error and
therefore made the following if-statements unreachable.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-06-11 13:06:09 +01:00