8000 Merge pull request #1567 from libgit2/remove-epoch · apuchkov/libgit2sharp@321ac06 · GitHub
[go: up one dir, main page]
Skip to content

Commit 321ac06

Browse files
ethomsonethomson
authored
Merge pull request libgit2#1567 from libgit2/remove-epoch
Remove Epoch helper class
2 parents 06325a0 + 6be1b51 commit 321ac06

File tree

10 files changed

+11
-135
lines changed

10 files changed

+11
-135
lines changed

‎LibGit2Sharp.Tests/CommitFixture.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,12 +475,12 @@ public void CanReadCommitData()
475475
Assert.NotNull(commit.Author);
476476
Assert.Equal("Scott Chacon", commit.Author.Name);
477477
Assert.Equal("schacon@gmail.com", commit.Author.Email);
478-
Assert.Equal(1273360386, commit.Author.When.ToSecondsSinceEpoch());
478+
Assert.Equal(1273360386, commit.Author.When.ToUnixTimeSeconds());
479479

480480
Assert.NotNull(commit.Committer);
481481
Assert.Equal("Scott Chacon", commit.Committer.Name);
482482
Assert.Equal("schacon@gmail.com", commit.Committer.Email);
483-
Assert.Equal(1273360386, commit.Committer.When.ToSecondsSinceEpoch());
483+
Assert.Equal(1273360386, commit.Committer.When.ToUnixTimeSeconds());
484484

485485
Assert.Equal("181037049a54a1eb5fab404658a3a250b44335d7", commit.Tree.Sha);
486486

@@ -889,9 +889,9 @@ public void CanCorrectlyDistinguishAuthorFromCommitter()
889889
using (var repo = new Repository(path))
890890
{
891891
var author = new Signature("Wilbert van Dolleweerd", "getit@xs4all.nl",
892-
Epoch.ToDateTimeOffset(1244187936, 120));
892+
DateTimeOffset.FromUnixTimeSeconds(1244187936).ToOffset(TimeSpan.FromMinutes(120)));
893893
var committer = new Signature("Henk Westhuis", "Henk_Westhuis@hotmail.com",
894-
Epoch.ToDateTimeOffset(1244286496, 120));
894+
DateTimeOffset.FromUnixTimeSeconds(1244286496).ToOffset(TimeSpan.FromMinutes(120)));
895895

896896
Commit c = repo.Commit("I can haz an author and a committer!", author, committer);
897897

‎LibGit2Sharp.Tests/EpochFixture.cs

Lines changed: 0 additions & 87 deletions
This file was deleted.

‎LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<Compile Include="..\LibGit2Sharp\Core\Epoch.cs" Link="TestHelpers\Epoch.cs" />
2524
<Compile Include="..\LibGit2Sharp\Core\Platform.cs" Link="TestHelpers\Platform.cs" />
2625
<Compile Remove="desktop\**" Condition=" '$(TargetFramework)' != 'net461' " />
2726
</ItemGroup>

‎LibGit2Sharp.Tests/NoteFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace LibGit2Sharp.Tests
1010
public class NoteFixture : BaseFixture
1111
{
1212
private static readonly Signature signatureNullToken = new Signature("nulltoken", "emeric.fermas@gmail.com", DateTimeOffset.UtcNow);
13-
private static readonly Signature signatureYorah = new Signature("yorah", "yoram.harmelin@gmail.com", Epoch.ToDateTimeOffset(1300557894, 60));
13+
private static readonly Signature signatureYorah = new Signature("yorah", "yoram.harmelin@gmail.com", DateTimeOffset.FromUnixTimeSeconds(1300557894).ToOffset(TimeSpan.FromMinutes(60)));
1414

1515
[Fact]
1616
public void RetrievingNotesFromANonExistingGitObjectYieldsNoResult()

‎LibGit2Sharp.Tests/TagFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class TagFixture : BaseFixture
1313
private readonly string[] expectedTags = new[] { "e90810b", "lw", "point_to_blob", "tag_without_tagger", "test", };
1414

1515
private static readonly Signature signatureTim = new Signature("Tim Clem", "timothy.clem@gmail.com", TruncateSubSeconds(DateTimeOffset.UtcNow));
16 628C -
private static readonly Signature signatureNtk = new Signature("nulltoken", "emeric.fermas@gmail.com", Epoch.ToDateTimeOffset(1300557894, 60));
16+
private static readonly Signature signatureNtk = new Signature("nulltoken", "emeric.fermas@gmail.com", DateTimeOffset.FromUnixTimeSeconds(1300557894).ToOffset(TimeSpan.FromMinutes(60)));
1717
private const string tagTestSha = "b25fa35b38051e4ae45d4222e795f9df2e43f1d1";
1818
private const string commitE90810BSha = "e90810b8df3e80c413d903f631643c716887138d";
1919
private const string tagE90810BSha = "7b4384978d2493e851f9cca7858815fac9b10980";

‎LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ static BaseFixture()
5151

5252
protected static DateTimeOffset TruncateSubSeconds(DateTimeOffset dto)
5353
{
54-
int seconds = dto.ToSecondsSinceEpoch();
55-
return Epoch.ToDateTimeOffset(seconds, (int)dto.Offset A93C .TotalMinutes);
54+
var seconds = dto.ToUnixTimeSeconds();
55+
return DateTimeOffset.FromUnixTimeSeconds(seconds).ToOffset(dto.Offset);
5656
}
5757

5858
private static void SetUpTestEnvironment()

‎LibGit2Sharp/Core/Epoch.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎LibGit2Sharp/Core/Proxy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2793,7 +2793,7 @@ public static unsafe SignatureHandle git_signature_new(string name, string email
27932793
{
27942794
git_signature* ptr;
27952795

2796-
int res = NativeMethods.git_signature_new(out ptr, name, email, when.ToSecondsSinceEpoch(),
2796+
int res = NativeMethods.git_signature_new(out ptr, name, email, when.ToUnixTimeSeconds(),
27972797
(int)when.Offset.TotalMinutes);
27982798
Ensure.ZeroResult(res);
27992799

‎LibGit2Sharp/Core/TarWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ public UsTarHeader(
332332

333333
this.mode = Convert.ToString(mode, 8).PadLeft(7, '0');
334334
this.size = size;
335-
unixTime = Convert.ToString(lastModificationTime.ToSecondsSinceEpoch(), 8).PadLeft(11, '0');
335+
unixTime = Convert.ToString(lastModificationTime.ToUnixTimeSeconds(), 8).PadLeft(11, '0');
336336
this.userId = userId.PadLeft(7, '0');
337337
this.groupId = userId.PadLeft(7, '0');
338338
this.userName = userName;

‎LibGit2Sharp/Signature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ internal unsafe Signature(git_signature* sig)
2121
{
2222
name = LaxUtf8Marshaler.FromNative(sig->name);
2323
email = LaxUtf8Marshaler.FromNative(sig->email);
24-
when = Epoch.ToDateTimeOffset(sig->when.time, sig->when.offset);
24+
when = DateTimeOffset.FromUnixTimeSeconds(sig->when.time).ToOffset(TimeSpan.FromMinutes(sig->when.offset));
2525
}
2626

2727
/// <summary>

0 commit comments

Comments
 (0)
0