- Complete the action methods for fetch and rebase.
- Add a more generic and re-usable method for updating the popup toolbar items.
- Comment out updatePushMenuWithRemotes: and updatePullMenuWithRemotes: as those have been
superseded by updatePopUpToolbarItemMenu:remotes:action:title:
A deletion execution dialog should block the UI until it's complete if there could
potentionally be state change occurring which has different outcome for pre-deletion
or post-deletion finite state.
A middle ground solution would be to use a modal sheet attached to a specific document
which then only blocks this particular document.
If "All branches" or "Local branches" is selected, the buttons will be disabled.
Actions from the context menu continue to work as they implicitly set the target branch
through the identity of the clicked label patch.
Any other branch will re-enable the buttons.
Mind you, these buttons cannot operate on the clicked branch like the context menu.
Instead they always operate on the currently active branch (or its default remote).
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>
This adds a removeBranch method similar to the addBranch method. It
calls these methods when a branch is created/deleted in the UI, avoiding
the cost of simply calling refresh afterwards.
Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
* stable:
GitRevList -- Try to read the encoding of the commit message
GitRevList: fix crash when loading 0 commits
Tickets #151 and #155: check for illegal branch names before creating.
* stable:
Fix many gcc 4.2 compiler warnings
GitX.xcodeproj: Quote paths in custom shell scripts
Fix compilation with GCC 4.2
IndexController: Temporarily stop tracking when (un)staging
IndexController: Add methods to stop tracking the Index
ChangesTableView: Remove warning by casting to correct class
Conflicts:
PBGitCommitController.m
Show a very simple user-dialog when trying to delete a branch or a
tag.
This satisfies ticket #115.
Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
We used to unconditionally set the title of the branch
to the current branch. This worked fine in most cases
where the current branch was already known, but failed
when you use 'gitx -c' and then switch to the HistoryView,
because then the currentBranch isn't known yet.
The simple fix is to check if we know it. If we don't,
it'll be set later on.
This wasn't used anyway. A good idea would be to create a new
branchcontroller that takes care of all these revs, rather than
letting PBGitRepository take care of that
That's why it's there, after all. This also makes the system
more robust and catches some more errors.
The next thing this enables is to also allow right-clicking
on refs in the commit list.
The ref functionality is somewhat weird right now, in that
some parts of the code require a nil array when there are no
refs. So, we add a good removeRef accessor to keep track of this
André Berg