Skip to content

Commit c687141

Browse files
pietbrauerpietbrauer
committed
Merge branch 'master' into piet/bitcode
2 parents 9c13681 + c0c4188 commit c687141

File tree

13 files changed

+165
-56
lines changed

13 files changed

+165
-56
lines changed

‎Cartfile.private

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github "jspahrsummers/xcconfigs" >= 0.7.1
2-
github "Quick/Quick" ~> 0.6
3-
github "Quick/Nimble" ~> 2.0
4-
github "ZipArchive/ZipArchive" ~> 0.3
2+
github "Quick/Quick" ~> 0.9.1
3+
github "Quick/Nimble" ~> 3.1
4+
github "ZipArchive/ZipArchive" == 1.0.1

‎Cartfile.resolved

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "Quick/Nimble" "v2.0.0"
2-
github "Quick/Quick" "v0.6.0"
3-
github "ZipArchive/ZipArchive" "v0.3.3"
4-
github "jspahrsummers/xcconfigs" "0.8.1"
1+
github "Quick/Nimble" "v3.1.0"
2+
github "Quick/Quick" "v0.9.1"
3+
github "ZipArchive/ZipArchive" "v1.0.1"
4+
github "jspahrsummers/xcconfigs" "0.9"

‎Carthage/Checkouts/Nimble

Submodule Nimble updated 35 files

‎Carthage/Checkouts/Quick

Submodule Quick updated 109 files

‎Carthage/Checkouts/ZipArchive

Submodule ZipArchive updated 72 files

‎Carthage/Checkouts/xcconfigs

‎ObjectiveGit/GTRepository.h

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,20 @@ extern NSString * const GTRepositoryInitOptionsInitialHEAD;
150150
/// initialization.
151151
extern NSString * const GTRepositoryInitOptionsOriginURLString;
152152

153+
/// The possible states for the repository to be in, based on the current ongoing operation.
154+
typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
155+
GTRepositoryStateNone = GIT_REPOSITORY_STATE_NONE,
156+
GTRepositoryStateMerge = GIT_REPOSITORY_STATE_MERGE,
157+
GTRepositoryStateRevert = GIT_REPOSITORY_STATE_REVERT,
158+
GTRepositoryStateCherryPick = GIT_REPOSITORY_STATE_CHERRYPICK,
159+
GTRepositoryStateBisect = GIT_REPOSITORY_STATE_BISECT,
160+
GTRepositoryStateRebase = GIT_REPOSITORY_STATE_REBASE,
161+
GTRepositoryStateRebaseInteractive = GIT_REPOSITORY_STATE_REBASE_INTERACTIVE,
162+
GTRepositoryStateRebaseMerge = GIT_REPOSITORY_STATE_REBASE_MERGE,
163+
GTRepositoryStateApplyMailbox = GIT_REPOSITORY_STATE_APPLY_MAILBOX,
164+
GTRepositoryStateApplyMailboxOrRebase = GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE,
165+
};
166+
153167
@interface GTRepository : NSObject
154168

155169
/// The file URL for the repository's working directory.
@@ -573,6 +587,23 @@ extern NSString * const GTRepositoryInitOptionsOriginURLString;
573587
/// Returns the enumerator or nil if an error occurred.
574588
- (nullable GTEnumerator *)enumeratorForUniqueCommitsFromOID:(GTOID *)fromOID relativeToOID:(GTOID *)relativeOID error:(NSError **)error;
575589

590+
/// Determines the status of a git repository--i.e., whether an operation
591+
/// (merge, cherry-pick, etc) is in progress.
592+
///
593+
/// state - A pointer to set the retrieved state. Must not be NULL.
594+
/// error - The error if one occurred.
595+
///
596+
/// Returns YES if operation was successful, NO otherwise
597+
- (BOOL)calculateState:(GTRepositoryStateType *)state withError:(NSError **)error;
598+
599+
/// Remove all the metadata associated with an ongoing command like merge,
600+
/// revert, cherry-pick, etc. For example: MERGE_HEAD, MERGE_MSG, etc.
601+
///
602+
/// error - The error if one occurred.
603+
///
604+
/// Returns YES if operation was successful, NO otherwise
605+
- (BOOL)cleanupStateWithError:(NSError **)error;
606+
576607
@end
577608

578609
NS_ASSUME_NONNULL_END

