Pull перед работой

.semver.txt

@@ -1 +1 @@
-1.0.68
+1.0.70

src/JiraTimeBot/Configuration/Settings.cs

@@ -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; }

src/JiraTimeBot/Mercurial/MercurialLog.cs

@@ -51,6 +51,12 @@ namespace JiraTimeBot.Mercurial
                 var directoryInfo = new DirectoryInfo(repoDirectory);
 
                 var repo = new Repository(repoDirectory);
+
+                if (settings.PullBeforeProcess)
+                {
+                    repo.Pull();
+                }
+
                 var logCommand = new LogCommand
                 {
                     Date = date,

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -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.68")] 
-[assembly: AssemblyFileVersion("1.0.68")] 
-[assembly: AssemblyInformationalVersion("1.0.68")] 
+[assembly: AssemblyVersion("1.0.70")] 
+[assembly: AssemblyFileVersion("1.0.70")] 
+[assembly: AssemblyInformationalVersion("1.0.70")] 

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -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;
     }
 }

src/JiraTimeBot/UI/frmSettings.cs

@@ -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);