GitUI/Abort.cs GitUI/FileHelper.cs @@ -391,6 +391,64 @@ namespace GitCommands return unmergedFiles; } + static public bool HandleConflice_SelectBase(string fileName) + { + if (HandeConflicts_SaveSide(fileName, fileName, "1")) + { + GitCommands.RunCmd(Settings.GitDir + "git.cmd", "add -- \"" + fileName + "\""); + return true; + } + return false; + } + + static public bool HandleConflice_SelectLocal(string fileName) + { + if (HandeConflicts_SaveSide(fileName, fileName, "2")) + { + GitCommands.RunCmd(Settings.GitDir + "git.cmd", "add -- \"" + fileName + "\""); + return true; + } + return false; + } + + static public bool HandleConflice_SelectRemote(string fileName) + { + if (HandeConflicts_SaveSide(fileName, fileName, "3")) + { + GitCommands.RunCmd(Settings.GitDir + "git.cmd", "add -- \"" + fileName + "\""); + return true; + } + return false; + } + + public static bool HandeConflicts_SaveSide(string fileName, string saveAs, string side) + { + if (side.Equals("REMOTE", StringComparison.CurrentCultureIgnoreCase)) + side = "3"; + if (side.Equals("LOCAL", StringComparison.CurrentCultureIgnoreCase)) + side = "2"; + if (side.Equals("BASE", StringComparison.CurrentCultureIgnoreCase)) + side = "1"; + + fileName = FixPath(fileName); + string[] unmerged = RunCmd(Settings.GitDir + "git.cmd", "ls-files --unmerged \"" + fileName + "\"").Split('\n'); + + foreach (string file in unmerged) + { + string[] fileline = file.Split(new char[] { ' ', '\t' }); + if (fileline.Length < 3) + continue; + if (fileline[2].Trim() == side) + { + RunCmd(Settings.GitDir + "git.cmd", "cat-file blob \"" + fileline[1] + "\" > \"" + saveAs + "\""); + + return true; + } + } + + return false; + } + static public string GetConflictedFiles(string filename) { filename = FixPath(filename); GitCommands/GitCommands/Git/GitCommands.cs @@ -448,6 +448,8 @@ namespace GitUI string fileName = ((GitItem)item).FileName; if (fileName.Contains("\\") && fileName.LastIndexOf("\\") < fileName.Length) fileName = fileName.Substring(fileName.LastIndexOf('\\') + 1); + if (fileName.Contains("/") && fileName.LastIndexOf("/") < fileName.Length) + fileName = fileName.Substring(fileName.LastIndexOf('/') + 1); fileName = Path.GetTempPath() + fileName; GitCommands.GitCommands.RunCmd(Settings.GitDir + "git.cmd", "cat-file blob \"" + ((GitItem)item).Guid + "\" > \"" + fileName + "\""); @@ -465,6 +467,8 @@ namespace GitUI string fileName = ((GitItem)item).FileName; if (fileName.Contains("\\") && fileName.LastIndexOf("\\") < fileName.Length) fileName = fileName.Substring(fileName.LastIndexOf('\\') + 1); + if (fileName.Contains("/") && fileName.LastIndexOf("/") < fileName.Length) + fileName = fileName.Substring(fileName.LastIndexOf('/') + 1); fileName = Path.GetTempPath() + fileName; GitCommands.GitCommands.RunCmd(Settings.GitDir + "git.cmd", "cat-file blob \"" + ((GitItem)item).Guid + "\" > \"" + fileName + "\""); GitUI/Browse.cs @@ -566,7 +566,7 @@ this.Reset.Name = "Reset"; this.Reset.Size = new System.Drawing.Size(128, 23); this.Reset.TabIndex = 5; - this.Reset.Text = "Reset changed HARD"; + this.Reset.Text = "Reset changed"; this.Reset.UseVisualStyleBackColor = true; this.Reset.Click += new System.EventHandler(this.Reset_Click); // GitUI/Commit.Designer.cs @@ -278,14 +278,12 @@ namespace GitUI private void Reset_Click(object sender, EventArgs e) { - if (MessageBox.Show("Are you sure you want to reset all changes in the working dir?" + Environment.NewLine + "All changes made to all files in the workin dir will be overwritten by the files from the current HEAD!", "WARNING!", MessageBoxButtons.YesNo) == DialogResult.Yes) + if (Abort.AbortCurrentAction()) { - if (MessageBox.Show("Are you really sure you want to DELETE all changes?", "WARNING! WARNING!", MessageBoxButtons.YesNo) == DialogResult.Yes) - { - OutPut.Text = GitCommands.GitCommands.ResetHard(""); - Initialize(); - } + Initialize(); + NeedRefresh = true; } + } private void UnstageFiles_Click(object sender, EventArgs e) GitUI/Commit.cs @@ -255,22 +255,7 @@ namespace GitUI public bool IsBinaryFile(string fileName) { - return (fileName.EndsWith(".png", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".jpg", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".bmp", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".jpeg", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".ico", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".tif", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".tiff", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".exe", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".gif", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".mpg", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".mpeg", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".pdf", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".doc", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".vsd", StringComparison.CurrentCultureIgnoreCase) || - fileName.EndsWith(".avi", StringComparison.CurrentCultureIgnoreCase)); + return FileHelper.IsBinaryFile(fileName); } public void ViewGitItemRevision(string fileName, string guid) GitUI/FileViewer.cs @@ -31,16 +31,35 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormResolveConflicts)); this.ConflictedFiles = new System.Windows.Forms.DataGridView(); + this.ConflictedFilesContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.OpenMergetool = new System.Windows.Forms.ToolStripMenuItem(); + this.ContextMarkAsSolved = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.ContextChooseBase = new System.Windows.Forms.ToolStripMenuItem(); + this.ContextChooseLocal = new System.Windows.Forms.ToolStripMenuItem(); + this.ContextChooseRemote = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.ContextOpenBaseWith = new System.Windows.Forms.ToolStripMenuItem(); + this.ContextOpenLocalWith = new System.Windows.Forms.ToolStripMenuItem(); + this.ContextOpenRemoteWith = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.ContextSaveBaseAs = new System.Windows.Forms.ToolStripMenuItem(); + this.ContextSaveLocalAs = new System.Windows.Forms.ToolStripMenuItem(); + this.ContextSaveRemoteAs = new System.Windows.Forms.ToolStripMenuItem(); this.gitItemBindingSource = new System.Windows.Forms.BindingSource(this.components); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.label1 = new System.Windows.Forms.Label(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.button1 = new System.Windows.Forms.Button(); - this.Rescan = new System.Windows.Forms.Button(); this.Mergetool = new System.Windows.Forms.Button(); + this.Rescan = new System.Windows.Forms.Button(); + this.Reset = new System.Windows.Forms.Button(); this.colorDialog1 = new System.Windows.Forms.ColorDialog(); this.Namex = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.SolveConflictButton = new System.Windows.Forms.DataGridViewButtonColumn(); ((System.ComponentModel.ISupportInitialize)(this.ConflictedFiles)).BeginInit(); + this.ConflictedFilesContextMenu.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gitItemBindingSource)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -48,6 +67,9 @@ this.splitContainer2.Panel1.SuspendLayout(); this.splitContainer2.Panel2.SuspendLayout(); this.splitContainer2.SuspendLayout(); + this.splitContainer3.Panel1.SuspendLayout(); + this.splitContainer3.Panel2.SuspendLayout(); + this.splitContainer3.SuspendLayout(); this.SuspendLayout(); // // ConflictedFiles @@ -58,7 +80,9 @@ this.ConflictedFiles.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.ConflictedFiles.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.ConflictedFiles.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Namex}); + this.Namex, + this.SolveConflictButton}); + this.ConflictedFiles.ContextMenuStrip = this.ConflictedFilesContextMenu; this.ConflictedFiles.DataSource = this.gitItemBindingSource; this.ConflictedFiles.Dock = System.Windows.Forms.DockStyle.Fill; this.ConflictedFiles.Location = new System.Drawing.Point(0, 0); @@ -67,9 +91,123 @@ this.ConflictedFiles.ReadOnly = true; this.ConflictedFiles.RowHeadersVisible = false; this.ConflictedFiles.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.ConflictedFiles.Size = new System.Drawing.Size(441, 226); + this.ConflictedFiles.Size = new System.Drawing.Size(596, 245); this.ConflictedFiles.TabIndex = 0; this.ConflictedFiles.DoubleClick += new System.EventHandler(this.ConflictedFiles_DoubleClick); + this.ConflictedFiles.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.ConflictedFiles_CellMouseDown); + this.ConflictedFiles.SelectionChanged += new System.EventHandler(this.ConflictedFiles_SelectionChanged); + // + // ConflictedFilesContextMenu + // + this.ConflictedFilesContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.OpenMergetool, + this.ContextMarkAsSolved, + this.toolStripSeparator3, + this.ContextChooseBase, + this.ContextChooseLocal, + this.ContextChooseRemote, + this.toolStripSeparator1, + this.ContextOpenBaseWith, + this.ContextOpenLocalWith, + this.ContextOpenRemoteWith, + this.toolStripSeparator2, + this.ContextSaveBaseAs, + this.ContextSaveLocalAs, + this.ContextSaveRemoteAs}); + this.ConflictedFilesContextMenu.Name = "ConflictedFilesContextMenu"; + this.ConflictedFilesContextMenu.Size = new System.Drawing.Size(196, 264); + // + // OpenMergetool + // + this.OpenMergetool.Name = "OpenMergetool"; + this.OpenMergetool.Size = new System.Drawing.Size(195, 22); + this.OpenMergetool.Text = "Open in mergetool"; + this.OpenMergetool.Click += new System.EventHandler(this.OpenMergetool_Click); + // + // ContextMarkAsSolved + // + this.ContextMarkAsSolved.Name = "ContextMarkAsSolved"; + this.ContextMarkAsSolved.Size = new System.Drawing.Size(195, 22); + this.ContextMarkAsSolved.Text = "Mark conlfict as solved"; + this.ContextMarkAsSolved.Click += new System.EventHandler(this.ContextMarkAsSolved_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(192, 6); + // + // ContextChooseBase + // + this.ContextChooseBase.Name = "ContextChooseBase"; + this.ContextChooseBase.Size = new System.Drawing.Size(195, 22); + this.ContextChooseBase.Text = "Choose base"; + this.ContextChooseBase.Click += new System.EventHandler(this.ContextChooseBase_Click); + // + // ContextChooseLocal + // + this.ContextChooseLocal.Name = "ContextChooseLocal"; + this.ContextChooseLocal.Size = new System.Drawing.Size(195, 22); + this.ContextChooseLocal.Text = "Choose local"; + this.ContextChooseLocal.Click += new System.EventHandler(this.ContextChooseLocal_Click); + // + // ContextChooseRemote + // + this.ContextChooseRemote.Name = "ContextChooseRemote"; + this.ContextChooseRemote.Size = new System.Drawing.Size(195, 22); + this.ContextChooseRemote.Text = "Choose remote"; + this.ContextChooseRemote.Click += new System.EventHandler(this.ContextChooseRemote_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); + // + // ContextOpenBaseWith + // + this.ContextOpenBaseWith.Name = "ContextOpenBaseWith"; + this.ContextOpenBaseWith.Size = new System.Drawing.Size(195, 22); + this.ContextOpenBaseWith.Text = "Open base with"; + this.ContextOpenBaseWith.Click += new System.EventHandler(this.ContextOpenBaseWith_Click); + // + // ContextOpenLocalWith + // + this.ContextOpenLocalWith.Name = "ContextOpenLocalWith"; + this.ContextOpenLocalWith.Size = new System.Drawing.Size(195, 22); + this.ContextOpenLocalWith.Text = "Open local with"; + this.ContextOpenLocalWith.Click += new System.EventHandler(this.ContextOpenLocalWith_Click); + // + // ContextOpenRemoteWith + // + this.ContextOpenRemoteWith.Name = "ContextOpenRemoteWith"; + this.ContextOpenRemoteWith.Size = new System.Drawing.Size(195, 22); + this.ContextOpenRemoteWith.Text = "Open remote with"; + this.ContextOpenRemoteWith.Click += new System.EventHandler(this.ContextOpenRemoteWith_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(192, 6); + // + // ContextSaveBaseAs + // + this.ContextSaveBaseAs.Name = "ContextSaveBaseAs"; + this.ContextSaveBaseAs.Size = new System.Drawing.Size(195, 22); + this.ContextSaveBaseAs.Text = "Save base as"; + this.ContextSaveBaseAs.Click += new System.EventHandler(this.ContextSaveBaseAs_Click); + // + // ContextSaveLocalAs + // + this.ContextSaveLocalAs.Name = "ContextSaveLocalAs"; + this.ContextSaveLocalAs.Size = new System.Drawing.Size(195, 22); + this.ContextSaveLocalAs.Text = "Save local as"; + this.ContextSaveLocalAs.Click += new System.EventHandler(this.ContextSaveLocalAs_Click); + // + // ContextSaveRemoteAs + // + this.ContextSaveRemoteAs.Name = "ContextSaveRemoteAs"; + this.ContextSaveRemoteAs.Size = new System.Drawing.Size(195, 22); + this.ContextSaveRemoteAs.Text = "Save remote as"; + this.ContextSaveRemoteAs.Click += new System.EventHandler(this.ContextSaveRemoteAs_Click); // // gitItemBindingSource // @@ -88,11 +226,9 @@ // // splitContainer1.Panel2 // - this.splitContainer1.Panel2.Controls.Add(this.button1); - this.splitContainer1.Panel2.Controls.Add(this.Rescan); - this.splitContainer1.Panel2.Controls.Add(this.Mergetool); - this.splitContainer1.Size = new System.Drawing.Size(576, 255); - this.splitContainer1.SplitterDistance = 441; + this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); + this.splitContainer1.Size = new System.Drawing.Size(732, 274); + this.splitContainer1.SplitterDistance = 596; this.splitContainer1.TabIndex = 1; // // splitContainer2 @@ -110,7 +246,7 @@ // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.ConflictedFiles); - this.splitContainer2.Size = new System.Drawing.Size(441, 255); + this.splitContainer2.Size = new System.Drawing.Size(596, 274); this.splitContainer2.SplitterDistance = 25; this.splitContainer2.TabIndex = 0; // @@ -119,23 +255,54 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(4, 4); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(273, 13); + this.label1.Size = new System.Drawing.Size(135, 13); this.label1.TabIndex = 0; - this.label1.Text = "Unresolved merge conflicts (doubleclick on row to solve)"; + this.label1.Text = "Unresolved merge conflicts"; + // + // splitContainer3 + // + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer3.Location = new System.Drawing.Point(0, 0); + this.splitContainer3.Name = "splitContainer3"; + this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer3.Panel1 + // + this.splitContainer3.Panel1.Controls.Add(this.button1); + this.splitContainer3.Panel1.Controls.Add(this.Mergetool); + // + // splitContainer3.Panel2 + // + this.splitContainer3.Panel2.Controls.Add(this.Rescan); + this.splitContainer3.Panel2.Controls.Add(this.Reset); + this.splitContainer3.Size = new System.Drawing.Size(132, 274); + this.splitContainer3.SplitterDistance = 207; + this.splitContainer3.TabIndex = 7; // // button1 // - this.button1.Location = new System.Drawing.Point(3, 4); + this.button1.Location = new System.Drawing.Point(3, 3); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(124, 23); + this.button1.Size = new System.Drawing.Size(125, 23); this.button1.TabIndex = 2; - this.button1.Text = "Solve selected conflict"; + this.button1.Text = "Open in mergetool"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // + // Mergetool + // + this.Mergetool.Location = new System.Drawing.Point(3, 32); + this.Mergetool.Name = "Mergetool"; + this.Mergetool.Size = new System.Drawing.Size(125, 23); + this.Mergetool.TabIndex = 0; + this.Mergetool.Text = "Run mergetool"; + this.Mergetool.UseVisualStyleBackColor = true; + this.Mergetool.Click += new System.EventHandler(this.Mergetool_Click); + // // Rescan // - this.Rescan.Location = new System.Drawing.Point(3, 75); + this.Rescan.Location = new System.Drawing.Point(3, 3); this.Rescan.Name = "Rescan"; this.Rescan.Size = new System.Drawing.Size(125, 23); this.Rescan.TabIndex = 1; @@ -143,29 +310,40 @@ this.Rescan.UseVisualStyleBackColor = true; this.Rescan.Click += new System.EventHandler(this.Rescan_Click); // - // Mergetool + // Reset // - this.Mergetool.Location = new System.Drawing.Point(3, 29); - this.Mergetool.Name = "Mergetool"; - this.Mergetool.Size = new System.Drawing.Size(125, 23); - this.Mergetool.TabIndex = 0; - this.Mergetool.Text = "Run mergetool"; - this.Mergetool.UseVisualStyleBackColor = true; - this.Mergetool.Click += new System.EventHandler(this.Mergetool_Click); + this.Reset.Location = new System.Drawing.Point(3, 32); + this.Reset.Name = "Reset"; + this.Reset.Size = new System.Drawing.Size(125, 23); + this.Reset.TabIndex = 6; + this.Reset.Text = "Abort"; + this.Reset.UseVisualStyleBackColor = true; + this.Reset.Click += new System.EventHandler(this.Reset_Click); // // Namex // + this.Namex.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.Namex.DataPropertyName = "FileName"; this.Namex.HeaderText = "Filename"; this.Namex.Name = "Namex"; this.Namex.ReadOnly = true; // + // SolveConflictButton + // + this.SolveConflictButton.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.SolveConflictButton.HeaderText = ""; + this.SolveConflictButton.Name = "SolveConflictButton"; + this.SolveConflictButton.ReadOnly = true; + this.SolveConflictButton.Text = "Solve"; + this.SolveConflictButton.UseColumnTextForButtonValue = true; + this.SolveConflictButton.Width = 60; + // // FormResolveConflicts // this.AcceptButton = this.button1; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(576, 255); + this.ClientSize = new System.Drawing.Size(732, 274); this.Controls.Add(this.splitContainer1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "FormResolveConflicts"; @@ -173,6 +351,7 @@ this.Text = "Resolve merge conflicts"; this.Load += new System.EventHandler(this.FormResolveConflicts_Load); ((System.ComponentModel.ISupportInitialize)(this.ConflictedFiles)).EndInit(); + this.ConflictedFilesContextMenu.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gitItemBindingSource)).EndInit(); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); @@ -181,6 +360,9 @@ this.splitContainer2.Panel1.PerformLayout(); this.splitContainer2.Panel2.ResumeLayout(false); this.splitContainer2.ResumeLayout(false); + this.splitContainer3.Panel1.ResumeLayout(false); + this.splitContainer3.Panel2.ResumeLayout(false); + this.splitContainer3.ResumeLayout(false); this.ResumeLayout(false); } @@ -196,6 +378,24 @@ private System.Windows.Forms.BindingSource gitItemBindingSource; private System.Windows.Forms.Button button1; private System.Windows.Forms.ColorDialog colorDialog1; + private System.Windows.Forms.Button Reset; + private System.Windows.Forms.ContextMenuStrip ConflictedFilesContextMenu; + private System.Windows.Forms.ToolStripMenuItem ContextChooseBase; + private System.Windows.Forms.ToolStripMenuItem ContextChooseLocal; + private System.Windows.Forms.ToolStripMenuItem ContextChooseRemote; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripMenuItem ContextOpenBaseWith; + private System.Windows.Forms.ToolStripMenuItem ContextOpenLocalWith; + private System.Windows.Forms.ToolStripMenuItem ContextOpenRemoteWith; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripMenuItem OpenMergetool; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.ToolStripMenuItem ContextSaveBaseAs; + private System.Windows.Forms.ToolStripMenuItem ContextSaveLocalAs; + private System.Windows.Forms.ToolStripMenuItem ContextSaveRemoteAs; + private System.Windows.Forms.ToolStripMenuItem ContextMarkAsSolved; + private System.Windows.Forms.SplitContainer splitContainer3; private System.Windows.Forms.DataGridViewTextBoxColumn Namex; + private System.Windows.Forms.DataGridViewButtonColumn SolveConflictButton; } } \ No newline at end of file GitUI/FormResolveConflicts.Designer.cs @@ -19,6 +19,12 @@ namespace GitUI ThereWhereMergeConflicts = GitCommands.GitCommands.InTheMiddleOfConflictedMerge(); } + void ConflictedFiles_CellClick(object sender, DataGridViewCellEventArgs e) + { + if (e.ColumnIndex==SolveConflictButton.Index) + ConflictedFilesContextMenu.Show(Cursor.Position); + } + private void Mergetool_Click(object sender, EventArgs e) { Directory.SetCurrentDirectory(GitCommands.Settings.WorkingDir); @@ -40,6 +46,22 @@ namespace GitUI ConflictedFiles.DataSource = GitCommands.GitCommands.GetConflictedFiles(); InitMergetool(); + ConflictedFiles.CellClick += new DataGridViewCellEventHandler(ConflictedFiles_CellClick); + ConflictedFilesContextMenu.Text = "Solve"; + OpenMergetool.Text = "Open in " + mergetool; + button1.Text = "Open in " + mergetool; + + if (GitCommands.GitCommands.InTheMiddleOfRebase()) + { + ContextChooseLocal.Text = "Choose local (theirs)"; + ContextChooseRemote.Text = "Choose remote (ours)"; + } + else + { + ContextChooseLocal.Text = "Choose local (ours)"; + ContextChooseRemote.Text = "Choose remote (theirs)"; + } + if (!GitCommands.GitCommands.InTheMiddleOfPatch() && !GitCommands.GitCommands.InTheMiddleOfRebase() && !GitCommands.GitCommands.InTheMiddleOfConflictedMerge() && ThereWhereMergeConflicts) { if (MessageBox.Show("All mergeconflicts are resolved, you can commit." + Environment.NewLine + "Do you want to commit now?", "Commit", MessageBoxButtons.YesNo) == DialogResult.Yes) @@ -64,14 +86,22 @@ namespace GitUI private string mergetoolCmd; private string mergetoolPath; + private string GetFileName() + { + if (ConflictedFiles.SelectedRows.Count != 1) + return null; + + DataGridViewRow row = ConflictedFiles.SelectedRows[0]; + return ((GitItem)row.DataBoundItem).FileName; + } + private void ConflictedFiles_DoubleClick(object sender, EventArgs e) { if (ConflictedFiles.SelectedRows.Count != 1) return; - DataGridViewRow row = ConflictedFiles.SelectedRows[0]; + string filename = GitCommands.GitCommands.GetConflictedFiles(GetFileName()); - string filename = GitCommands.GitCommands.GetConflictedFiles(((GitItem)row.DataBoundItem).FileName); if (Directory.Exists(Settings.WorkingDir + filename) && !File.Exists(Settings.WorkingDir + filename)) { @@ -98,6 +128,12 @@ namespace GitUI if (file1 && file2 && file3) { + if (FileHelper.IsBinaryFile(filename)) + { + if (MessageBox.Show("The selected file appears to be a binary file." + Environment.NewLine + "Are you sure you want to open this file in " + mergetool + "?") == DialogResult.No) + return; + } + arguments = arguments.Replace("$BASE", filename + ".BASE"); arguments = arguments.Replace("$LOCAL", filename + ".LOCAL"); arguments = arguments.Replace("$REMOTE", filename + ".REMOTE"); @@ -194,5 +230,134 @@ namespace GitUI { ConflictedFiles_DoubleClick(sender, e); } + + private void Reset_Click(object sender, EventArgs e) + { + if (Abort.AbortCurrentAction()) + Close(); + } + + private void ConflictedFiles_SelectionChanged(object sender, EventArgs e) + { + + } + + private void ContextChooseBase_Click(object sender, EventArgs e) + { + GitCommands.GitCommands.HandleConflice_SelectBase(GetFileName()); + Initialize(); + } + + private void ContextChooseLocal_Click(object sender, EventArgs e) + { + GitCommands.GitCommands.HandleConflice_SelectLocal(GetFileName()); + Initialize(); + } + + private void ContextChooseRemote_Click(object sender, EventArgs e) + { + GitCommands.GitCommands.HandleConflice_SelectRemote(GetFileName()); + Initialize(); + } + + private void OpenMergetool_Click(object sender, EventArgs e) + { + ConflictedFiles_DoubleClick(sender, e); + } + + private void ContextOpenBaseWith_Click(object sender, EventArgs e) + { + string fileName = GetFileName(); + fileName = GetShortFileName(fileName); + + fileName = Path.GetTempPath() + fileName; + + GitCommands.GitCommands.HandeConflicts_SaveSide(GetFileName(), fileName, "BASE"); + + OpenWith.OpenAs(fileName); + } + + private void ContextOpenLocalWith_Click(object sender, EventArgs e) + { + string fileName = GetFileName(); + fileName = GetShortFileName(fileName); + + fileName = Path.GetTempPath() + fileName; + + GitCommands.GitCommands.HandeConflicts_SaveSide(GetFileName(), fileName, "LOCAL"); + + OpenWith.OpenAs(fileName); + } + + private static string GetShortFileName(string fileName) + { + if (fileName.Contains("\\") && fileName.LastIndexOf("\\") < fileName.Length) + fileName = fileName.Substring(fileName.LastIndexOf('\\') + 1); + if (fileName.Contains("/") && fileName.LastIndexOf("/") < fileName.Length) + fileName = fileName.Substring(fileName.LastIndexOf('/') + 1); + return fileName; + } + + private void ContextOpenRemoteWith_Click(object sender, EventArgs e) + { + string fileName = GetFileName(); + fileName = GetShortFileName(fileName); + + fileName = Path.GetTempPath() + fileName; + + GitCommands.GitCommands.HandeConflicts_SaveSide(GetFileName(), fileName, "REMOTE"); + + OpenWith.OpenAs(fileName); + } + + private void ConflictedFiles_CellMouseDown(object sender, DataGridViewCellMouseEventArgs e) + { + if (e.Button == MouseButtons.Right) + { + System.Drawing.Point pt = ConflictedFiles.PointToClient(Cursor.Position); + DataGridView.HitTestInfo hti = ConflictedFiles.HitTest(pt.X, pt.Y); + int LastRow = hti.RowIndex; + ConflictedFiles.ClearSelection(); + if (LastRow >= 0 && ConflictedFiles.Rows.Count > LastRow) + ConflictedFiles.Rows[LastRow].Selected = true; + } + } + + private void SaveAs(string side) + { + string fileName = GetFileName(); + fileName = GetShortFileName(fileName); + + SaveFileDialog fileDialog = new SaveFileDialog(); + fileDialog.FileName = Settings.WorkingDir + fileName; + fileDialog.AddExtension = true; + fileDialog.DefaultExt = GitCommands.GitCommands.GetFileExtension(fileDialog.FileName); + fileDialog.Filter = "Current format (*." + GitCommands.GitCommands.GetFileExtension(fileDialog.FileName) + ")|*." + GitCommands.GitCommands.GetFileExtension(fileDialog.FileName) + "|All files (*.*)|*.*"; + + if (fileDialog.ShowDialog() == DialogResult.OK) + { + GitCommands.GitCommands.HandeConflicts_SaveSide(GetFileName(), fileDialog.FileName, side); + } + } + + private void ContextSaveBaseAs_Click(object sender, EventArgs e) + { + SaveAs("BASE"); + } + + private void ContextSaveLocalAs_Click(object sender, EventArgs e) + { + SaveAs("LOCAL"); + } + + private void ContextSaveRemoteAs_Click(object sender, EventArgs e) + { + SaveAs("REMOTE"); + } + + private void ContextMarkAsSolved_Click(object sender, EventArgs e) + { + GitCommands.GitCommands.RunCmd(Settings.GitDir + "git.cmd", "add -- \"" + GetFileName() + "\""); + } } } GitUI/FormResolveConflicts.cs @@ -120,6 +120,12 @@ <metadata name="Namex.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> + <metadata name="SolveConflictButton.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="ConflictedFilesContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>307, 17</value> + </metadata> <metadata name="gitItemBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> GitUI/FormResolveConflicts.resx @@ -52,6 +52,7 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="Abort.cs" /> <Compile Include="AboutBox.cs"> <SubType>Form</SubType> </Compile> @@ -84,6 +85,7 @@ <DependentUpon>EditNetSpell.cs</DependentUpon> </Compile> <Compile Include="EditorOptions.cs" /> + <Compile Include="FileHelper.cs" /> <Compile Include="FileViewer.cs"> <SubType>UserControl</SubType> </Compile> GitUI/GitUI.csproj @@ -8,6 +8,8 @@ Version 1.79 Added alt-c, alt-a and alt-r as keys for commit, amend and rescan. Added checkbox "close dialog after commit" on commit dialog Removed Load button from view patch dialog. Patch is now loaded when file is selected. + Added context menu to merge conflict dialog + Added "Abort" button to merge conflict dialog Version 1.78 Fixed bug causing the commitmessage to contain encoding marker bytes GitUI/Resources/ChangeLog.txt aa6fd74d1995f46277727668b304459aecbfb8f0 Henk Westhuis Henk_Westhuis@hotmail.com http://github.com/spdr870/gitextensions/commit/047113061a137f105f02b4ac9a9c8b673fd73de5 047113061a137f105f02b4ac9a9c8b673fd73de5 2009-11-02T12:36:51-08:00 2009-11-02T11:10:20-08:00 Added context menu in HandleMergeConflicts dialog. 74aab3cebcb0f3bffdb8284598ed8d1143ccef23 Henk Westhuis Henk_Westhuis@hotmail.com