‎ObjectiveGit/GTRepository.m

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,4 +898,25 @@ - (nullable GTEnumerator *)enumeratorForUniqueCommitsFromOID:(GTOID *)fromOID re
898898
return enumerator;
899899
}
900900

901+
- (BOOL)calculateState:(GTRepositoryStateType *)state withError:(NSError **)error {
902+
NSParameterAssert(state != NULL);
903+
904+
int result = git_repository_state(self.git_repository);
905+
if (result < 0) {
906+
if (error != NULL) *error = [NSError git_errorFor:result description:@"Failed to calculate repository state"];
907+
return NO;
908+
}
909+
910+
*state = result;
911+
return YES;
912+
}
913+
914+
- (BOOL)cleanupStateWithError:(NSError * _Nullable __autoreleasing *)error {
915+
int errorCode = git_repository_state_cleanup(self.git_repository);
916+
if (errorCode != GIT_OK) {
917+
if (error != NULL) *error = [NSError git_errorFor:errorCode description:@"Failed to clean up repository state"];
918+
}
919+
return YES;
920+
}
921+
901922
@end

‎ObjectiveGitFramework.xcodeproj/project.pbxproj

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@
6060
2089E43C17D9A58000F451DA /* GTTagSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 2089E43B17D9A58000F451DA /* GTTagSpec.m */; };
6161
20F43DE318A2F668007D3621 /* GTRepository+Blame.h in Headers */ = {isa = PBXBuildFile; fileRef = 20F43DE118A2F667007D3621 /* GTRepository+Blame.h */; settings = {ATTRIBUTES = (Public, ); }; };
6262
20F43DE618A2F668007D3621 /* GTRepository+Blame.m in Sources */ = {isa = PBXBuildFile; fileRef = 20F43DE218A2F667007D3621 /* GTRepository+Blame.m */; };
63+
23BB67B91C7DF3B600A37A66 /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D007801B4F9758009A8DAF /* SSZipArchive.m */; };
64+
23BB67BA1C7DF3BC00A37A66 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007841B4F97F9009A8DAF /* unzip.c */; };
65+
23BB67BC1C7DF45300A37A66 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 23BB67BB1C7DF45300A37A66 /* libz.tbd */; };
66+
23BB67BD1C7DF49500A37A66 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007851B4F97F9009A8DAF /* zip.c */; };
67+
23BB67BE1C7DF4B100A37A66 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007831B4F97F9009A8DAF /* mztools.c */; };
68+
23BB67BF1C7DF4CD00A37A66 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007821B4F97F9009A8DAF /* ioapi.c */; };
69+
23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; };
70+
23BB67C21C7DF60400A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; };
6371
3011D86B1668E48500CE3409 /* GTDiffFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3011D8691668E48500CE3409 /* GTDiffFile.h */; settings = {ATTRIBUTES = (Public, ); }; };
6472
3011D86D1668E48500CE3409 /* GTDiffFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 3011D86A1668E48500CE3409 /* GTDiffFile.m */; };
6573
3011D8711668E78500CE3409 /* GTDiffHunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 3011D86F1668E78500CE3409 /* GTDiffHunk.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -363,7 +371,6 @@
363371
F8D1BDF01B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; };
364372
F8D1BDF11B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; };
365373
F8E4A2911A170CA6006485A8 /* GTRemotePushSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */; };
366-
F8EFA0371B405020000FF7D0 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; };
367374
F8EFA03A1B4059ED000FF7D0 /* GTUtilityFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0391B4059ED000FF7D0 /* GTUtilityFunctions.m */; };
368375
/* End PBXBuildFile section */
369376

