From 64fe11475a13b61592f769cfde9315673680776f Mon Sep 17 00:00:00 2001
From: Yiyi Sun <yiyisun@gmail.com>
Date: Sun, 5 Feb 2012 11:11:35 -0500
Subject: [PATCH] add commit search

---
 GitApi/DataServices/Commit.cs  |  6 ++-
 GitUI/MainWindow.xaml          |  4 +-
 GitUI/UI/CommitDetails.xaml    |  2 +-
 GitUI/UI/CommitDetails.xaml.cs |  2 +-
 GitUI/UI/MainToolBar.xaml      | 17 +++++---
 GitUI/UI/MainToolBar.xaml.cs   | 79 ++++++++++++++++++++++++++++++++++
 Readme.htm                     | 34 +++++++--------
 7 files changed, 114 insertions(+), 30 deletions(-)

diff --git a/GitApi/DataServices/Commit.cs b/GitApi/DataServices/Commit.cs
index 9e26e11..e4917be 100644
--- a/GitApi/DataServices/Commit.cs
+++ b/GitApi/DataServices/Commit.cs
@@ -16,5 +16,9 @@ public class Commit
         public DateTime CommitDate { get; set; }
         public string CommitDateRelative { get; set; }
         internal bool deleted { get; set; }
-    }
+
+        public override string ToString()
+        {
+            return string.Format("[{0}] {1}", Id.Substring(0, 7), Message.Replace("\r", ""));
+        }
    }
 }
\ No newline at end of file
diff --git a/GitUI/MainWindow.xaml b/GitUI/MainWindow.xaml
index a85e2d2..a327114 100644
--- a/GitUI/MainWindow.xaml
+++ b/GitUI/MainWindow.xaml
@@ -15,10 +15,10 @@
     <Grid x:Name="rootGrid" MouseRightButtonUp="rootGrid_MouseRightButtonUp">
         <GitScc_UI:HistoryGraph HorizontalAlignment="Stretch" VerticalAlignment="Stretch" x:Name="graph"/>
 
-        <my:MainToolBar x:Name="topToolBar" Height="60" Visibility="Collapsed"
+        <my:MainToolBar x:Name="topToolBar" Height="90" Visibility="Collapsed"
                         HorizontalAlignment="Stretch" VerticalAlignment="Top">
             <my:MainToolBar.RenderTransform>
-                <TranslateTransform Y="-60" />
+                <TranslateTransform Y="-690" />
             </my:MainToolBar.RenderTransform>
         </my:MainToolBar>
 
diff --git a/GitUI/UI/CommitDetails.xaml b/GitUI/UI/CommitDetails.xaml
index 35e9662..347fe43 100644
--- a/GitUI/UI/CommitDetails.xaml
+++ b/GitUI/UI/CommitDetails.xaml
@@ -77,7 +77,7 @@
 			<Label Content="Author"  HorizontalAlignment="Right" Margin="0,0,6,0" Name="lblAuthor" VerticalAlignment="Bottom" FontSize="10"/>
 			<Button Content="back to graphic view" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,6,10,0" Padding="10,0"
 					Command="cmd:HistoryViewCommands.CloseCommitDetails"  Template="{DynamicResource BackButtonControlTemplate}" ToolTip="Back to graphic view" />
-			<Button HorizontalAlignment="Right" Margin="0,6,40,0" Name="btnSwitch" VerticalAlignment="Top" Click="btnSwitch_Click" Template="{DynamicResource btnSwitchControlTemplate}" RenderTransformOrigin="-1.5,0.542" ToolTip="Reverse the comparison order" />
+			<Button HorizontalAlignment="Right" Margin="0,6,40,0" Name="btnSwitch" VerticalAlignment="Top" Click="btnSwitch_Click" Template="{DynamicResource btnSwitchControlTemplate}" RenderTransformOrigin="-1.5,0.542" ToolTip="Reverse the comparison order" Visibility="Collapsed"  />
 			<Grid.Background>
 				<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
 					<GradientStop Color="#FFF2F2F2" Offset="0" />
diff --git a/GitUI/UI/CommitDetails.xaml.cs b/GitUI/UI/CommitDetails.xaml.cs
index d19d66f..99e68bb 100644
--- a/GitUI/UI/CommitDetails.xaml.cs
+++ b/GitUI/UI/CommitDetails.xaml.cs
@@ -79,7 +79,7 @@ internal void Show(GitFileStatusTracker tracker, string commitId)
                     this.radioShowFileTree.IsEnabled = true;
 
                     //this.lblCommit.Content = commit.Id;
-                    this.lblMessage.Content = string.Format("[{0}] {1}", commit.Id.Substring(0, 7), commit.Message.Replace("\r", ""));
+                    this.lblMessage.Content = commit.ToString();
                     this.lblAuthor.Content = commit.CommitterName + " " + commit.CommitDateRelative;
                     //this.fileTree.ItemsSource = repositoryGraph.GetTree(commitId).Children;
                     this.patchList.ItemsSource = repositoryGraph.GetChanges(commitId);
diff --git a/GitUI/UI/MainToolBar.xaml b/GitUI/UI/MainToolBar.xaml
index 0ea180b..485a87a 100644
--- a/GitUI/UI/MainToolBar.xaml
+++ b/GitUI/UI/MainToolBar.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d" 
-             d:DesignHeight="60" d:DesignWidth="500">
+             d:DesignHeight="90" d:DesignWidth="500">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -12,7 +12,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid>
+    <Grid PreviewKeyDown="Grid_PreviewKeyDown">
         <Grid.Background>
             <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
                 <GradientStop Color="#FFF2F2F2" Offset="0" />
@@ -23,20 +23,23 @@
 
         <Label Content="Branches" Height="28" HorizontalAlignment="Left" Margin="6,2,0,0" x:Name="label1" VerticalAlignment="Top" FontSize="10" />
         <Label Content="Tags" Height="28" HorizontalAlignment="Left" Margin="6,26,0,0" x:Name="label2" VerticalAlignment="Top" FontSize="10" />
-        <ListBox x:Name="branchList" Margin="60,4,160,36" ItemsPanel="{DynamicResource ItemsPanelTemplate1}" ItemTemplate="{DynamicResource DataTemplate1}" 
+        <ListBox x:Name="branchList" Margin="60,3,200,67" ItemsPanel="{DynamicResource ItemsPanelTemplate1}" ItemTemplate="{DynamicResource DataTemplate1}" 
                      Background="#00000000" BorderBrush="{x:Null}" Height="20" ItemContainerStyle="{DynamicResource ListBoxItemStyle1}"
                      ScrollViewer.HorizontalScrollBarVisibility="hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden" SelectionChanged="branchList_SelectionChanged" />
 
-        <ListBox x:Name="tagList" Margin="60,26,160,14" ItemsPanel="{DynamicResource ItemsPanelTemplate1}" ItemTemplate="{DynamicResource DataTemplate1}" 
+        <ListBox x:Name="tagList" Margin="60,27,200,43" ItemsPanel="{DynamicResource ItemsPanelTemplate1}" ItemTemplate="{DynamicResource DataTemplate1}" 
                      Background="#00000000" BorderBrush="{x:Null}" Height="20" ItemContainerStyle="{DynamicResource ListBoxItemStyle1}"
                      ScrollViewer.HorizontalScrollBarVisibility="hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden" SelectionChanged="tagList_SelectionChanged" />
         <CheckBox Content="Show simplified graph" HorizontalAlignment="Right" Margin="0,8,43,0" Name="checkBox1" Template="{DynamicResource ShowSimpleGraphCheckBoxControlTemplate}" 
                   VerticalAlignment="Top" ToolTip="Toggle View"  Click="checkBox1_Click"/>
         
-        <Label Content="Simplified view: off" HorizontalAlignment="Right" Margin="0,0,13,1.586" Name="lableView" VerticalAlignment="Bottom" FontSize="9.333" />
+        <Label Content="Simplified view: off" HorizontalAlignment="Right" Margin="0,28,12,39.586" Name="lableView" FontSize="9.333" d:LayoutOverrides="Height" />
 
