* commit 'origin/master':
CommitController: Don't turn of off automatic rearranging
PBGitRepository: Clean up the readFromURL: method
PBGitRepository: Fix opening of large directories due to bug in NSFileWrapper.
PBGitIndexController: Renamed "Revert" to "Discard"
CommitController: Reject merges
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
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:
PBGitHistoryView.xib
PBGitIndexController.m
In keeping consistent with the Discard-Hunk functionality we rename the
former "Revert changes" on file-level to "Discard changes". Along with
the menu-item all the functions and variables have been renamed
accordingly. Also get rid of an unnecessary force-function.
Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
Introduce a new showMessageSheet/showErrorSheet-method for
PBGitWindowController which uses the beginSheetModalForWindow method of
NSAlert whereever possible. This has the advantage over runModal as it
doesn't block the other instances of GitX and is generally more
unobstrusive for simple status-messages.
Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
* pu/pb/fix_refresh:
Rename 'CachedChanges" to "StagedChanges" for greater consistency
PBChangedFile: remove shouldBeDeleted boolean
GitCommitController: Also use dictionary lookup for untracked files
CommitController: Use a dictionary lookup when refreshing index
GitCommitController: clean up index functions
The encoding used to write a new .gitignore was based on an
uninitialized value. Fix this by using UTF-8 as the default.
Found by the clang static analyzer.
This uses the new way to stop tracking the index when
adding files. This can be noticed when staging more than
one file, as the tables might have to refresh dozens
of times.
This adds a slider in the commit view with
which the user can change the context size.
This is useful for example if the hunks are too
big; by changing the context size, a hunk can be
split and then the changes can be committed.
This restores the "Revert Changes.." functionality
that was removed when changing the file list stuff.
It's now possible to revert multiple files. Also, it
now uses 'git checkout-index', which should be a bit
more robust.
We previously used some cool git syntax to display changes in the index.
The unfortunate side-effect of this was that the diff headers weren't correct,
so the unstage button didn't work anymore.
This merges functionality that was previously stored in the
combination of PBGitCommitController / PBChangedFile to a
dedicated controller, PBGitIndexController.
Nathan Kinsinger