Commit Graph

974 Commits

Author SHA1 Message Date
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 2cdf2b60f5 Merge branch 'pu/pb/index_quick_fix' into stable
* pu/pb/index_quick_fix:
  CommitView: Don't keep rearranging when iterating over files
  IndexController: de-privatize the index-stopping stuff
2009-09-14 15:09:03 +02:00
Pieter de Bie 3324591e6c Fix UTF-8 bug in NSString_RegEx
This class would use the location information provided by
regex(3) as range for for a substring. However, the information
regex(3) returns is a byte-based, while NSString works on characters.

This can cause a problem when there are UTF-8 characters in the string,
as the wrong subsstring will be returned.

This is fixed by taking the UTF bytesequence, and extracting a substring
from that, rather than using NSString's own substring method
2009-09-14 13:25:01 +02:00
Pieter de Bie 468e6bbb40 Sidebar: add a new ref if it can't be found 2009-09-13 23:10:31 +02:00
Pieter de Bie cd381a459c Sidebar: Check if we have enough path components 2009-09-13 23:05:07 +02:00
Pieter de Bie d05deb9548 PBGitRevSpecifier: tweak "isSimpleRef" a bit
For example, HEAD is a simple ref, but "stable..HEAD" isn't.
2009-09-13 23:04:48 +02:00
Pieter de Bie 1c3ee96e7c Don't show the Actions menu for now 2009-09-13 22:46:22 +02:00
Pieter de Bie ff1d30571b WIP: Move the sidebar to the history view instead
I'm not sure what we should do with the commit stuff, but
this seems more reasonable
2009-09-13 22:44:26 +02:00
Pieter de Bie a2b3bf3d1e PBGitIndex: post notifications when index stuff fails
We use notifications so that we can make all these methods async later on
2009-09-13 16:55:40 +02:00
Pieter de Bie 438a3f808d GitIndexController: reorder methods a bit, remove unnecessary stuff 2009-09-13 16:55:40 +02:00
Pieter de Bie 3dc312ff2e PBGitIndex: Migrate discardChanges to the GitIndex 2009-09-13 16:55:40 +02:00
Pieter de Bie e17b454c39 CommitController: Make commit message editable after commit failed 2009-09-13 16:55:40 +02:00
Pieter de Bie 59d4a159a4 GitIndex: Fix a few comments 2009-09-13 16:55:40 +02:00
Pieter de Bie 029b42c540 GitIndex: explicitly tell when stuff is updated 2009-09-13 16:55:40 +02:00
Pieter de Bie 9b1fcd7628 Remove cruft 2009-09-13 16:55:40 +02:00
Pieter de Bie 249233114d Show previous commit message when amending 2009-09-13 16:55:40 +02:00
Pieter de Bie 2b317eee5c CommitController: Empty commit title when commit is successful 2009-09-13 16:55:39 +02:00
Pieter de Bie 6265c774ac CommitView: Remove cruft 2009-09-13 16:55:39 +02:00
Pieter de Bie 5323b91596 Add failed commit notifications 2009-09-13 16:55:39 +02:00
Pieter de Bie 4192d6a03f GitIndex: add commit notifications 2009-09-13 16:55:39 +02:00
Pieter de Bie c6d2b61020 CommitController: Add status messages for index operations 2009-09-13 16:55:39 +02:00
Pieter de Bie ff263c6717 GitIndex: Add a few notifications 2009-09-13 16:55:39 +02:00
Pieter de Bie cdae809f41 CommitView: Migrate patch apply stuff to GitIndex 2009-09-13 16:55:39 +02:00
Pieter de Bie 57dc38f587 GitIndex: Add support for applying patches 2009-09-13 16:55:39 +02:00
Pieter de Bie 87dfb47f4f CommitController: Replace commit method with the one from GitIndex 2009-09-13 16:55:39 +02:00
Pieter de Bie 8df614cb53 GitIndex: add basic commit method 2009-09-13 16:55:38 +02:00
Pieter de Bie f51fd6c214 GitIndexController: Migrate stageFiles functions to GitIndex 2009-09-13 16:55:38 +02:00
Pieter de Bie 35a4dc37e2 GitIndex: Add methods to stage and unstage files
These are mostly copies from PBGitIndexController, and
they can be refactored to a common method. I'm not sure of a name
for that yet, so I'll keep it like this for now :)
2009-09-13 16:55:38 +02:00
Pieter de Bie 64a52ad9e0 CommitView: Migrate diff displaying away from IndexController 2009-09-13 16:55:38 +02:00
Pieter de Bie 07417acd51 GitIndex: add support for retrieving diffs 2009-09-13 16:55:38 +02:00
Pieter de Bie 03e1d3e882 WIP: Add GUI support for the new index 2009-09-13 16:55:38 +02:00
Pieter de Bie 6531cfce3b Add a new class, PBGitIndex, which integrates functionality from both indexcontrollers 2009-09-13 16:55:38 +02:00
Pieter de Bie 44768921f3 GitRevList: run the log command in the correct directory when available 2009-09-13 16:55:20 +02:00
Pieter de Bie 8ae2cde437 GitRevList: Always run --children
It's very difficult to determine whether or not we have a path specifier.
Because it's so difficult, it's better to just always run --children. A quick
test indicates that it doesn't matter much in run-time, and it's better to be
conservative in what we accept than to show bogus lines because the children
haven't been rewritten.
2009-09-13 16:55:20 +02:00
Pieter de Bie 86ea9b5469 GitRevList: replace 'id' with PBGitRepository 2009-09-13 16:55:20 +02:00
Pieter de Bie d59745294d CLIProxy: pass on the directory in which the gitx command is run 2009-09-13 16:55:20 +02:00
Pieter de Bie 95a9cc81fc RevSpecifier: Add support for a working directory
This indicates the directory in which the Revparameters should be run,
useful when the parameters are requested from the CLI
2009-09-13 16:55:20 +02:00
Pieter de Bie 00731eb285 CommitView: Don't keep rearranging when iterating over files 2009-09-12 23:43:35 +02:00
Pieter de Bie 916711324f IndexController: de-privatize the index-stopping stuff
We shouldn't need to do this, but we still need to, because
our index operations are split between two different controllers,
which is a bit odd.
2009-09-12 23:43:14 +02:00
Pieter de Bie 692a79c3ad Sidebar: Add "Commit" action
When this tree leaf is selected, the view switches
to the commit view.
2009-09-10 02:39:51 +02:00
Pieter de Bie fb3a1705e3 SideBar: Add ViewAction and ViewRemote objects
These two new classes can represent items in our SourceList
that refer to specific actions (such as comitting), or
specific Remotes.
2009-09-10 02:39:16 +02:00
Pieter de Bie c59d68bb3e Sidebar: Handle selection changes 2009-09-10 02:39:14 +02:00
Pieter de Bie 23d5c01a3d Sidebar: hook up branch switching
This is far from perfect, but at least you can
use it to navigate the stuff a bit now :)
2009-09-10 02:32:09 +02:00
Pieter de Bie ca479c79e9 Sidebar: display a custom icon
These are based on a contribution by Vincent Esche,
but we'll probably have to change them a bit.
2009-09-10 02:31:08 +02:00
Pieter de Bie bff93631d5 SideBar: Add branches as children
This makes a nice tree, which should be more
readable than the existing list. The local
branches are expanded by default.
2009-09-10 02:31:08 +02:00
Pieter de Bie 462e90dfc8 Sidebar: populate with branches
This is far from perfect, but should indicate
which direction this is going in
2009-09-10 02:31:03 +02:00
Pieter de Bie c8cfe7acaa Add start of a sourceview list
This shows in a separate window for now, so we don't
mess up the xibs. Once I'm satisfied with the result,
I can put it into the main view with a single change :)
2009-09-10 01:25:49 +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
Johannes Gilger b7945b05e9 UserManual: Clarify double-click in stage-lines
Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-09 10:19:33 +02:00
Pieter de Bie ff5388cc24 HistoryView: Remove focus border
That's so 1999!
2009-09-08 16:42:55 +02:00