Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Danil Kislov
|
2dc378932a | ||
|
Danil Kislov
|
27cf8416aa | ||
|
Danil Kislov
|
2f1578a695 |
+1
-1
@@ -1 +1 @@
|
||||
1.0.68
|
||||
1.0.71
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace JiraTimeBot.Configuration
|
||||
public int RoundToMinutes { get; set; }
|
||||
|
||||
public string JiraUrl = "https://myteam.aeroclub.ru";
|
||||
|
||||
public bool PullBeforeProcess { get; set; }
|
||||
public string RepositoryPath { get; set; }
|
||||
public string MercurialAuthorEmail { get; set; }
|
||||
public string JiraUserName { get; set; }
|
||||
|
||||
@@ -51,6 +51,19 @@ namespace JiraTimeBot.Mercurial
|
||||
var directoryInfo = new DirectoryInfo(repoDirectory);
|
||||
|
||||
var repo = new Repository(repoDirectory);
|
||||
|
||||
if (settings.PullBeforeProcess)
|
||||
{
|
||||
try
|
||||
{
|
||||
repo.Pull();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_log?.Trace($" - Не получается сделать pull для репозитория: {directoryInfo.Name} - {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
var logCommand = new LogCommand
|
||||
{
|
||||
Date = date,
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("JiraTimeBot")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("JiraTimeBot")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2019")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// 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.68")]
|
||||
[assembly: AssemblyFileVersion("1.0.68")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.68")]
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("JiraTimeBot")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("JiraTimeBot")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2019")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// 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.71")]
|
||||
[assembly: AssemblyFileVersion("1.0.71")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.71")]
|
||||
|
||||
+15
-2
@@ -53,6 +53,7 @@
|
||||
this.txtWorkDayDuration = new System.Windows.Forms.TextBox();
|
||||
this.label9 = new System.Windows.Forms.Label();
|
||||
this.txtRandomMinutes = new System.Windows.Forms.TextBox();
|
||||
this.chkPullBeforeProcess = new System.Windows.Forms.CheckBox();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// label5
|
||||
@@ -168,7 +169,7 @@
|
||||
//
|
||||
// btnSave
|
||||
//
|
||||
this.btnSave.Location = new System.Drawing.Point(86, 359);
|
||||
this.btnSave.Location = new System.Drawing.Point(86, 382);
|
||||
this.btnSave.Name = "btnSave";
|
||||
this.btnSave.Size = new System.Drawing.Size(75, 23);
|
||||
this.btnSave.TabIndex = 32;
|
||||
@@ -272,11 +273,22 @@
|
||||
this.txtRandomMinutes.Size = new System.Drawing.Size(99, 20);
|
||||
this.txtRandomMinutes.TabIndex = 43;
|
||||
//
|
||||
// chkPullBeforeProcess
|
||||
//
|
||||
this.chkPullBeforeProcess.AutoSize = true;
|
||||
this.chkPullBeforeProcess.Location = new System.Drawing.Point(65, 359);
|
||||
this.chkPullBeforeProcess.Name = "chkPullBeforeProcess";
|
||||
this.chkPullBeforeProcess.Size = new System.Drawing.Size(83, 17);
|
||||
this.chkPullBeforeProcess.TabIndex = 45;
|
||||
this.chkPullBeforeProcess.Text = "Делать pull";
|
||||
this.chkPullBeforeProcess.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// frmSettings
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(243, 391);
|
||||
this.ClientSize = new System.Drawing.Size(243, 414);
|
||||
this.Controls.Add(this.chkPullBeforeProcess);
|
||||
this.Controls.Add(this.label9);
|
||||
this.Controls.Add(this.txtRandomMinutes);
|
||||
this.Controls.Add(this.lblWorkDay);
|
||||
@@ -340,5 +352,6 @@
|
||||
private System.Windows.Forms.TextBox txtWorkDayDuration;
|
||||
private System.Windows.Forms.Label label9;
|
||||
private System.Windows.Forms.TextBox txtRandomMinutes;
|
||||
private System.Windows.Forms.CheckBox chkPullBeforeProcess;
|
||||
}
|
||||
}
|
||||
@@ -40,6 +40,7 @@ namespace JiraTimeBot.UI
|
||||
txtJQL.Text = settings.JiraQuery;
|
||||
txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString();
|
||||
txtRandomMinutes.Text = settings.RandomWorkMinutes.ToString();
|
||||
chkPullBeforeProcess.Checked = settings.PullBeforeProcess;
|
||||
|
||||
cboWorkType_SelectedIndexChanged(null, null);
|
||||
}
|
||||
@@ -72,7 +73,8 @@ namespace JiraTimeBot.UI
|
||||
JiraQuery = txtJQL.Text,
|
||||
TimeControlTask = txtTimeControlTask.Text,
|
||||
MinuterPerWorkDay = minuterPerWorkDay,
|
||||
RandomWorkMinutes = randomWorkMinutes
|
||||
RandomWorkMinutes = randomWorkMinutes,
|
||||
PullBeforeProcess = chkPullBeforeProcess.Checked
|
||||
};
|
||||
|
||||
//LockUnlock(false);
|
||||
|
||||
Reference in New Issue
Block a user