-        <Button Content="Button" HorizontalAlignment="Right" Margin="0,8,72,28" Template="{DynamicResource SaveButtonControlTemplate}" Command="cmd:HistoryViewCommands.ExportGraph" ToolTip="Export graph ..." />
-        <Button Content="Button" HorizontalAlignment="Right" Margin="0,8.001,13,27.999" Template="{DynamicResource ButtonRefreshTemplate}" Command="cmd:HistoryViewCommands.RefreshGraph" ToolTip="Refresh" />
+        <Button Content="Button" HorizontalAlignment="Right" Margin="0,8,72,28" Template="{DynamicResource SaveButtonControlTemplate}" Command="cmd:HistoryViewCommands.ExportGraph" ToolTip="Export graph ..." VerticalAlignment="Top" />
+        <Button Content="Button" HorizontalAlignment="Right" Margin="0,8.001,13,27.999" Template="{DynamicResource ButtonRefreshTemplate}" Command="cmd:HistoryViewCommands.RefreshGraph" ToolTip="Refresh" VerticalAlignment="Top" />
+        <Label Content="Commits" Height="28" HorizontalAlignment="Left" Margin="8,54,0,0" VerticalAlignment="Top" FontSize="10" />
+        <TextBox TextWrapping="Wrap" VerticalAlignment="Bottom" Margin="60,0,200,12.04" x:Name="txtSearch" TextChanged="txtSearch_TextChanged" PreviewKeyDown="txtSearch_PreviewKeyDown" PreviewMouseDown="txtSearch_PreviewMouseDown" />
+        <ListBox Height="100" Margin="60,0,200,-88.96" VerticalAlignment="Bottom" x:Name="lstSearch" Visibility="Collapsed" PreviewKeyDown="lstSearch_PreviewKeyDown" />
          <!--<Button Content="Button" HorizontalAlignment="Right" Margin="0,8,72,28" Template="{DynamicResource CompareButtonControlTemplate}" ToolTip="Select two commits to compare ..." Name="btnCompare" Click="btnCompare_Click" />
         <Button Content="0" HorizontalAlignment="Right" Margin="0,8,100,0" Name="btnCommitCount" VerticalAlignment="Top" Template="{DynamicResource CommitCountControlTemplate}" RenderTransformOrigin="-1.125,0.438" Click="btnCommitCount_Click" ToolTip="Click to clear selection" />-->
      </Grid>
diff --git a/GitUI/UI/MainToolBar.xaml.cs b/GitUI/UI/MainToolBar.xaml.cs
index 051026a..662228b 100644
--- a/GitUI/UI/MainToolBar.xaml.cs
+++ b/GitUI/UI/MainToolBar.xaml.cs
@@ -89,5 +89,84 @@ private void btnRefresh_Click(object sender, RoutedEventArgs e)
         {
             HistoryViewCommands.RefreshGraph.Execute(null, this);
         }
