Еще немного информации в релизах

This commit is contained in:
Danil Kislov
2019-07-02 18:33:08 +03:00
parent 364b23dbca
commit 6f6f7c3424
7 changed files with 54 additions and 45 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.60
1.0.61
@@ -48,9 +48,10 @@ namespace JiraTimeBot.JiraIntegration
{
var item = new TaskTimeItem(issue.Key.Value,
issue.Summary,
1,
TimeSpan.Zero,
issue.Project,
issue.Updated.GetValueOrDefault(date.Value),
TimeSpan.Zero,
1,
1,
CommitType.Task);
workTasks.Add(item);
@@ -60,9 +61,10 @@ namespace JiraTimeBot.JiraIntegration
{
var item = new TaskTimeItem(issue.Key.Value,
issue.Summary,
1,
TimeSpan.Zero,
issue.Project,
issue.Updated.GetValueOrDefault(date.Value),
TimeSpan.Zero,
1,
1,
CommitType.Task);
workTasks.Add(item);
+6 -3
View File
@@ -48,6 +48,8 @@ namespace JiraTimeBot.Mercurial
continue;
}
var directoryInfo = new DirectoryInfo(repoDirectory);
var repo = new Repository(repoDirectory);
var logCommand = new LogCommand
{
@@ -74,9 +76,10 @@ namespace JiraTimeBot.Mercurial
var task = new TaskTimeItem(changeset.Branch,
commitMessage,
1,
TimeSpan.Zero,
directoryInfo.Name,
changeset.Timestamp,
TimeSpan.Zero,
1,
changeset.PathActions.Count,
GetCommitType(changeset.Branch));
@@ -91,7 +94,7 @@ namespace JiraTimeBot.Mercurial
var release = task.Branch.Replace("release", "");
task.Branch = branch;
task.Description = $"Подготовка и публикация версии {release}.";
task.Description = $"Подготовка и публикация версии {task.Project} {release}.";
}
workTasks.Add(task);
_log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
+3 -3
View File
@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.60")]
[assembly: AssemblyFileVersion("1.0.60")]
[assembly: AssemblyInformationalVersion("1.0.60")]
[assembly: AssemblyVersion("1.0.61")]
[assembly: AssemblyFileVersion("1.0.61")]
[assembly: AssemblyInformationalVersion("1.0.61")]
@@ -11,12 +11,14 @@ namespace JiraTimeBot.TaskTime.Objects
public int Commits { get; set; }
public int FilesAffected { get; set; }
public CommitType Type { get; set; }
public string Project { get; set; }
public TaskTimeItem(string branch, string description, int commits, TimeSpan timeSpent, DateTime startTime,
int filesAffected, CommitType type)
public TaskTimeItem(string branch, string description, string project, DateTime startTime, TimeSpan timeSpent, int commits,
int filesAffected = 1, CommitType type = CommitType.Task)
{
Branch = branch;
Description = description;
Project = project;
Commits = commits;
TimeSpent = timeSpent;
StartTime = startTime;
@@ -95,9 +95,10 @@ namespace JiraTimeBot.TaskTime
{
return new TaskTimeItem(timeControlTask,
"Ведение учета времени",
1,
TimeSpan.FromMinutes(minutes),
"Service",
DateTime.Now,
TimeSpan.FromMinutes(minutes),
1,
1,
CommitType.Task);
}
+3 -2
View File
@@ -43,9 +43,10 @@ namespace JiraTimeBot.TaskTime
var taskTimeItem = new TaskTimeItem(
taskGroup.Key,
sb.ToString(),
taskGroup.Sum(f => f.Commits),
timeSpent,
taskGroup.First().Project,
taskGroup.Min(f => f.StartTime),
timeSpent,
taskGroup.Sum(f => f.Commits),
taskGroup.Sum(f => f.FilesAffected),
taskGroup.First().Type);