Skip to content

Commit d1e06fe

Browse files
author
Edward Thomson
committed
Workdir to WorkDir
1 parent e0ce428 commit d1e06fe

File tree

7 files changed

+49
-51
lines changed

7 files changed

+49
-51
lines changed

‎LibGit2Sharp.Tests/StatusFixture.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public void CanRetrieveTheStatusOfAFile()
2121
}
2222

2323
[Theory]
24-
[InlineData(StatusShowOption.IndexAndWorkdir, FileStatus.Untracked)]
25-
[InlineData(StatusShowOption.WorkdirOnly, FileStatus.Untracked)]
24+
[InlineData(StatusShowOption.IndexAndWorkDir, FileStatus.Untracked)]
25+
[InlineData(StatusShowOption.WorkDirOnly, FileStatus.Untracked)]
2626
[InlineData(StatusShowOption.IndexOnly, FileStatus.Nonexistent)]
27-
public void CanLimitStatusToWorkdirOnly(StatusShowOption show, FileStatus expected)
27+
public void CanLimitStatusToWorkDirOnly(StatusShowOption show, FileStatus expected)
2828
{
2929
var clone = CloneStandardTestRepo();
3030

@@ -38,8 +38,8 @@ public void CanLimitStatusToWorkdirOnly(StatusShowOption show, FileStatus expect
3838
}
3939

4040
[Theory]
41-
[InlineData(StatusShowOption.IndexAndWorkdir, FileStatus.Added)]
42-
[InlineData(StatusShowOption.WorkdirOnly, FileStatus.Nonexistent)]
41+
[InlineData(StatusShowOption.IndexAndWorkDir, FileStatus.Added)]
42+
[InlineData(StatusShowOption.WorkDirOnly, FileStatus.Nonexistent)]
4343
[InlineData(StatusShowOption.IndexOnly, FileStatus.Added)]
4444
public void CanLimitStatusToIndexOnly(StatusShowOption show, FileStatus expected)
4545
{
@@ -146,7 +146,7 @@ public void CanRetrieveTheStatusOfTheWholeWorkingDirectory()
146146
}
147147

148148
[Fact]
149-
public void CanRetrieveTheStatusOfRenamedFilesInWorkdir()
149+
public void CanRetrieveTheStatusOfRenamedFilesInWorkDir()
150150
{
151151
string path = CloneStandardTestRepo();
152152
using (var repo = new Repository(path))
@@ -166,11 +166,11 @@ public void CanRetrieveTheStatusOfRenamedFilesInWorkdir()
166166
new StatusOptions()
167167
{
168168
DetectRenamesInIndex = true,
169-
DetectRenamesInWorkdir = true
169+
DetectRenamesInWorkDir = true
170170
});
171171

172-
Assert.Equal(FileStatus.Added | FileStatus.RenamedInWorkdir, status["rename_target.txt"].State);
173-
Assert.Equal(100, status["rename_target.txt"].IndexToWorkdirRenameDetails.Similarity);
172+
Assert.Equal(FileStatus.Added | FileStatus.RenamedInWorkDir, status["rename_target.txt"].State);
173+
Assert.Equal(100, status["rename_target.txt"].IndexToWorkDirRenameDetails.Similarity);
174174
}
175175
}
176176

@@ -215,13 +215,13 @@ public void CanDetectedVariousKindsOfRenaming()
215215
var opts = new StatusOptions
216216
{
217217
DetectRenamesInIndex = true,
218-
DetectRenamesInWorkdir = true
218+
DetectRenamesInWorkDir = true
219219
};
220220

221221
RepositoryStatus status = repo.Index.RetrieveStatus(opts);
222222

223223
// This passes as expected
224-
Assert.Equal(FileStatus.RenamedInWorkdir, status.Single().State);
224+
Assert.Equal(FileStatus.RenamedInWorkDir, status.Single().State);
225225

226226
repo.Index.Stage("file.txt");
227227
repo.Index.Stage("renamed.txt");
@@ -235,7 +235,7 @@ public void CanDetectedVariousKindsOfRenaming()
235235

236236
status = repo.Index.RetrieveStatus(opts);
237237

238-
Assert.Equal(FileStatus.RenamedInWorkdir | FileStatus.RenamedInIndex,
238+
Assert.Equal(FileStatus.RenamedInWorkDir | FileStatus.RenamedInIndex,
239239
status.Single().State);
240240
}
241241
}

