Skip to content

Commit da46247

Browse files
committed
Characterize staged additions and rename rendering
gitx/gitx#370 gitx/gitx#407 gitx/gitx#282
1 parent b70fe36 commit da46247

2 files changed

Lines changed: 59 additions & 0 deletions

File tree

‎GitXTests/GitXCoreTests.m‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ - (nullable NSString *)patchWithFileHeader:(NSArray<NSString *> *)fileHeader
2323
hunkLines:(NSArray<NSString *> *)hunkLines
2424
selectedIndexes:(NSIndexSet *)selectedIndexes
2525
reverse:(BOOL)reverse;
26+
- (NSString *)pathForDiffHeaderAtIndex:(NSUInteger)headerIndex lines:(NSArray<NSString *> *)lines;
2627
@end
2728

2829
@interface GitXTestRepository : NSObject
@@ -423,6 +424,29 @@ - (void)testCommitGraphDecoratesMergeHistory
423424
XCTAssertGreaterThanOrEqual(maximumColumns, 2, @"A merge should use at least two graph lanes");
424425
}
425426

427+
- (void)testUnchangedSymlinkRenameUsesRenameMetadata
428+
{
429+
NSError *error = nil;
430+
NSString *oldPath = [self.fixture.path stringByAppendingPathComponent:@"linked.json"];
431+
NSString *newPath = [self.fixture.path stringByAppendingPathComponent:@"moved-link.json"];
432+
XCTAssertTrue([[NSFileManager defaultManager] createSymbolicLinkAtPath:oldPath withDestinationPath:@"tracked.txt" error:&error], @"%@", error);
433+
XCTAssertTrue([self.fixture commitAllWithMessage:@"add symlink" error:&error], @"%@", error);
434+
XCTAssertTrue([[NSFileManager defaultManager] moveItemAtPath:oldPath toPath:newPath error:&error], @"%@", error);
435+
XCTAssertTrue([self.fixture commitAllWithMessage:@"rename symlink" error:&error], @"%@", error);
436+
437+
NSString *diff = [self.fixture git:@[ @"diff", @"--find-renames", @"--no-ext-diff", @"HEAD^", @"HEAD" ] error:&error];
438+
XCTAssertNotNil(diff, @"%@", error);
439+
XCTAssertTrue([diff containsString:@"similarity index 100%"]);
440+
XCTAssertTrue([diff containsString:@"rename from linked.json"]);
441+
XCTAssertTrue([diff containsString:@"rename to moved-link.json"]);
442+
XCTAssertFalse([diff containsString:@"deleted file mode"]);
443+
XCTAssertFalse([diff containsString:@"new file mode"]);
444+
445+
PBNativeContentView *view = [[PBNativeContentView alloc] initWithFrame:NSMakeRect(0, 0, 500, 300)];
446+
NSArray<NSString *> *lines = [diff componentsSeparatedByString:@"\n"];
447+
XCTAssertEqualObjects([view pathForDiffHeaderAtIndex:0 lines:lines], @"moved-link.json");
448+
}
449+
426450
@end
427451

428452

@@ -511,6 +535,39 @@ - (void)testRefreshRepresentsPartiallyStagedFileInBothSections
511535
XCTAssertTrue([unstagedDiff containsString:@"+unstaged line"]);
512536
}
513537

538+
- (void)testRefreshDistinguishesPartiallyStagedAdditionFromUntrackedFile
539+
{
540+
NSError *error = nil;
541+
NSString *partiallyStagedPath = @"folder/spaced ünicode.txt";
542+
XCTAssertTrue([self.fixture writeText:@"first staged line\n" toPath:partiallyStagedPath error:&error], @"%@", error);
543+
XCTAssertNotNil(([self.fixture git:@[ @"add", @"--", partiallyStagedPath ] error:&error]), @"%@", error);
544+
XCTAssertTrue([self.fixture writeText:@"first staged line\nsecond unstaged line\n" toPath:partiallyStagedPath error:&error], @"%@", error);
545+
XCTAssertTrue([self.fixture writeText:@"never staged\n" toPath:@"untracked.txt" error:&error], @"%@", error);
546+
[self refreshIndexAfterPerforming:^{
547+
[self.repository.index refresh];
548+
}];
549+
550+
PBChangedFile *partiallyStaged = [self changedFileAtPath:partiallyStagedPath];
551+
XCTAssertNotNil(partiallyStaged);
552+
XCTAssertEqual(partiallyStaged.status, NEW);
553+
XCTAssertTrue(partiallyStaged.hasStagedChanges);
554+
XCTAssertTrue(partiallyStaged.hasUnstagedChanges);
555+
556+
PBChangedFile *untracked = [self changedFileAtPath:@"untracked.txt"];
557+
XCTAssertNotNil(untracked);
558+
XCTAssertEqual(untracked.status, NEW);
559+
XCTAssertFalse(untracked.hasStagedChanges);
560+
XCTAssertTrue(untracked.hasUnstagedChanges);
561+
XCTAssertEqualObjects([self.repository.index diffForFile:untracked staged:NO contextLines:3], @"never staged\n");
562+
563+
NSString *cached = [self.fixture git:@[ @"diff", @"--cached", @"--", partiallyStagedPath ] error:&error];
564+
NSString *working = [self.fixture git:@[ @"diff", @"--", partiallyStagedPath ] error:&error];
565+
XCTAssertTrue([cached containsString:@"+first staged line"]);
566+
XCTAssertFalse([cached containsString:@"second unstaged line"]);
567+
XCTAssertTrue([working containsString:@" first staged line"]);
568+
XCTAssertTrue([working containsString:@"+second unstaged line"]);
569+
}
570+
514571
- (void)testWholeFileUnstageAfterPartialStageIgnoresStaleIndexMetadata
515572
{
516573
NSError *error = nil;

‎GitXTests/GitXFeatureTests.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,8 @@ - (void)testNativeDiffExtractsPathsContainingSpacesAndRenameDestinations
359359
XCTAssertEqualObjects([view pathForDiffHeaderAtIndex:0 lines:spaced], @"Folder/file name.txt");
360360
NSArray *renamed = @[ @"diff --git a/old.txt b/new name.txt", @"similarity index 100%", @"rename from old.txt", @"rename to new name.txt" ];
361361
XCTAssertEqualObjects([view pathForDiffHeaderAtIndex:0 lines:renamed], @"new name.txt");
362+
NSArray *sameInitial = @[ @"diff --git a/app/assets/variables.json b/assets/variables.json", @"similarity index 100%", @"rename from app/assets/variables.json", @"rename to assets/variables.json" ];
363+
XCTAssertEqualObjects([view pathForDiffHeaderAtIndex:0 lines:sameInitial], @"assets/variables.json");
362364
}
363365

364366
- (void)testTaskSupportsShortConfigurableTimeouts

0 commit comments

Comments
 (0)