Skip to content

Commit bfaea24

Browse files
committed
code_style: more clear code for new file patch
Signed-off-by: leo <longshuang@msn.cn>
1 parent 870ca77 commit bfaea24

1 file changed

Lines changed: 15 additions & 6 deletions

File tree

src/Models/DiffResult.cs

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,25 @@ public TextDiffSelection MakeSelection(int startLine, int endLine, bool isCombin
101101

102102
public void GenerateNewPatchFromSelection(string file, string fileBlobGuid, TextDiffSelection selection, bool revert, string output)
103103
{
104-
var isTracked = !string.IsNullOrEmpty(fileBlobGuid);
105-
var fileGuid = isTracked ? fileBlobGuid : "00000000";
106-
107104
using var writer = new StreamWriter(output);
108105
writer.NewLine = "\n";
109106
writer.WriteLine($"diff --git a/{file} b/{file}");
110-
if (!revert && !isTracked)
107+
108+
if (!string.IsNullOrEmpty(fileBlobGuid))
109+
{
110+
writer.WriteLine($"index 00000000...{fileBlobGuid}");
111+
writer.WriteLine($"--- a/{file}");
112+
}
113+
else if (revert)
114+
{
115+
writer.WriteLine($"--- a/{file}");
116+
}
117+
else
118+
{
111119
writer.WriteLine("new file mode 100644");
112-
writer.WriteLine($"index 00000000...{fileGuid}");
113-
writer.WriteLine($"--- {(revert || isTracked ? $"a/{file}" : "/dev/null")}");
120+
writer.WriteLine($"--- /dev/null");
121+
}
122+
114123
writer.WriteLine($"+++ b/{file}");
115124

116125
var additions = selection.EndLine - selection.StartLine;

0 commit comments

Comments
 (0)