@@ -91,6 +91,11 @@ class ApplicationController < OSX::NSObject @current_search_item = sender.title end + def search_commits(sender) + @commits_controller.search_commits(@current_search_item, sender.stringValue) + end + + private def setup_refs_view_menu [@local_branches_menu, @remote_branches_menu, @tags_menu].each { |m| m.submenu.setAutoenablesItems(false) } @@ -116,6 +121,9 @@ class ApplicationController < OSX::NSObject def setup_search_field @search_menu = NSMenu.alloc.initWithTitle("Search Menu") @search_field.cell.setSearchMenuTemplate(@search_menu) + @search_field.cell.setSendsWholeSearchString(true) + @search_field.setTarget(self) + @search_field.setAction(:search_commits) @search_menu.setAutoenablesItems(false) add_menu_item = lambda do |title, tooltip, state| @@ -130,10 +138,11 @@ class ApplicationController < OSX::NSObject end end - add_menu_item.call("Commits", "Search commit messages", true) + add_menu_item.call("Message", "Search commit messages", true) add_menu_item.call("SHA1", "Find a commit by its SHA1 hash", false) + add_menu_item.call("Committer", "Find all all commits by a particular committer", false) add_menu_item.call("Author", "Find all all commits by a particular author", false) add_menu_item.call("Path", "Find commits based on a path", false) - + @search_field.cell.setPlaceholderString("Search commits...") end end ApplicationController.rb @@ -224,6 +224,27 @@ class CommitsController < OSX::NSObject select_latest_commit end + def search_commits(category, query) + unless query == "" + repo = @application_controller.repo + case category.downcase.to_sym + when :message + @commits = Grit::Commit.find_all(repo, nil, {:grep => query, :i => true}) + when :committer + @commits = Grit::Commit.find_all(repo, nil, {:committer => query}) + when :author + @commits = Grit::Commit.find_all(repo, nil, {:author => query}) + when :sha1 + @commits = [repo.commit(query)] + when :path + @commits = repo.log(@branch, query) + end + @commits_table.reloadData + select_latest_commit + else + refresh + end + end private CommitsController.rb @@ -519,18 +519,18 @@ <int key="NSSegmentStyle">2</int> </object> </object> - <object class="NSSearchField" id="444059892"> + <object class="NSSearchField" id="349599463"> <reference key="NSNextResponder" ref="831824449"/> <int key="NSvFlags">292</int> - <string key="NSFrame">{{292, 11}, {154, 22}}</string> + <string key="NSFrame">{{347, 11}, {189, 22}}</string> <reference key="NSSuperview" ref="831824449"/> <bool key="NSEnabled">YES</bool> - <object class="NSSearchFieldCell" key="NSCell" id="534219204"> + <object class="NSSearchFieldCell" key="NSCell" id="508547132"> <int key="NSCellFlags">343014976</int> <int key="NSCellFlags2">268436480</int> <string key="NSContents"/> <reference key="NSSupport" ref="98627494"/> - <reference key="NSControlView" ref="444059892"/> + <reference key="NSControlView" ref="349599463"/> <bool key="NSDrawsBackground">YES</bool> <int key="NSTextBezelStyle">1</int> <object class="NSColor" key="NSBackgroundColor"> @@ -548,8 +548,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">search</string> <string key="NSAction">_searchFieldSearch:</string> - <reference key="NSTarget" ref="534219204"/> - <reference key="NSControlView" ref="444059892"/> + <reference key="NSTarget" ref="508547132"/> + <reference key="NSControlView" ref="349599463"/> <int key="NSButtonFlags">138690815</int> <int key="NSButtonFlags2">0</int> <string key="NSKeyEquivalent"/> @@ -577,8 +577,8 @@ </object> </object> <string key="NSAction">_searchFieldCancel:</string> - <reference key="NSTarget" ref="534219204"/> - <reference key="NSControlView" ref="444059892"/> + <reference key="NSTarget" ref="508547132"/> + <reference key="NSControlView" ref="349599463"/> <int key="NSButtonFlags">138690815</int> <int key="NSButtonFlags2">0</int> <string key="NSKeyEquivalent"/> @@ -1532,7 +1532,7 @@ <object class="IBOutletConnection" key="connection"> <string key="label">search_field</string> <reference key="source" ref="620275248"/> - <reference key="destination" ref="444059892"/> + <reference key="destination" ref="349599463"/> </object> <int key="connectionID">555</int> </object> @@ -1581,7 +1581,7 @@ <reference ref="869639466"/> <reference ref="1049027428"/> <reference ref="637722390"/> - <reference ref="444059892"/> + <reference ref="349599463"/> </object> <reference key="parent" ref="469667931"/> </object> @@ -2211,17 +2211,17 @@ </object> <object class="IBObjectRecord"> <int key="objectID">553</int> - <reference key="object" ref="444059892"/> + <reference key="object" ref="349599463"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="534219204"/> + <reference ref="508547132"/> </object> <reference key="parent" ref="831824449"/> </object> <object class="IBObjectRecord"> <int key="objectID">554</int> - <reference key="object" ref="534219204"/> - <reference key="parent" ref="444059892"/> + <reference key="object" ref="508547132"/> + <reference key="parent" ref="349599463"/> </object> </object> </object> English.lproj/MainMenu.xib @@ -44,7 +44,7 @@ class NetworkController < OSX::NSObject <h2>If this is a Github repository you can set your credentials to view your network</h2> <pre> git config github.user REPO_USER - git config githuser.repo REPO_NAME + git config githubV.repo REPO_NAME </pre> </body> </html> NetworkController.rb 6040395dc9ee34a36fd1ad92802bef9a956b8831 Justin Palmer justin@activereload.net http://github.com/Caged/gitnub/commit/8782859a0a20df930a1e5729382809fc0838aabe 8782859a0a20df930a1e5729382809fc0838aabe 2008-06-13T01:29:26-07:00 2008-06-13T01:29:26-07:00 Find commits by specifying a file/path f80068e5453675e065a5bc5940652933b794dc1d Justin Palmer justin@activereload.net