8000 Remove deprecated method on GTRepository · libgit2/objective-git@8841ce7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8841ce7

Browse files
tiennoutiennou
committed
Remove deprecated method on GTRepository
1 parent a5ed471 commit 8841ce7

File tree

6 files changed

+34
-32
lines changed

6 files changed

+34
-32
lines changed

‎ObjectiveGit/GTRepository.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,6 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
242242
/// returns nil (and fills the error parameter) if an error occurred, or a GTRepository object if successful.
243243
+ (nullable instancetype)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(nullable NSDictionary *)options error:(NSError **)error transferProgressBlock:(nullable void (^)(const git_transfer_progress *, BOOL *stop))transferProgressBlock;
244244

245-
/// Backward-compatible method that uses `GTRepositoryCloneOptionsCheckout`
246-
+ (nullable instancetype)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(nullable NSDictionary *)options error:(NSError **)error transferProgressBlock:(nullable void (^)(const git_transfer_progress *, BOOL *stop))transferProgressBlock checkoutProgressBlock:(nullable void (^) (NSString *__nullable path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock;
247-
248245
/// Lookup objects in the repo by oid or sha1
249246
- (nullable id)lookUpObjectByOID:(GTOID *)oid objectType:(GTObjectType)type error:(NSError **)error;
250247
- (nullable id)lookUpObjectByOID:(GTOID *)oid error:(NSError **)error;

‎ObjectiveGit/GTRepository.m

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -242,25 +242,6 @@ static int remoteCreate(git_remote **remote, git_repository *repo, const char *n
242242
git_remote_callbacks remoteCallbacks;
243243
};
244244

245-
// Backward-compatibility with GTRepositoryCloneOptionsCheckout boolean
246-
+ (nullable instancetype)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(nullable NSDictionary *)options error:(NSError **)error transferProgressBlock:(nullable void (^)(const git_transfer_progress *, BOOL *stop))transferProgressBlock checkoutProgressBlock:(nullable void (^)(NSString *__nullable path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock {
247-
NSNumber *checkout = options[GTRepositoryCloneOptionsCheckout];
248-
BOOL doCheckout = (checkout == nil ? YES : [checkout boolValue]);
249-
if (doCheckout) {
250-
GTCheckoutOptions *checkoutOptions = nil;
251-
if (checkoutProgressBlock) {
252-
checkoutOptions = [GTCheckoutOptions checkoutOptionsWithStrategy:GTCheckoutStrategySafe progressBlock:checkoutProgressBlock];
253-
} else {
254-
checkoutOptions = [GTCheckoutOptions checkoutOptionsWithStrategy:GTCheckoutStrategySafe];
255-
}
256-
257-
NSMutableDictionary *mutableOptions = [options mutableCopy];
258-
mutableOptions[GTRepositoryCloneCheckoutOptions] = checkoutOptions;
259-
options = mutableOptions;
260-
}
261-
return [self cloneFromURL:originURL toWorkingDirectory:workdirURL options:options error:error transferProgressBlock:transferProgressBlock];
262-
}
263-
264245
+ (nullable instancetype)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(nullable NSDictionary *)options error:(NSError **)error transferProgressBlock:(nullable void (^)(const git_transfer_progress *, BOOL *stop))transferProgressBlock {
265246

266247
git_clone_options cloneOptions = GIT_CLONE_OPTIONS_INIT;

‎ObjectiveGitTests/GTRemotePushSpec.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
// Make a bare clone to serve as the remote
4040
remoteRepoURL = [notBareRepo.gitDirectoryURL.URLByDeletingLastPathComponent URLByAppendingPathComponent:@"bare_remote_repo.git"];
4141
NSDictionary *options = @{ GTRepositoryCloneOptionsBare: @1 };
42-
remoteRepo = [GTRepository cloneFromURL:notBareRepo.gitDirectoryURL toWorkingDirectory:remoteRepoURL options:options error:&error transferProgressBlock:NULL checkoutProgressBlock:NULL];
42+
remoteRepo = [GTRepository cloneFromURL:notBareRepo.gitDirectoryURL toWorkingDirectory:remoteRepoURL options:options error:&error transferProgressBlock:NULL];
4343
expect(error).to(beNil());
4444
expect(remoteRepo).notTo(beNil());
4545
expect(@(remoteRepo.isBare)).to(beTruthy()); // that's better
@@ -48,7 +48,7 @@
4848
expect(localRepoURL).notTo(beNil());
4949

5050
// Local clone for testing pushes
51-
localRepo = [GTRepository cloneFromURL:remoteRepoURL toWorkingDirectory:localRepoURL options:nil error:&error transferProgressBlock:NULL checkoutProgressBlock:NULL];
51+
localRepo = [GTRepository cloneFromURL:remoteRepoURL toWorkingDirectory:localRepoURL options:nil error:&error transferProgressBlock:NULL];
5252

5353
expect(error).to(beNil());
5454
expect(localRepo).notTo(beNil());

‎ObjectiveGitTests/GTRemoteSpec.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
fetchingRepoURL = [fixturesURL URLByAppendingPathComponent:@"fetchrepo"];
108108

109109
NSError *error = nil;
110-
fetchingRepo = [GTRepository cloneFromURL:repositoryURL toWorkingDirectory:fetchingRepoURL options:nil error:&error transferProgressBlock:nil checkoutProgressBlock:nil];
110+
fetchingRepo = [GTRepository cloneFromURL:repositoryURL toWorkingDirectory:fetchingRepoURL options:nil error:&error transferProgressBlock:nil];
111111
expect(fetchingRepo).notTo(beNil());
112112
expect(error).to(beNil());
113113

‎ObjectiveGitTests/GTRepository+PullSpec.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
// Make a bare clone to serve as the remote
4141
remoteRepoURL = [notBareRepo.gitDirectoryURL.URLByDeletingLastPathComponent URLByAppendingPathComponent:@"bare_remote_repo.git"];
4242
NSDictionary *options = @{ GTRepositoryCloneOptionsBare: @1 };
43-
remoteRepo = [GTRepository cloneFromURL:notBareRepo.gitDirectoryURL toWorkingDirectory:remoteRepoURL options:options error:&error transferProgressBlock:NULL checkoutProgressBlock:NULL];
43+
remoteRepo = [GTRepository cloneFromURL:notBareRepo.gitDirectoryURL toWorkingDirectory:remoteRepoURL options:options error:&error transferProgressBlock:NULL];
4444
expect(error).to(beNil());
4545
expect(remoteRepo).notTo(beNil());
4646
expect(@(remoteRepo.isBare)).to(beTruthy()); // that's better
@@ -49,7 +49,7 @@
4949
expect(localRepoURL).notTo(beNil());
5050

5151
// Local clone for testing pushes
52-
localRepo = [GTRepository cloneFromURL:remoteRepoURL toWorkingDirectory:localRepoURL options:nil error:&error transferProgressBlock:NULL checkoutProgressBlock:NULL];
52+
localRepo = [GTRepository cloneFromURL:remoteRepoURL toWorkingDirectory:localRepoURL options:nil error:&error transferProgressBlock:NULL];
5353

5454
expect(error).to(beNil());
5555
expect(localRepo).notTo(beNil());

‎ObjectiveGitTests/GTRepositorySpec.m

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,14 @@
9595

9696
it(@"should handle normal clones", ^{
9797
NSError *error = nil;
98-
repository = [GTRepository cloneFromURL:originURL toWorkingDirectory:workdirURL options:@{ GTRepositoryCloneOptionsCloneLocal: @YES } error:&error transferProgressBlock:transferProgressBlock checkoutProgressBlock:checkoutProgressBlock];
98+
GTCheckoutOptions *checkoutOptions = [GTCheckoutOptions checkoutOptionsWithStrategy:GTCheckoutStrategySafe];
99+
checkoutOptions.progressBlock = checkoutProgressBlock;
100+
101+
NSDictionary *cloneOptions = @{
102+
GTRepositoryCloneOptionsCloneLocal: @YES,
103+
GTRepositoryCloneCheckoutOptions: checkoutOptions,
104+
};
105+
repository = [GTRepository cloneFromURL:originURL toWorkingDirectory:workdirURL options:cloneOptions error:&error transferProgressBlock:transferProgressBlock];
99106
expect(repository).notTo(beNil());
100107
expect(error).to(beNil());
101108
expect(@(transferProgressCalled)).to(beTruthy());
@@ -112,8 +119,15 @@
112119

113120
it(@"should handle bare clones", ^{
114121
NSError *error = nil;
115-
NSDictionary *options = @{ GTRepositoryCloneOptionsBare: @YES, GTRepositoryCloneOptionsCloneLocal: @YES };
116-
repository = [GTRepository cloneFromURL:originURL toWorkingDirectory:workdirURL options:options error:&error transferProgressBlock:transferProgressBlock checkoutProgressBlock:checkoutProgressBlock];
122+
GTCheckoutOptions *checkoutOptions = [GTCheckoutOptions checkoutOptionsWithStrategy:GTCheckoutStrategySafe];
123+
checkoutOptions.progressBlock = checkoutProgressBlock;
124+
125+
NSDictionary *options = @{
126+
GTRepositoryCloneOptionsBare: @YES,
127+
GTRepositoryCloneOptionsCloneLocal: @YES,
128+
GTRepositoryCloneCheckoutOptions: checkoutOptions,
129+
};
130+
repository = [GTRepository cloneFromURL:originURL toWorkingDirectory:workdirURL options:options error:&error transferProgressBlock:transferProgressBlock];
117131
expect(repository).notTo(beNil());
118132
expect(error).to(beNil());
119133
expect(@(transferProgressCalled)).to(beTruthy());
@@ -130,7 +144,10 @@
130144

131145
it(@"should have set a valid remote URL", ^{
132146
NSError *error = nil;
133-
repository = [GTRepository cloneFromURL:originURL toWorkingDirectory:workdirURL options:nil error:&error transferProgressBlock:transferProgressBlock checkoutProgressBlock:checkoutProgressBlock];
147+
GTCheckoutOptions *checkoutOptions = [GTCheckoutOptions checkoutOptionsWithStrategy:GTCheckoutStrategySafe];
148+
checkoutOptions.progressBlock = checkoutProgressBlock;
149+
150+
repository = [GTRepository cloneFromURL:originURL toWorkingDirectory:workdirURL options:@{ GTRepositoryCloneCheckoutOptions: checkoutOptions } error:&error transferProgressBlock:transferProgressBlock];
134151
expect(repository).notTo(beNil());
135152
expect(error).to(beNil());
136153

@@ -167,7 +184,14 @@
167184
return cred;
168185
}];
169186

170-
repository = [GTRepository cloneFromURL:originURL toWorkingDirectory:workdirURL options:@{GTRepositoryCloneOptionsCredentialProvider: provider} error:&error transferProgressBlock:transferProgressBlock checkoutProgressBlock:checkoutProgressBlock];
187+
GTCheckoutOptions *checkoutOptions = [GTCheckoutOptions checkoutOptionsWithStrategy:GTCheckoutStrategySafe];
188+
checkoutOptions.progressBlock = checkoutProgressBlock;
189+
NSDictionary *cloneOptions = @{
190+
GTRepositoryCloneOptionsCredentialProvider: provider,
191+
GTRepositoryCloneCheckoutOptions: checkoutOptions,
192+
};
193+
194+
repository = [GTRepository cloneFromURL:originURL toWorkingDirectory:workdirURL options:cloneOptions error:&error transferProgressBlock:transferProgressBlock];
171195
expect(repository).notTo(beNil());
172196
expect(error).to(beNil());
173197
expect(@(transferProgressCalled)).to(beTruthy());

0 commit comments

Comments
 (0)
0