fix branch picker issue when repo has stash

giserh · Oct 9, 2011 · 1bbda02 · 1bbda02
1 parent b0a1579
commit 1bbda02
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/BasicSccProvider.cs b/BasicSccProvider.cs
@@ -425,7 +425,9 @@ private void OnSwitchBranchCommand(object sender, EventArgs e)
         {
             if (sccService.CurrentTracker == null || sccService.CurrentTracker.Repository == null) return;
 
-            var branchPicker = new BranchPicker(sccService.CurrentTracker.Repository);
+            var branchPicker = new BranchPicker(
+                sccService.CurrentTracker.Repository,
+                sccService.CurrentTracker.RepositoryGraph.Refs);
             branchPicker.Show();
         }
 

diff --git a/GitFileStatusTracker.cs b/GitFileStatusTracker.cs
@@ -122,9 +122,14 @@ public GitFileStatus GetFileStatus(string fileName)
 
             if (!this.cache.ContainsKey(fileName))
             {
-                var status = GetFileStatusNoCache(fileName);
-                this.cache.Add(fileName, status);
-                //Debug.WriteLine(string.Format("GetFileStatus {0} - {1}", fileName, status));
+                var status = GitFileStatus.NotControlled;
+                try
+                {
+                    status = GetFileStatusNoCache(fileName);
+                    this.cache.Add(fileName, status);
+                    //Debug.WriteLine(string.Format("GetFileStatus {0} - {1}", fileName, status));
+                }
+                catch { }
                 return status;
             }
             else

diff --git a/UI/BranchPicker.xaml.cs b/UI/BranchPicker.xaml.cs
@@ -13,6 +13,7 @@
 using System.Windows.Shapes;
 using NGit;
 using NGit.Api;
+using GitScc.DataServices;
 
 namespace GitScc.UI
 {
@@ -22,15 +23,17 @@ namespace GitScc.UI
     public partial class BranchPicker : UserControl
     {
         private Window window;
-        Repository repository;
+        private Repository repository;
+        private List<DataServices.Ref> list;
 
         public string BranchName { get; set; }
         public bool CreateNew { get; set; }
 
-        public BranchPicker(Repository repository)
+        public BranchPicker(Repository repository, List<DataServices.Ref> list)
         {
             InitializeComponent();
             this.repository = repository;
+            this.list = list;
         }
 
         internal bool? Show()
@@ -45,10 +48,7 @@ public BranchPicker(Repository repository)
                 Height = 200
             };
 
-            comboBranches.ItemsSource = repository.GetAllRefs().Values
-                .Where(r => !r.IsSymbolic())
-                .Select(r => r.GetName().Substring(11));
-
+            comboBranches.ItemsSource = list.Where(r=>r.Type == RefTypes.Branch).Select(r => r.Name);
             comboBranches.SelectedValue = repository.GetBranch();
             return window.ShowDialog(); 
         }

diff --git a/source.extension.vsixmanifest b/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="C4128D99-2000-41D1-A6C3-704E6C1A3DE2">
     <Name>Git Source Control Provider</Name>
     <Author>[email protected]</Author>
-    <Version>0.8.4</Version>
+    <Version>0.8.5</Version>
     <Description xml:space="preserve">Git Source Control Provider is a plug-in that integrates git with Visual Studio.</Description>
     <Locale>1033</Locale>
     <License>License.txt</License>