@@ -444,6 +451,7 @@
444451
2089E43B17D9A58000F451DA /* GTTagSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTTagSpec.m; sourceTree = "<group>"; };
445452
20F43DE118A2F667007D3621 /* GTRepository+Blame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Blame.h"; sourceTree = "<group>"; };
446453
20F43DE218A2F667007D3621 /* GTRepository+Blame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Blame.m"; sourceTree = "<group>"; };
454+
23BB67BB1C7DF45300A37A66 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
447455
3011D8691668E48500CE3409 /* GTDiffFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTDiffFile.h; sourceTree = "<group>"; };
448456
3011D86A1668E48500CE3409 /* GTDiffFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTDiffFile.m; sourceTree = "<group>"; };
449457
3011D86F1668E78500CE3409 /* GTDiffHunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTDiffHunk.h; sourceTree = "<group>"; };
@@ -648,6 +656,7 @@
648656
isa = PBXFrameworksBuildPhase;
649657
buildActionMask = 2147483647;
650658
files = (
659+
23BB67BC1C7DF45300A37A66 /* libz.tbd in Frameworks */,
651660
D0A0128A19F98475007F1914 /* Quick.framework in Frameworks */,
652661
88F05A9E16011F6E00B7AD1D /* ObjectiveGit.framework in Frameworks */,
653662
D0A0128C19F9853D007F1914 /* Nimble.framework in Frameworks */,
@@ -704,6 +713,7 @@
704713
0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */ = {
705714
isa = PBXGroup;
706715
children = (
716+
23BB67BB1C7DF45300A37A66 /* libz.tbd */,
707717
BDD8AB01130F01AB00CB5D40 /* README.md */,
708718
887B948D1A3A38130070D41D /* ObjectiveGit.modulemap */,
709719
BDE4C05E130EFE2C00851650 /* ObjectiveGit */,
@@ -1387,6 +1397,12 @@
13871397
isa = PBXSourcesBuildPhase;
13881398
buildActionMask = 2147483647;
13891399
files = (
1400+
23BB67BF1C7DF4CD00A37A66 /* ioapi.c in Sources */,
1401+
23BB67BE1C7DF4B100A37A66 /* mztools.c in Sources */,
1402+
23BB67BD1C7DF49500A37A66 /* zip.c in Sources */,
1403+
23BB67BA1C7DF3BC00A37A66 /* unzip.c in Sources */,
1404+
23BB67B91C7DF3B600A37A66 /* SSZipArchive.m in Sources */,
1405+
23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */,
13901406
D0751CD918BE520400134314 /* GTFilterListSpec.m in Sources */,
13911407
200578C518932A82001C06C3 /* GTBlameSpec.m in Sources */,
13921408
4D1C40D8182C006D00BE2960 /* GTBlobSpec.m in Sources */,
@@ -1408,7 +1424,6 @@
14081424
D0AC906C172F941F00347DC4 /* GTRepositorySpec.m in Sources */,
14091425
D01EFDA0195DEF2200838D24 /* NSDataGitSpec.m in Sources */,
14101426
30A269AD17B4878C000FE64E /* GTRepository+StatusSpec.m in Sources */,
1411-
F8EFA0371B405020000FF7D0 /* GTRepository+PullSpec.m in Sources */,
14121427
307623AB17C6C8BD00E2CDF1 /* NSArray+StringArraySpec.m in Sources */,
14131428
8832811F173D8816006D7DCF /* GTIndexSpec.m in Sources */,
14141429
D0F4E28A17C7F24200BBDE30 /* NSErrorGitSpec.m in Sources */,
@@ -1555,6 +1570,7 @@
15551570
F8D007761B4F7D10009A8DAF /* GTTimeAdditionsSpec.m in Sources */,
15561571
F8D007921B4FA03B009A8DAF /* GTIndexSpec.m in Sources */,
15571572
F8D007711B4F7CB0009A8DAF /* NSDataGitSpec.m in Sources */,
1573+
23BB67C21C7DF60400A37A66 /* GTRepository+PullSpec.m in Sources */,
15581574
F8D007A11B4FA03B009A8DAF /* GTRepositoryStashingSpec.m in Sources */,
15591575
F8D007A31B4FA03B009A8DAF /* GTFilterListSpec.m in Sources */,
15601576
F8D0079D1B4FA03B009A8DAF /* GTTreeBuilderSpec.m in Sources */,
@@ -1808,6 +1824,16 @@
18081824
"$(inherited)",
18091825
"$(DEVELOPER_FRAMEWORKS_DIR)",
18101826
);
1827+
GCC_PREPROCESSOR_DEFINITIONS = (
1828+
"DEBUG=1",
1829+
"NOUNCRYPT=1",
1830+
"NOCRYPT=1",
1831+
);
1832+
HEADER_SEARCH_PATHS = (
1833+
External/libgit2/include,
1834+
/usr/local/include,
1835+
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
1836+
);
18111837
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
18121838
MACOSX_DEPLOYMENT_TARGET = 10.9;
18131839
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
@@ -1823,6 +1849,11 @@
18231849
"$(inherited)",
18241850
"$(DEVELOPER_FRAMEWORKS_DIR)",
18251851
);
1852+
HEADER_SEARCH_PATHS = (
1853+
External/libgit2/include,
1854+
/usr/local/include,
1855+
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
1856+
);
18261857
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
18271858
MACOSX_DEPLOYMENT_TARGET = 10.9;
18281859
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
@@ -1892,6 +1923,11 @@
18921923
"$(inherited)",
18931924
"$(DEVELOPER_FRAMEWORKS_DIR)",
18941925
);
1926+
HEADER_SEARCH_PATHS = (
1927+
External/libgit2/include,
1928+
/usr/local/include,
1929+
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
1930+
);
18951931
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
18961932
MACOSX_DEPLOYMENT_TARGET = 10.9;
18971933
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
@@ -2121,6 +2157,11 @@
21212157
"$(inherited)",
21222158
"$(DEVELOPER_FRAMEWORKS_DIR)",
21232159
);
2160+
HEADER_SEARCH_PATHS = (
2161+
External/libgit2/include,
2162+
/usr/local/include,
2163+
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
2164+
);
21242165
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
21252166
MACOSX_DEPLOYMENT_TARGET = 10.9;
21262167
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
@@ -2223,7 +2264,7 @@
22232264
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
22242265
);
22252266
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
2226-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
2267+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
22272268
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
22282269
LIBRARY_SEARCH_PATHS = (
22292270
.,
@@ -2275,7 +2316,7 @@
22752316
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
22762317
);
22772318
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
2278-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
2319+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
22792320
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
22802321
LIBRARY_SEARCH_PATHS = (
22812322
.,
@@ -2328,7 +2369,7 @@
23282369
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
23292370
);
23302371
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
2331-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
2372+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
23322373
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
23332374
LIBRARY_SEARCH_PATHS = (
23342375
.,
@@ -2381,7 +2422,7 @@
23812422
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
23822423
);
23832424
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
2384-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
2425+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
23852426
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
23862427
LIBRARY_SEARCH_PATHS = (
23872428
.,

‎ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ObjectiveGitTests/GTRepository+PullSpec.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
[NSFileManager.defaultManager removeItemAtURL:remoteRepoURL error:NULL];
6969
[NSFileManager.defaultManager removeItemAtURL:localRepoURL error:NULL];
7070
error = NULL;
71-
[self tearDown];
7271
});
7372