‎LibGit2Sharp/Core/GitStatusEntry.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ internal class GitStatusEntry
2525
/// <summary>
2626
/// The difference between the <see cref = "Repository.Index" /> and the working directory.
2727
/// </summary>
28-
public IntPtr IndexToWorkdirPtr;
28+
public IntPtr IndexToWorkDirPtr;
2929
}
3030
}

‎LibGit2Sharp/Core/GitStatusOptions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ public void Dispose()
2929

3030
internal enum GitStatusShow
3131
{
32-
IndexAndWorkdir = 0,
32+
IndexAndWorkDir = 0,
3333
IndexOnly = 1,
34-
WorkdirOnly = 2,
34+
WorkDirOnly = 2,
3535
}
3636

3737
[Flags]
@@ -45,7 +45,7 @@ internal enum GitStatusOptionFlags
4545
DisablePathspecMatch = (1 << 5),
4646
RecurseIgnoredDirs = (1 << 6),
4747
RenamesHeadToIndex = (1 << 7),
48-
RenamesIndexToWorkdir = (1 << 8),
48+
RenamesIndexToWorkDir = (1 << 8),
4949
SortCaseSensitively = (1 << 9),
5050
SortCaseInsensitively = (1 << 10),
5151
RenamesFromRewrites = (1 << 11),

‎LibGit2Sharp/FileStatus.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public enum FileStatus
6666
/// <summary>
6767
/// The file has been renamed in the working directory. The previous version at the previous name exists in the Index.
6868
/// </summary>
69-
RenamedInWorkdir = (1 << 11), /* GIT_STATUS_WT_RENAMED */
69+
RenamedInWorkDir = (1 << 11), /* GIT_STATUS_WT_RENAMED */
7070

7171
/// <summary>
7272
/// The file is <see cref="Untracked"/> but its name and/or path matches an exclude pattern in a <c>gitignore</c> file.

‎LibGit2Sharp/RepositoryStatus.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class RepositoryStatus : IEnumerable<StatusEntry>
2727
private readonly List<StatusEntry> untracked = new List<StatusEntry>();
2828
private readonly List<StatusEntry> ignored = new List<StatusEntry>();
2929
private readonly List<StatusEntry> renamedInIndex = new List<StatusEntry>();
30-
private readonly List<StatusEntry> renamedInWorkdir = new List<StatusEntry>();
30+
private readonly List<StatusEntry> renamedInWorkDir = new List<StatusEntry>();
3131
private readonly bool isDirty;
3232

3333
private readonly IDictionary<FileStatus, Action<RepositoryStatus, StatusEntry>> dispatcher = Build();
@@ -44,7 +44,7 @@ private static IDictionary<FileStatus, Action<RepositoryStatus, StatusEntry>> Bu
4444
{ FileStatus.Removed, (rs, s) => rs.removed.Add(s) },
4545
{ FileStatus.RenamedInIndex, (rs, s) => rs.renamedInIndex.Add(s) },
4646
{ FileStatus.Ignored, (rs, s) => rs.ignored.Add(s) },
47-
{ FileStatus.RenamedInWorkdir, (rs, s) => rs.renamedInWorkdir.Add(s) }
47+
{ FileStatus.RenamedInWorkDir, (rs, s) => rs.renamedInWorkDir.Add(s) }
4848
};
4949
}
5050

@@ -75,10 +75,10 @@ internal RepositoryStatus(Repository repo, StatusOptions options)
7575
GitStatusOptionFlags.RenamesFromRewrites;
7676
}
7777

78-
if (options != null && options.DetectRenamesInWorkdir)
78+
if (options != null && options.DetectRenamesInWorkDir)
7979
{
8080
gitOptions.Flags |=
81-
GitStatusOptionFlags.RenamesIndexToWorkdir |
81+
GitStatusOptionFlags.RenamesIndexToWorkDir |
8282
GitStatusOptionFlags.RenamesFromRewrites;
8383
}
8484

@@ -93,18 +93,18 @@ internal RepositoryStatus(Repository repo, StatusOptions options)
9393
GitStatusEntry entry = e.MarshalAsGitStatusEntry();
9494

9595
GitDiffDelta deltaHeadToIndex = null;
96-
GitDiffDelta deltaIndexToWorkdir = null;
96+
GitDiffDelta deltaIndexToWorkDir = null;
9797