+
+        #region Search commits
+        private void txtSearch_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var text = txtSearch.Text.ToLower();
+            if (string.IsNullOrWhiteSpace(text))
+            {
+                lstSearch.ItemsSource = tracker.RepositoryGraph.Commits;
+            }
+            else
+            {
+                lstSearch.ItemsSource = tracker.RepositoryGraph.Commits
+                    .Where(c => c.Message.ToLower().Contains(text) ||
+                           c.Id.StartsWith(text) ||
+                           c.CommitterName.ToLower().StartsWith(text) ||
+                           c.CommitterEmail.ToLower().StartsWith(text) ||
+                           c.CommitDateRelative.StartsWith(text));
+            }
+            lstSearch.Visibility = Visibility.Visible;
+        }
+
+        private void ShowSearchList()
+        {
+            lstSearch.Visibility = Visibility.Visible;
+            lstSearch.Focus();
+        }
+
+        private void HideSearchList()
+        {
+            lstSearch.Visibility = Visibility.Collapsed;
+            txtSearch.Focus();
+        }
+
+        private void Grid_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                HideSearchList();
+            }
+        }
+
+        private void txtSearch_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Down || e.Key == Key.Up)
+            {
+                ShowSearchList();
+            }
+        }
+
+        private void txtSearch_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            HideSearchList();
+            if (txtSearch.SelectedText == "")
+            {
+                txtSearch.SelectAll();
+                e.Handled = true;
+            }
+        }
+
+        private void lstSearch_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                e.Handled = true;
+                lstSearch.Visibility = Visibility.Collapsed;
+                txtSearch.Focus();
+
+                var commit = lstSearch.SelectedItem as Commit;
+                if (commit != null)
+                {
+                    txtSearch.TextChanged -= new TextChangedEventHandler(txtSearch_TextChanged);
+                    txtSearch.Text = commit.Message;
+                    txtSearch.TextChanged += new TextChangedEventHandler(txtSearch_TextChanged);
+                    HistoryViewCommands.ScrollToCommit.Execute(commit.Id, this);
+                }
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/Readme.htm b/Readme.htm
index ea34aea..7e41ca4 100644
--- a/Readme.htm
+++ b/Readme.htm
@@ -19,28 +19,26 @@ <h1>Git Source Control Provider</h1>
     <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=KBCLF3PZD6C98&amp;lc=US&amp;item_name=Git%20Source%20Control%20Provider&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted">
     <img alt="Donate" style="border:0px; vertical-align:middle" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" title="Donate" /></a><br />
     <h2>Change Logs</h2>
-    <strong>V0.9.1 
-    (beta - f73b4a2) 
-    </strong> 
+    <strong>V0.9.1 (RC3 - dd5e9f7) </strong> 
     <ul>
-    <li>Change History Window to be a stand alone program - add/delete tag, add/checkout 
-        branch</li>
-    <li>Add Git Extensions menus to Pending Changed tool window </li>
-    <li>Add GitTortoise menus to Pending Changed tool window</li>
-    <li>Add Git - About ... menu, <a 
+    <li>Change History Window to be a stand alone program<ul>
+        <li>add/delete tag, add/checkout branch</li>
+        <li>scroll to branch/tag</li>
+        <li>refresh button</li>
+        </ul>
+        </li>
+        <li>Add Git Extensions menus to Pending Changed tool window </li>
+        <li>Add GitTortoise menus to Pending Changed tool window</li>
+        <li>Add Git - About ... menu, 
+            <a 
             href="http://gitscc.codeplex.com/workitem/17051">Referencing 
         Git hash when building</a></li>
         <li>Add Option to disable auto load,
-            <a href="http://gitscc.codeplex.com/workitem/16904">
-            Automatically switch to the Git provider when loading a Git-controlled solution</a></li>
-    <li>Bug Fix: <a href="http://gitscc.codeplex.com/workitem/17101">
-        autocrlf warning prevents commits from Git Pending Changes</a></li>
-        <li>Bug Fix: <a href="http://gitscc.codeplex.com/workitem/17213">
-            Show Changes Window Disappear</a></li>
-        <li>Buf Fix: <a href="http://gitscc.codeplex.com/workitem/17277">
-            Git status is not refreshed</a></li>
-        <li>Bug Fix: <a href="http://gitscc.codeplex.com/workitem/17322">
-            config core.ignorecase true</a></li>
+            <a href="http://gitscc.codeplex.com/workitem/16904">Automatically switch to the Git provider when loading a Git-controlled solution</a></li>
+        <li>Bug Fix: <a href="http://gitscc.codeplex.com/workitem/17101">autocrlf warning prevents commits from Git Pending Changes</a></li>
+        <li>Bug Fix: <a href="http://gitscc.codeplex.com/workitem/17213">Show Changes Window Disappear</a></li>
+        <li>Buf Fix: <a href="http://gitscc.codeplex.com/workitem/17277">Git status is not refreshed</a></li>
+        <li>Bug Fix: <a href="http://gitscc.codeplex.com/workitem/17322">config core.ignorecase true</a></li>
         <li>Merge pull request #19 from GitHub</li>
     </ul>