7473
context(@"when the local and remote branches are in sync", ^{

‎ObjectiveGitTests/GTRepositorySpec.m

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,44 @@
700700
});
701701
});
702702

703+
describe(@"-calculateState:withError:", ^{
704+
it(@"should find if the repository is mid-merge", ^{
705+
GTRepository *repository = [self conflictedFixtureRepository];
706+
GTRepositoryStateType state;
707+
BOOL result;
708+
result = [repository calculateState:&state withError:NULL];
709+
expect(@(result)).to(beTruthy());
710+
expect(@(state)).to(equal(@(GTRepositoryStateMerge)));
711+
});
712+
713+
it(@"should return none otherwise", ^{
714+
GTRepository *repository = [self testAppFixtureRepository];
715+
GTRepositoryStateType state;
716+
BOOL result;
717+
result = [repository calculateState:&state withError:NULL];
718+
expect(@(result)).to(beTruthy());
719+
expect(@(state)).to(equal(@(GTRepositoryStateNone)));
720+
});
721+
});
722+
723+
describe(@"-cleanupStateWithError:", ^{
724+
it(@"should return a repository to a pre-merge state", ^{
725+
GTRepository *repository = [self conflictedFixtureRepository];
726+
727+
GTRepositoryStateType state;
728+
BOOL result;
729+
result = [repository calculateState:&state withError:NULL];
730+
expect(@(result)).to(beTruthy());
731+
expect(@(state)).to(equal(@(GTRepositoryStateMerge)));
732+
733+
expect(@([repository cleanupStateWithError:NULL])).to(beTruthy());
734+
735+
result = [repository calculateState:&state withError:NULL];
736+
expect(@(result)).to(beTruthy());
737+
expect(@(state)).to(equal(@(GTRepositoryStateNone)));
738+
});
739+
});
740+
703741
afterEach(^{
704742
[self tearDown];
705743
});

0 commit comments

Comments
 (0)