9898
if (entry.HeadToIndexPtr != IntPtr.Zero)
9999
{
100100
deltaHeadToIndex = (GitDiffDelta)Marshal.PtrToStructure(entry.HeadToIndexPtr, typeof(GitDiffDelta));
101101
}
102-
if (entry.IndexToWorkdirPtr != IntPtr.Zero)
102+
if (entry.IndexToWorkDirPtr != IntPtr.Zero)
103103
{
104-
deltaIndexToWorkdir = (GitDiffDelta)Marshal.PtrToStructure(entry.IndexToWorkdirPtr, typeof(GitDiffDelta));
104+
deltaIndexToWorkDir = (GitDiffDelta)Marshal.PtrToStructure(entry.IndexToWorkDirPtr, typeof(GitDiffDelta));
105105
}
106106

107-
AddStatusEntryForDelta(entry.Status, deltaHeadToIndex, deltaIndexToWorkdir);
107+
AddStatusEntryForDelta(entry.Status, deltaHeadToIndex, deltaIndexToWorkDir);
108108
}
109109

110110
isDirty = statusEntries.Any(entry => entry.State != FileStatus.Ignored);
@@ -115,10 +115,10 @@ internal RepositoryStatus(Repository repo, StatusOptions options)
115115
}
116116
}
117117

