tekkub-fugit 0.0.6 → 0.0.7

data/Rakefile

@@ -11,6 +11,8 @@ begin
 		s.authors = ["Tekkub"]
 		s.bindir = 'bin'
 		s.add_dependency('wxruby', [">= 1.9.9"])
+		s.add_dependency('mime-types', [">= 1.15"])
+		s.add_dependency('diff-lcs', [">= 1.1.2"])
 	end
 rescue LoadError
 	puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 6
+:patch: 7

data/lib/fugit/commit_tab.rb

@@ -21,8 +21,6 @@ module Fugit
 			box.add_spacer(3)
 			box.add(@vsplitter, 1, EXPAND)
 			self.set_sizer(box)
-
-			self.accelerator_table = AcceleratorTable.new(AcceleratorEntry.new(MOD_CMD, ?w, ID_EXIT))
 		end
 	end
 end

data/lib/fugit/create_branch_dialog.rb

@@ -3,14 +3,18 @@ include Wx
 module Fugit
 	class CreateBranchDialog < Dialog
 		def initialize(parent)
-			super(parent, ID_ANY, "Create branch", :size => Size.new(300, 165))
+			super(parent, ID_ANY, "Create branch", :size => Size.new(300, 185))
 
 			@name = TextCtrl.new(self, ID_ANY)
 			@refs = ComboBox.new(self, ID_ANY)
 
-			@force_check = CheckBox.new(self, ID_ANY)
-			@force_check.set_label("&Force")
-			@force_check.set_tool_tip("Force the creation of a new branch even if it means deleting\na branch that already exists with the same name.")
+      @force_check = CheckBox.new(self, ID_ANY)
+      @force_check.set_label("&Force")
+      @force_check.set_tool_tip("Force the creation of a new branch even if it means deleting\na branch that already exists with the same name.")
+
+      @checkout_check = CheckBox.new(self, ID_ANY)
+      @checkout_check.set_label("&Checkout")
+      @checkout_check.set_tool_tip("Checkout branch after creation.")
 
 			butt_sizer = create_button_sizer(OK|CANCEL)
 			butt_sizer.get_children.map {|s| s.get_window}.compact.each {|b| b.set_label("Create") if b.get_label == "OK"}
@@ -22,6 +26,7 @@ module Fugit
 			box.add(StaticText.new(self, ID_ANY, "Create at:"), 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
 			box.add(@refs, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
 			box.add(@force_check, 1, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(@checkout_check, 1, EXPAND|LEFT|RIGHT|BOTTOM, 4)
 			box.add(butt_sizer, 0, EXPAND|BOTTOM, 4)
 
 			self.set_sizer(box)
@@ -54,8 +59,19 @@ module Fugit
 			err = `git branch #{force}#{name} #{ref} 2>&1`
 
 			if err.empty?
-				send_message(:branch_created)
-				end_modal(ID_OK)
+			  if @checkout_check.is_checked
+    			success, err = repo.checkout(name)
+    			if success
+    				send_message(:branch_checkout)
+  				  end_modal(ID_OK)
+    			else
+    				MessageDialog.new(self, err, "Branch checkout error", OK|ICON_ERROR).show_modal
+    				@branch.set_string_selection(repo.head.name)
+    			end
+  			else
+				  send_message(:branch_created)
+				  end_modal(ID_OK)
+		    end
 			else
 				MessageDialog.new(self, err, "Error creating branch", OK|ICON_ERROR).show_modal
 			end

data/lib/fugit/fetch_dialog.rb

@@ -12,7 +12,6 @@ module Fugit
 			@prune_check.set_label("&Prune deleted branches")
 
 			butt_sizer = create_button_sizer(OK|CANCEL)
-			butt_sizer.get_children.map {|s| s.get_window}.compact.each {|b| b.set_label(b.get_label == "OK" ? "Fetch" : "Close")}
 			evt_button(get_affirmative_id, :on_ok)
 
 			box = BoxSizer.new(VERTICAL)

data/lib/fugit/history_list.rb

@@ -49,6 +49,7 @@ module Fugit
 			register_for_message(:history_tab_shown, :update_list)
 			register_for_message(:tab_switch, :update_list)
 			register_for_message(:branch_created, :update_list)
+			register_for_message(:branch_checkout, :update_list)
 			register_for_message(:branch_deleted, :update_list)
 			register_for_message(:refresh, :update_list)
 			register_for_message(:exiting) {self.hide} # Things seem to run smoother if we hide before destruction

data/lib/fugit/main_frame.rb

@@ -72,6 +72,8 @@ module Fugit
 				destroy
 				exit
 			end
+
+			self.accelerator_table = AcceleratorTable.new(AcceleratorEntry.new(MOD_CMD, ?w, ID_EXIT))
 		end
 
 		def setup_working_directory

data/lib/fugit/push_dialog.rb

@@ -13,7 +13,6 @@ module Fugit
 			@remote = ComboBox.new(self, ID_ANY)
 
 			butt_sizer = create_button_sizer(OK|CANCEL)
-			butt_sizer.get_children.map {|s| s.get_window}.compact.each {|b| b.set_label(b.get_label == "OK" ? "Push" : "Close")}
 			evt_button(get_affirmative_id, :on_ok)
 
 			box = BoxSizer.new(VERTICAL)

data/lib/fugit/tab_toolbar.rb

@@ -59,6 +59,7 @@ module Fugit
 
 			register_for_message(:tab_switch, :update_tools)
 			register_for_message(:branch_created, :update_tools)
+			register_for_message(:branch_checkout, :update_tools)
 			register_for_message(:branch_deleted, :update_tools)
 			register_for_message(:refresh, :update_tools)
 			register_for_message(:save_clicked, :on_commit_clicked)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tekkub-fugit
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Tekkub
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-05 00:00:00 -07:00
+date: 2009-05-06 00:00:00 -07:00
 default_executable: fugit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.9.9
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.15"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.2
+    version: 
 description: A cross-platform replacement for git-gui based on wxruby
 email: tekkub@gmail.com
 executables: