Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GitUp/Application/Base.lproj/WelcomeWindowController.xib
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24765" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment version="110000" identifier="macosx"/>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24765"/>
<capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand Down
1 change: 0 additions & 1 deletion GitUp/Application/Document.m
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

#define kMaxProgressRefreshRate 10.0 // Hz

#define kNavigateSegmentWidth 34.0
#define kSearchFieldCompactWidth 190.0
#define kSearchFieldExpandedWidth 238.0

Expand Down
4 changes: 2 additions & 2 deletions GitUp/GitUp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.5;
MACOSX_DEPLOYMENT_TARGET = 12.4;
MARKETING_VERSION = 1.5.0;
PRODUCT_BUNDLE_IDENTIFIER = "co.gitup.mac-debug";
PRODUCT_NAME = GitUp;
Expand All @@ -680,7 +680,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.5;
MACOSX_DEPLOYMENT_TARGET = 12.4;
MARKETING_VERSION = 1.5.0;
PRODUCT_BUNDLE_IDENTIFIER = co.gitup.mac;
PRODUCT_NAME = GitUp;
Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Components/GICommitListViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GIViewController.h"
#import <GitUpKit/GIViewController.h>

@class GICommitListViewController, GCHistoryCommit;

Expand Down
6 changes: 3 additions & 3 deletions GitUpKit/Components/GICommitListViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
#error This file requires ARC
#endif

#import "GICommitListViewController.h"
#import <GitUpKit/GICommitListViewController.h>

#import "GCLiveRepository+Utilities.h"
#import "GIInterface.h"
#import <GitUpKit/GCLiveRepository+Utilities.h>
#import <GitUpKit/GIInterface.h>
#import "XLFacilityMacros.h"

@interface GICommitListViewController () <NSTableViewDataSource>
Expand Down
4 changes: 2 additions & 2 deletions GitUpKit/Components/GIDiffContentsViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GIViewController.h"
#import <GitUpKit/GIViewController.h>

#import "GCDiff.h"
#import <GitUpKit/GCDiff.h>

extern NSString* const GIDiffContentsViewControllerUserDefaultKey_DiffViewMode; // Integer (-1, 0 or 1)

Expand Down
8 changes: 4 additions & 4 deletions GitUpKit/Components/GIDiffContentsViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
#error This file requires ARC
#endif

#import "GIDiffContentsViewController.h"
#import <GitUpKit/GIDiffContentsViewController.h>

#import "GIInterface.h"
#import "GIViewController+Utilities.h"
#import "GCRepository+Index.h"
#import <GitUpKit/GIInterface.h>
#import <GitUpKit/GIViewController+Utilities.h>
#import <GitUpKit/GCRepository+Index.h>
#import "XLFacilityMacros.h"

// Units ems: a multiple of the font point size, so the width threshold is 100 * 10 = 1000 for a 10 point font.
Expand Down
4 changes: 2 additions & 2 deletions GitUpKit/Components/GIDiffFilesViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GIViewController.h"
#import <GitUpKit/GIViewController.h>

#import "GCDiff.h"
#import <GitUpKit/GCDiff.h>

@class GIDiffFilesViewController;

Expand Down
4 changes: 2 additions & 2 deletions GitUpKit/Components/GIDiffFilesViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#error This file requires ARC
#endif

#import "GIDiffFilesViewController.h"
#import <GitUpKit/GIDiffFilesViewController.h>

#import "GIInterface.h"
#import <GitUpKit/GIInterface.h>
#import "XLFacilityMacros.h"

static const NSPasteboardType GIPasteboardTypeFileRowIndex = @"co.gitup.mac.file-row-index";
Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Components/GISnapshotListViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GIViewController.h"
#import <GitUpKit/GIViewController.h>

@class GISnapshotListViewController, GCSnapshot;

Expand Down
8 changes: 4 additions & 4 deletions GitUpKit/Components/GISnapshotListViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
#error This file requires ARC
#endif

#import "GISnapshotListViewController.h"
#import "GIWindowController.h"
#import <GitUpKit/GISnapshotListViewController.h>
#import <GitUpKit/GIWindowController.h>

#import "GIInterface.h"
#import "GCRepository+Utilities.h"
#import <GitUpKit/GIInterface.h>
#import <GitUpKit/GCRepository+Utilities.h>
#import "XLFacilityMacros.h"

@interface GISnapshotListViewController () <NSTableViewDataSource>
Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Components/GIUnifiedReflogViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GIViewController.h"
#import <GitUpKit/GIViewController.h>

@class GIUnifiedReflogViewController, GCReflogEntry, GCCommit;

Expand Down
4 changes: 2 additions & 2 deletions GitUpKit/Components/GIUnifiedReflogViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#error This file requires ARC
#endif

#import "GIUnifiedReflogViewController.h"
#import <GitUpKit/GIUnifiedReflogViewController.h>

#import "GIInterface.h"
#import <GitUpKit/GIInterface.h>
#import "XLFacilityMacros.h"

@interface GIUnifiedReflogViewController () <NSTableViewDataSource>
Expand Down
4 changes: 2 additions & 2 deletions GitUpKit/Core/GCBranch.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GCReference.h"
#import "GCRepository.h"
#import <GitUpKit/GCReference.h>
#import <GitUpKit/GCRepository.h>

@class GCCommit;

Expand Down
4 changes: 2 additions & 2 deletions GitUpKit/Core/GCCommit.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GCObject.h"
#import "GCRepository.h"
#import <GitUpKit/GCObject.h>
#import <GitUpKit/GCRepository.h>

@interface GCCommit : GCObject
@property(nonatomic, readonly) NSString* message;
Expand Down
60 changes: 30 additions & 30 deletions GitUpKit/Core/GCCore.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,35 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GCBranch.h"
#import "GCCommit.h"
#import "GCCommitDatabase.h"
#import "GCDiff.h"
#import "GCError.h"
#import "GCFoundation.h"
#import "GCFunctions.h"
#import "GCHistory.h"
#import "GCIndex.h"
#import <GitUpKit/GCBranch.h>
#import <GitUpKit/GCCommit.h>
#import <GitUpKit/GCCommitDatabase.h>
#import <GitUpKit/GCDiff.h>
#import <GitUpKit/GCError.h>
#import <GitUpKit/GCFoundation.h>
#import <GitUpKit/GCFunctions.h>
#import <GitUpKit/GCHistory.h>
#import <GitUpKit/GCIndex.h>
#if !TARGET_OS_IPHONE
#import "GCLiveRepository.h"
#import <GitUpKit/GCLiveRepository.h>
#endif
#import "GCMacros.h"
#import "GCObject.h"
#import "GCOrderedSet.h"
#import "GCReference.h"
#import "GCSnapshot.h"
#import "GCReferenceTransform.h"
#import "GCReflogMessages.h"
#import "GCRemote.h"
#import "GCRepository.h"
#import "GCRepository+Bare.h"
#import "GCRepository+Config.h"
#import "GCRepository+HEAD.h"
#import "GCRepository+Mock.h"
#import "GCRepository+Reflog.h"
#import "GCRepository+Reset.h"
#import "GCRepository+Status.h"
#import "GCSQLiteRepository.h"
#import "GCStash.h"
#import "GCSubmodule.h"
#import "GCTag.h"
#import <GitUpKit/GCMacros.h>
#import <GitUpKit/GCObject.h>
#import <GitUpKit/GCOrderedSet.h>
#import <GitUpKit/GCReference.h>
#import <GitUpKit/GCSnapshot.h>
#import <GitUpKit/GCReferenceTransform.h>
#import <GitUpKit/GCReflogMessages.h>
#import <GitUpKit/GCRemote.h>
#import <GitUpKit/GCRepository.h>
#import <GitUpKit/GCRepository+Bare.h>
#import <GitUpKit/GCRepository+Config.h>
#import <GitUpKit/GCRepository+HEAD.h>
#import <GitUpKit/GCRepository+Mock.h>
#import <GitUpKit/GCRepository+Reflog.h>
#import <GitUpKit/GCRepository+Reset.h>
#import <GitUpKit/GCRepository+Status.h>
#import <GitUpKit/GCSQLiteRepository.h>
#import <GitUpKit/GCStash.h>
#import <GitUpKit/GCSubmodule.h>
#import <GitUpKit/GCTag.h>
2 changes: 1 addition & 1 deletion GitUpKit/Core/GCDiff-Tests.m
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#endif

#import "GCTestCase.h"
#import "GCRepository+Index.h"
#import <GitUpKit/GCRepository+Index.h>

@implementation GCSingleCommitRepositoryTests (GCRepository_Diffs)

Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Core/GCDiff.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GCRepository.h"
#import <GitUpKit/GCRepository.h>

typedef NS_ENUM(NSUInteger, GCDiffType) {
kGCDiffType_WorkingDirectoryWithCommit = 0,
Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Core/GCFoundation-Tests.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import <XCTest/XCTest.h>
#import "GCFoundation.h"
#import <GitUpKit/GCFoundation.h>

@interface GCFoundation_Tests : XCTestCase

Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Core/GCFunctions.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GCError.h"
#import <GitUpKit/GCError.h>

#define GC_SET_ERROR(code, ...) \
do { \
Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Core/GCHistory-Tests.m
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#endif

#import "GCTestCase.h"
#import "GCRepository+Index.h"
#import <GitUpKit/GCRepository+Index.h>

@implementation GCSQLiteRepositoryTests (GCHistory)

Expand Down
8 changes: 4 additions & 4 deletions GitUpKit/Core/GCHistory.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GCRepository.h"
#import "GCCommit.h"
#import "GCTag.h"
#import "GCBranch.h"
#import <GitUpKit/GCRepository.h>
#import <GitUpKit/GCCommit.h>
#import <GitUpKit/GCTag.h>
#import <GitUpKit/GCBranch.h>

typedef NS_ENUM(NSUInteger, GCHistorySorting) {
kGCHistorySorting_None = 0,
Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Core/GCIndex.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GCDiff.h"
#import <GitUpKit/GCDiff.h>

// The cases "Both Deleted", "Added by Us" and "Added by Them" are not possible in practice as they are automatically resolved by the trivial merge machinery
// http://permalink.gmane.org/gmane.comp.version-control.git/245661
Expand Down
6 changes: 3 additions & 3 deletions GitUpKit/Core/GCLiveRepository+Conflicts.m
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
// Created by Felix Lapalme on 2024-04-13.
//

#import "GCLiveRepository+Conflicts.h"
#import <GitUpKit/GCLiveRepository+Conflicts.h>

#import "GCRepository+Utilities.h"
#import "GCRepository+HEAD.h"
#import <GitUpKit/GCRepository+Utilities.h>
#import <GitUpKit/GCRepository+HEAD.h>

@implementation GCLiveRepository (Conflicts)

Expand Down
8 changes: 4 additions & 4 deletions GitUpKit/Core/GCLiveRepository-Tests.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

#import <XCTest/XCTest.h>
#import "GCTestCase.h"
#import "GCHistory+Rewrite.h"
#import "GCRepository+Index.h"
#import "GCLiveRepository+Conflicts.h"
#import "GIViewController+Utilities.h"
#import <GitUpKit/GCHistory+Rewrite.h>
#import <GitUpKit/GCRepository+Index.h>
#import <GitUpKit/GCLiveRepository+Conflicts.h>
#import <GitUpKit/GIViewController+Utilities.h>

// block based object that conforms to GCMergeConflictResolver
@interface GCBlockConflictResolver : NSObject <GCMergeConflictResolver>
Expand Down
8 changes: 4 additions & 4 deletions GitUpKit/Core/GCLiveRepository.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GCRepository+Status.h"
#import "GCHistory.h"
#import "GCSnapshot.h"
#import "GCCommitDatabase.h"
#import <GitUpKit/GCRepository+Status.h>
#import <GitUpKit/GCHistory.h>
#import <GitUpKit/GCSnapshot.h>
#import <GitUpKit/GCCommitDatabase.h>

typedef NS_ENUM(NSUInteger, GCLiveRepositoryStatusMode) {
kGCLiveRepositoryStatusMode_Disabled = 0,
Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Core/GCOrderedSet-Tests.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GCTestCase.h"
#import "GCOrderedSet.h"
#import <GitUpKit/GCOrderedSet.h>

@implementation GCMultipleCommitsRepositoryTests (GCOrderedSetTests)

Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Core/GCPrivate.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#import <git2/sys/repository.h>
#pragma clang diagnostic pop

#import "GCCore.h"
#import <GitUpKit/GCCore.h>

#import "XLFacilityMacros.h"

Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Core/GCReference.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GCRepository.h"
#import <GitUpKit/GCRepository.h>

@interface GCReference : NSObject
@property(nonatomic, readonly) GCRepository* repository; // NOT RETAINED
Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Core/GCReferenceTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#import "GCRepository.h"
#import <GitUpKit/GCRepository.h>

@class GCObject, GCCommit;

Expand Down
Loading
Loading