118-
private void AddStatusEntryForDelta(FileStatus gitStatus, GitDiffDelta deltaHeadToIndex, GitDiffDelta deltaIndexToWorkdir)
118+
private void AddStatusEntryForDelta(FileStatus gitStatus, GitDiffDelta deltaHeadToIndex, GitDiffDelta deltaIndexToWorkDir)
119119
{
120120
RenameDetails headToIndexRenameDetails = null;
121-
RenameDetails indexToWorkdirRenameDetails = null;
121+
RenameDetails indexToWorkDirRenameDetails = null;
122122

123123
if ((gitStatus & FileStatus.RenamedInIndex) == FileStatus.RenamedInIndex)
124124
{
@@ -128,19 +128,19 @@ private void AddStatusEntryForDelta(FileStatus gitStatus, GitDiffDelta deltaHead
128128
(int)deltaHeadToIndex.Similarity);
129129
}
130130

131-
if ((gitStatus & FileStatus.RenamedInWorkdir) == FileStatus.RenamedInWorkdir)
131+
if ((gitStatus & FileStatus.RenamedInWorkDir) == FileStatus.RenamedInWorkDir)
132132
{
133-
indexToWorkdirRenameDetails = new RenameDetails(
134-
LaxFilePathMarshaler.FromNative(deltaIndexToWorkdir.OldFile.Path).Native,
135-
LaxFilePathMarshaler.FromNative(deltaIndexToWorkdir.NewFile.Path).Native,
136-
(int)deltaIndexToWorkdir.Similarity);
133+
indexToWorkDirRenameDetails = new RenameDetails(
134+
LaxFilePathMarshaler.FromNative(deltaIndexToWorkDir.OldFile.Path).Native,
135+
LaxFilePathMarshaler.FromNative(deltaIndexToWorkDir.NewFile.Path).Native,
136+
(int)deltaIndexToWorkDir.Similarity);
137137
}
138138

139-
var filePath = (deltaIndexToWorkdir != null) ?
140-
LaxFilePathMarshaler.FromNative(deltaIndexToWorkdir.NewFile.Path).Native :
139+
var filePath = (deltaIndexToWorkDir != null) ?
140+
LaxFilePathMarshaler.FromNative(deltaIndexToWorkDir.NewFile.Path).Native :
141141
LaxFilePathMarshaler.FromNative(deltaHeadToIndex.NewFile.Path).Native;
142142

143-
StatusEntry statusEntry = new StatusEntry(filePath, gitStatus, headToIndexRenameDetails, indexToWorkdirRenameDetails);
143+
StatusEntry statusEntry = new StatusEntry(filePath, gitStatus, headToIndexRenameDetails, indexToWorkDirRenameDetails);
144144

145145
foreach (KeyValuePair<FileStatus, Action<RepositoryStatus, StatusEntry>> kvp in dispatcher)
146146
{
@@ -262,9 +262,9 @@ public virtual IEnumerable<StatusEntry> RenamedInIndex
262262
/// <summary>
263263
/// List of files that were renamed in the working directory but have not been staged.
264264
/// </summary>
265-
public virtual IEnumerable<StatusEntry> RenamedInWorkdir
265+
public virtual IEnumerable<StatusEntry> RenamedInWorkDir
266266
{
267-
get { return renamedInWorkdir; }
267+
get { return renamedInWorkDir; }
268268
}
269269

270270
/// <summary>

‎LibGit2Sharp/StatusEntry.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ public class StatusEntry : IEquatable<StatusEntry>
1313
private readonly string filePath;
1414
private readonly FileStatus state;
1515
private readonly RenameDetails headToIndexRenameDetails;
16-
private readonly RenameDetails indexToWorkdirRenameDetails;
16+
private readonly RenameDetails indexToWorkDirRenameDetails;
1717

1818
private static readonly LambdaEqualityHelper<StatusEntry> equalityHelper =
19-
new LambdaEqualityHelper<StatusEntry>(x => x.FilePath, x => x.State, x => x.HeadToIndexRenameDetails, x => x.IndexToWorkdirRenameDetails);
19+
new LambdaEqualityHelper<StatusEntry>(x => x.FilePath, x => x.State, x => x.HeadToIndexRenameDetails, x => x.IndexToWorkDirRenameDetails);
2020

2121
/// <summary>
2222
/// Needed for mocking purposes.
2323
/// </summary>
2424
protected StatusEntry()
2525
{ }
2626

27-
internal StatusEntry(string filePath, FileStatus state, RenameDetails headToIndexRenameDetails = null, RenameDetails indexToWorkdirRenameDetails = null)
27+
internal StatusEntry(string filePath, FileStatus state, RenameDetails headToIndexRenameDetails = null, RenameDetails indexToWorkDirRenameDetails = null)
2828
{
2929
this.filePath = filePath;
3030
this.state = state;
3131
this.headToIndexRenameDetails = headToIndexRenameDetails;
32-
this.indexToWorkdirRenameDetails = indexToWorkdirRenameDetails;
32+
this.indexToWorkDirRenameDetails = indexToWorkDirRenameDetails;
3333
}
3434

3535
/// <summary>
@@ -57,11 +57,11 @@ public virtual RenameDetails HeadToIndexRenameDetails
5757
}
5858

5959
/// <summary>
60-
/// Gets the rename details from the Index to the working directory, if this <see cref="FileStatus"/> contains <see cref="FileStatus.RenamedInWorkdir"/>
60+
/// Gets the rename details from the Index to the working directory, if this <see cref="FileStatus"/> contains <see cref="FileStatus.RenamedInWorkDir"/>
6161
/// </summary>
62-
public virtual RenameDetails IndexToWorkdirRenameDetails
62+
public virtual RenameDetails IndexToWorkDirRenameDetails
6363
{
64-
get { return indexToWorkdirRenameDetails; }
64+
get { return indexToWorkDirRenameDetails; }
6565
}
6666

6767
/// <summary>
@@ -120,10 +120,10 @@ private string DebuggerDisplay
120120
get
121121
{
122122
if ((State & FileStatus.RenamedInIndex) == FileStatus.RenamedInIndex ||
123-
(State & FileStatus.RenamedInWorkdir) == FileStatus.RenamedInWorkdir)
123+
(State & FileStatus.RenamedInWorkDir) == FileStatus.RenamedInWorkDir)
124124
{
125125
string oldFilePath = ((State & FileStatus.RenamedInIndex) == FileStatus.RenamedInIndex) ?
126-
HeadToIndexRenameDetails.OldFilePath : IndexToWorkdirRenameDetails.OldFilePath;
126+
HeadToIndexRenameDetails.OldFilePath : IndexToWorkDirRenameDetails.OldFilePath;
127127

128128
return string.Format("{0}: {1} -> {2}", State, oldFilePath, FilePath);
129129
}

‎LibGit2Sharp/StatusOptions.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public enum StatusShowOption
1313
/// <summary>
1414
/// Both the index and working directory are examined for changes
1515
/// </summary>
16-
IndexAndWorkdir = 0,
16+
IndexAndWorkDir = 0,
1717

1818
/// <summary>
1919
/// Only the index is examined for changes
@@ -23,7 +23,7 @@ public enum StatusShowOption
2323
/// <summary>
2424
/// Only the working directory is examined for changes
2525
/// </summary>
26-
WorkdirOnly = 2
26+
WorkDirOnly = 2
2727
}
2828

2929
/// <summary>
@@ -36,8 +36,6 @@ public class StatusOptions
3636
/// </summary>
3737
public StatusOptions()
3838
{
39-
Show = StatusShowOption.IndexAndWorkdir;
40-
4139
DetectRenamesInIndex = true;
4240
}
4341

@@ -54,6 +52,6 @@ public StatusOptions()
5452
/// <summary>
5553
/// Examine unstaged changes in the working directory for renames.
5654
/// </summary>
57-
public virtual bool DetectRenamesInWorkdir { get; set; }
55+
public virtual bool DetectRenamesInWorkDir { get; set; }
5856
}
5957
}

0 commit comments

Comments
 (0)