tekkub-fugit 0.0.1 → 0.0.2

data/VERSION.yml

@@ -1,4 +1,4 @@
---- 
+---
 :minor: 0
-:patch: 1
+:patch: 2
 :major: 0

data/fugit.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{fugit}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tekkub"]
-  s.date = %q{2009-02-10}
+  s.date = %q{2009-02-11}
   s.default_executable = %q{fugit}
   s.description = %q{A cross-platform replacement for git-gui based on wxruby}
   s.email = %q{tekkub@gmail.com}

data/lib/fugit/diff.rb

@@ -7,6 +7,7 @@ module Fugit
 			self.set_font(Font.new(8, FONTFAMILY_TELETYPE, FONTSTYLE_NORMAL, FONTWEIGHT_NORMAL))
 
 			@list = TreeCtrl.new(self, ID_ANY, nil, nil, NO_BORDER|TR_MULTIPLE|TR_HIDE_ROOT|TR_FULL_ROW_HIGHLIGHT|TR_NO_LINES)
+			@root = @list.add_root("root")
 			@list.hide
 
 			@list_menu = Menu.new
@@ -26,7 +27,6 @@ module Fugit
 			evt_tree_item_activated(@list.get_id, :on_double_click)
 
 			register_for_message(:commit_saved, :clear)
-			register_for_message(:index_changed, :clear)
 			register_for_message(:diff_clear, :clear)
 			register_for_message(:diff_set, :set_diff)
 			register_for_message(:diff_raw, :change_value)
@@ -41,13 +41,13 @@ module Fugit
 			@text.hide
 			@list.hide
 
-			@list.delete_all_items
-			root = @list.add_root("root")
+			@list.delete_children(@root)
+
 			chunks.each do |chunk|
 				diff = header + "\n" + chunk
 				diff = diff + "\n" if diff[-1..-1] != "\n" # git bitches if we don't have a proper newline at the end of the diff
 				chunk.split("\n").each do |line|
-					id = @list.append_item(root, line.gsub("\t", "        "), -1, -1, [diff, type])
+					id = @list.append_item(@root, line.gsub("\t", "        "), -1, -1, [diff, type])
 
 					color = case line[0..0]
 						when "+"
@@ -91,7 +91,7 @@ module Fugit
 		def on_item_menu_request(event)
 			i = event.get_item
 			@menu_data = nil
-			unless @list.get_root_item == i
+			unless @root == i
 				@menu_data = @list.get_item_data(i)
 				@list_menu.set_label(@menu_stage_chunk.get_id, (@menu_data[1] == :staged ? "Unstage chunk" : "Stage chunk"))
 				@list.popup_menu(@list_menu)
@@ -104,7 +104,7 @@ module Fugit
 
 		def on_double_click(event)
 			i = event.get_item
-			apply_diff(*@list.get_item_data(i)) unless @list.get_root_item == i
+			apply_diff(*@list.get_item_data(i)) unless @root == i
 		end
 
 		def apply_diff(diff, type)

data/lib/fugit/index_list.rb

@@ -17,6 +17,12 @@ module Fugit
 			imagelist << get_icon("script.png")
 			@index.set_image_list(imagelist)
 
+			root = @index.add_root("root")
+			@unstaged = @index.append_item(root, "Unstaged", 0)
+			@staged = @index.append_item(root, "Staged", 1)
+			@index.set_item_bold(@unstaged)
+			@index.set_item_bold(@staged)
+
 			@toolbar = ToolBar.new(self, ID_ANY, nil, nil, TB_HORIZONTAL|NO_BORDER|TB_NODIVIDER)
 			@toolbar.set_tool_bitmap_size(Size.new(16,16))
 			@toolbar.add_tool(101, "Stage all", get_icon("folder_add.png"), "Stage all")
@@ -34,6 +40,9 @@ module Fugit
 			evt_tree_sel_changed(@index.get_id, :on_click)
 			evt_tree_item_activated(@index.get_id, :on_double_click)
 
+			evt_tool(101, :on_stage_all_clicked)
+			evt_tool(104, :on_unstage_all_clicked)
+
 			evt_tree_item_collapsing(@index.get_id) {|event| event.veto}
 
 			register_for_message(:refresh, :update_tree)
@@ -73,24 +82,35 @@ module Fugit
 			staged.reject! {|file, sha| committed[file] == sha}
 
 			@index.hide
