@@ -1981,6 +1981,8 @@ namespace GitCommands static public List<GitHead> GetRemoteHeads(string remote, bool tags, bool branches) { + remote = FixPath(remote); + string tree = ""; if (tags && branches) tree = RunCmd(Settings.GitDir + "git.cmd", "ls-remote --heads --tags \"" + remote + "\""); GitCommands/GitCommands/Git/GitCommands.cs @@ -77,7 +77,7 @@ this.Branches.FormattingEnabled = true; this.Branches.Location = new System.Drawing.Point(128, 19); this.Branches.Name = "Branches"; - this.Branches.Size = new System.Drawing.Size(297, 24); + this.Branches.Size = new System.Drawing.Size(297, 21); this.Branches.TabIndex = 5; this.Branches.DropDown += new System.EventHandler(this.Branches_DropDown); // @@ -86,7 +86,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(8, 22); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(105, 17); + this.label2.Size = new System.Drawing.Size(80, 13); this.label2.TabIndex = 6; this.label2.Text = "Remote branch"; this.Tooltip.SetToolTip(this.label2, "Remote branch to pull. Leave empty to pull all branches."); @@ -118,7 +118,7 @@ this.Merge.Checked = true; this.Merge.Location = new System.Drawing.Point(7, 20); this.Merge.Name = "Merge"; - this.Merge.Size = new System.Drawing.Size(278, 21); + this.Merge.Size = new System.Drawing.Size(210, 17); this.Merge.TabIndex = 0; this.Merge.TabStop = true; this.Merge.Text = "&Merge remote branch to current branch"; @@ -130,10 +130,10 @@ this.Rebase.AutoSize = true; this.Rebase.Location = new System.Drawing.Point(7, 41); this.Rebase.Name = "Rebase"; - this.Rebase.Size = new System.Drawing.Size(542, 38); + this.Rebase.Size = new System.Drawing.Size(411, 30); this.Rebase.TabIndex = 1; - this.Rebase.Text = "&Rebase remote branch to current branch, creates linear history. It is recommended" + - "\r\nto choose a remote branch when using rebase. (use with caution)"; + this.Rebase.Text = "&Rebase remote branch to current branch, creates linear history. It is recommende" + + "d\r\nto choose a remote branch when using rebase. (use with caution)"; this.Rebase.UseVisualStyleBackColor = true; this.Rebase.CheckedChanged += new System.EventHandler(this.Rebase_CheckedChanged); // @@ -154,7 +154,7 @@ this.Fetch.AutoSize = true; this.Fetch.Location = new System.Drawing.Point(7, 75); this.Fetch.Name = "Fetch"; - this.Fetch.Size = new System.Drawing.Size(280, 21); + this.Fetch.Size = new System.Drawing.Size(212, 17); this.Fetch.TabIndex = 2; this.Fetch.TabStop = true; this.Fetch.Text = "Do not merge, only &fetch remote branch"; @@ -167,9 +167,11 @@ this.PullSource.FormattingEnabled = true; this.PullSource.Location = new System.Drawing.Point(128, 46); this.PullSource.Name = "PullSource"; - this.PullSource.Size = new System.Drawing.Size(297, 24); + this.PullSource.Size = new System.Drawing.Size(297, 21); this.PullSource.TabIndex = 13; + this.PullSource.Validating += new System.ComponentModel.CancelEventHandler(this.PullSource_Validating); this.PullSource.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.PullSource_DrawItem); + this.PullSource.SelectedIndexChanged += new System.EventHandler(this.PullSource_SelectedIndexChanged); this.PullSource.DropDown += new System.EventHandler(this.PullSource_DropDown); // // Stash @@ -187,8 +189,9 @@ this.Remotes.FormattingEnabled = true; this.Remotes.Location = new System.Drawing.Point(128, 19); this.Remotes.Name = "Remotes"; - this.Remotes.Size = new System.Drawing.Size(297, 24); + this.Remotes.Size = new System.Drawing.Size(297, 21); this.Remotes.TabIndex = 16; + this.Remotes.Validating += new System.ComponentModel.CancelEventHandler(this.Remotes_Validating); this.Remotes.SelectedIndexChanged += new System.EventHandler(this.Remotes_SelectedIndexChanged); this.Remotes.Validated += new System.EventHandler(this.Remotes_Validated); this.Remotes.DropDown += new System.EventHandler(this.Remotes_DropDown); @@ -223,7 +226,7 @@ this.PullFromUrl.AutoSize = true; this.PullFromUrl.Location = new System.Drawing.Point(7, 47); this.PullFromUrl.Name = "PullFromUrl"; - this.PullFromUrl.Size = new System.Drawing.Size(47, 21); + this.PullFromUrl.Size = new System.Drawing.Size(38, 17); this.PullFromUrl.TabIndex = 19; this.PullFromUrl.Text = "Url"; this.Tooltip.SetToolTip(this.PullFromUrl, "Url to pull from"); @@ -236,7 +239,7 @@ this.PullFromRemote.Checked = true; this.PullFromRemote.Location = new System.Drawing.Point(7, 19); this.PullFromRemote.Name = "PullFromRemote"; - this.PullFromRemote.Size = new System.Drawing.Size(78, 21); + this.PullFromRemote.Size = new System.Drawing.Size(62, 17); this.PullFromRemote.TabIndex = 18; this.PullFromRemote.TabStop = true; this.PullFromRemote.Text = "Remote"; @@ -260,7 +263,7 @@ this.AutoStash.AutoSize = true; this.AutoStash.Location = new System.Drawing.Point(219, 260); this.AutoStash.Name = "AutoStash"; - this.AutoStash.Size = new System.Drawing.Size(97, 21); + this.AutoStash.Size = new System.Drawing.Size(76, 17); this.AutoStash.TabIndex = 20; this.AutoStash.Text = "Auto stash"; this.AutoStash.UseVisualStyleBackColor = true; @@ -319,7 +322,7 @@ // FormPull // this.AcceptButton = this.Pull; - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(639, 290); this.Controls.Add(this.splitContainer1); GitUI/FormPull.Designer.cs @@ -7,6 +7,7 @@ using System.Drawing; using System.Text; using System.Windows.Forms; using System.IO; +using GitCommands; namespace GitUI { @@ -44,11 +45,14 @@ namespace GitUI private void PullSource_TextChanged(object sender, EventArgs e) { - Branches.DataSource = null; } + private List<GitCommands.GitHead> Heads = null; + private void Branches_DropDown(object sender, EventArgs e) { + Cursor.Current = Cursors.WaitCursor; + if ((PullFromUrl.Checked && string.IsNullOrEmpty(PullSource.Text)) && (PullFromRemote.Checked && string.IsNullOrEmpty(Remotes.Text))) { @@ -56,33 +60,57 @@ namespace GitUI return; } - string realWorkingDir = GitCommands.Settings.WorkingDir; + //string realWorkingDir = GitCommands.Settings.WorkingDir; try { - if (PullFromUrl.Checked) - { - GitCommands.Settings.WorkingDir = PullSource.Text; - } - else + LoadPuttyKey(); + + if (Heads == null) { - GitCommands.Settings.WorkingDir = GitCommands.GitCommands.GetSetting("remote." + Remotes.Text + ".url"); + if (PullFromUrl.Checked) + { + Heads = GitCommands.GitCommands.GetRemoteHeads(PullSource.Text, false, true); + } + else + { + //The line below is the most reliable way to get a list containing + //all remote branches but it is also the slowest. + //Heads = GitCommands.GitCommands.GetRemoteHeads(Remotes.Text, false, true); + + //The code below is a quick way to get a lost containg all remote branches. + //It only returns the heads that are allready known to the repository. This + //doesn't return heads that are new on the server. This can be updated using + //update branch info in the manage remotes dialog. + Heads = new List<GitHead>(); + foreach (GitHead head in GitCommands.GitCommands.GetHeads(true, true)) + { + if (head.IsRemote && head.Name.StartsWith(Remotes.Text, StringComparison.CurrentCultureIgnoreCase)) + { + GitCommands.GitHead remoteHead = new GitCommands.GitHead(); + remoteHead.Name = head.Name.Substring(head.Name.LastIndexOf("/") + 1); + Heads.Insert(0, remoteHead); + } + + } + } } Branches.DisplayMember = "Name"; - List<GitCommands.GitHead> heads = GitCommands.GitCommands.GetHeads(false); GitCommands.GitHead allHead = new GitCommands.GitHead(); allHead.Name = "*"; - heads.Insert(0, allHead); + Heads.Insert(0, allHead); GitCommands.GitHead noHead = new GitCommands.GitHead(); noHead.Name = ""; - heads.Insert(0, noHead); - Branches.DataSource = heads; + Heads.Insert(0, noHead); + Branches.DataSource = Heads; } finally { - GitCommands.Settings.WorkingDir = realWorkingDir; + //GitCommands.Settings.WorkingDir = realWorkingDir; } + + Cursor.Current = Cursors.Default; } private void Pull_Click(object sender, EventArgs e) @@ -120,13 +148,7 @@ namespace GitUI source = PullSource.Text; else { - if (GitCommands.GitCommands.Plink()) - { - if (!File.Exists(GitCommands.Settings.Pageant)) - MessageBox.Show("Cannot load SSH key. PuTTY is not configured properly.", "PuTTY"); - else - GitCommands.GitCommands.StartPageantForRemote(Remotes.Text); - } + LoadPuttyKey(); source = Remotes.Text; } @@ -178,6 +200,17 @@ namespace GitUI } + private void LoadPuttyKey() + { + if (GitCommands.GitCommands.Plink()) + { + if (!File.Exists(GitCommands.Settings.Pageant)) + MessageBox.Show("Cannot load SSH key. PuTTY is not configured properly.", "PuTTY"); + else + GitCommands.GitCommands.StartPageantForRemote(Remotes.Text); + } + } + private void FormPull_Load(object sender, EventArgs e) { Pull.Select(); @@ -220,6 +253,7 @@ namespace GitUI { if (PullFromRemote.Checked) { + ResetRemoteHeads(); PullSource.Enabled = false; BrowseSource.Enabled = false; Remotes.Enabled = true; @@ -231,6 +265,7 @@ namespace GitUI { if (PullFromUrl.Checked) { + ResetRemoteHeads(); PullSource.Enabled = true; BrowseSource.Enabled = true; Remotes.Enabled = false; @@ -293,5 +328,25 @@ namespace GitUI PullImage.BackgroundImage = GitUI.Properties.Resources.fetch; } + private void PullSource_SelectedIndexChanged(object sender, EventArgs e) + { + + } + + private void PullSource_Validating(object sender, CancelEventArgs e) + { + ResetRemoteHeads(); + } + + private void Remotes_Validating(object sender, CancelEventArgs e) + { + ResetRemoteHeads(); + } + + private void ResetRemoteHeads() + { + Branches.DataSource = null; + Heads = null; + } } } GitUI/FormPull.cs @@ -15,6 +15,7 @@ Version 1.79 Added waitcursor to FormResolveConflicts. Set width to submodules submenu and recent repositories submenu. Added F3 and Shift+F3 to code dialog. + Bug fixed that the branch drop down box in the pull dialog was empty. Version 1.78 Fixed bug causing the commitmessage to contain encoding marker bytes GitUI/Resources/ChangeLog.txt cfcd415a531e4c327c4e9a2f1f840dc1b029958d Henk Westhuis Henk_Westhuis@hotmail.com http://github.com/spdr870/gitextensions/commit/cf8f6aecd807b370b7e444a1e86133e659c14c19 cf8f6aecd807b370b7e444a1e86133e659c14c19 2009-11-04T10:11:57-08:00 2009-11-04T10:11:57-08:00 Bug fixed that the branch drop down box in the pull dialog was empty. da94ff725643fe2118f2577a78f8dea82223740c Henk Westhuis Henk_Westhuis@hotmail.com