-			@index.delete_all_items
-			root = @index.add_root("root")
-			uns = @index.append_item(root, "Unstaged", 0)
-			stg = @index.append_item(root, "Staged", 1)
-
-			others.split("\n").each {|file| @index.append_item(uns, file, 2, -1, [file, :new, :unstaged])}
-			modified.split("\n").each {|file| @index.append_item(uns, file, 3, -1, [file, :modified, :unstaged]) unless deleted.include?(file)}
-			deleted.each {|file| @index.append_item(uns, file, 4, -1, [file, :deleted, :unstaged])}
-			staged.each {|file, sha| @index.append_item(stg, file, 5, -1, [file, :modified, :staged])}
-
-			@index.get_root_items.each do |i|
-				@index.set_item_bold(i)
-				@index.sort_children(i)
+			selection = @index.get_selections.map {|i| @index.get_item_data(i)}
+			@index.delete_children(@unstaged)
+			@index.delete_children(@staged)
+
+			others.split("\n").each {|file| @index.append_item(@unstaged, file, 2, -1, [file, :new, :unstaged])}
+			modified.split("\n").each {|file| @index.append_item(@unstaged, file, 3, -1, [file, :modified, :unstaged]) unless deleted.include?(file)}
+			deleted.each {|file| @index.append_item(@unstaged, file, 4, -1, [file, :deleted, :unstaged])}
+			staged.each {|file, sha| @index.append_item(@staged, file, 5, -1, [file, :modified, :staged])}
+
+			@index.sort_children(@unstaged)
+			@index.sort_children(@staged)
+			@index.select_item(@unstaged, false)
+			@index.select_item(@staged, false)
+
+			to_select = []
+			@index.each {|i| to_select << i if selection.include?(@index.get_item_data(i))}
+			to_select.each {|i| @index.select_item(i)}
+			if to_select.size == 1
+				set_diff(*@index.get_item_data(to_select[0]))
+			else
+				send_message(:diff_clear)
 			end
 
 			@index.expand_all
+			@index.ensure_visible(to_select.empty? ? @unstaged : to_select[0])
+			@index.set_scroll_pos(HORIZONTAL, 0)
 			@index.show
 			self.enable
+			self.set_focus unless to_select.size == 1
 		end
 
 
@@ -100,33 +120,17 @@ module Fugit
 			i = event.get_item
 			return if i == 0 || !self.enabled?
 
-			if @index.get_root_items.include?(i)
+			if i == @unstaged || i == @staged || @index.get_selections.size != 1
 				send_message(:diff_clear)
 			else
-				(file, change, status) = @index.get_item_data(i)
-				case status
-				when :unstaged
-					case change
-					when :new
-						val = File.read(file)
-						send_message(:diff_raw, val)
-					when :modified, :deleted
-						val = `git diff -- #{file}`
-						send_message(:diff_set, val, :unstaged)
-					else
-						send_message(:diff_clear)
-					end
-				when :staged
-					val = `git diff --cached -- #{file}`
-					send_message(:diff_set, val, :staged)
-				end
+				set_diff(*@index.get_item_data(i))
 			end
 		end
 
 
 		def on_double_click(event)
 			i = event.get_item
-			unless @index.get_root_items.include?(i)
+			unless i == @unstaged || i == @staged
 				(file, change, status) = @index.get_item_data(i)
 				case status
 				when :unstaged
@@ -144,5 +148,39 @@ module Fugit
 			end
 		end
 
+		def on_stage_all_clicked(event)
+			children = @index.get_children(@unstaged).map {|child| @index.get_item_data(child)}
+			to_delete = children.reject {|file, change, status| change != :deleted}.map {|f,c,s| f}
+			to_add = children.map {|f,c,s| f} - to_delete
+			`git rm --cached "#{to_delete.join('" "')}"` unless to_delete.empty?
+			`git add "#{to_add.join('" "')}"` unless to_add.empty?
+			send_message(:index_changed)
+		end
+
+		def on_unstage_all_clicked(event)
+			children = @index.get_children(@staged).map {|child| @index.get_item_data(child)[0]}
+			`git reset "#{children.join('" "')}"` unless children.empty?
+			send_message(:index_changed)
+		end
+
+		def set_diff(file, change, status)
+			case status
+			when :unstaged
+				case change
+				when :new
+					val = File.read(file)
+					send_message(:diff_raw, val)
+				when :modified, :deleted
+					val = `git diff -- #{file}`
+					send_message(:diff_set, val, :unstaged)
+				else
+					send_message(:diff_clear)
+				end
+			when :staged
+				val = `git diff --cached -- #{file}`
+				send_message(:diff_set, val, :staged)
+			end
+		end
+
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tekkub-fugit
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tekkub
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-02-11 00:00:00 -08:00
 default_executable: fugit
 dependencies: 
 - !ruby/object:Gem::Dependency