tekkub-fugit 0.0.4 → 0.0.5

data/VERSION.yml

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

data/fugit.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name = %q{fugit}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tekkub"]
-  s.date = %q{2009-02-18}
+  s.date = %q{2009-02-27}
   s.default_executable = %q{fugit}
   s.description = %q{A cross-platform replacement for git-gui based on wxruby}
   s.email = %q{tekkub@gmail.com}
   s.executables = ["fugit"]
-  s.files = ["fugit.gemspec", "SciTE.properties", "VERSION.yml", "bin/fugit", "lib/fugit", "lib/fugit/commit.rb", "lib/fugit/commit_tab.rb", "lib/fugit/console.rb", "lib/fugit/diff.rb", "lib/fugit/graph_renderer.rb", "lib/fugit/history_list.rb", "lib/fugit/history_tab.rb", "lib/fugit/icon_loader.rb", "lib/fugit/index_list.rb", "lib/fugit/io_get_line.rb", "lib/fugit/main_frame.rb", "lib/fugit/messages.rb", "lib/fugit/push_dialog.rb", "lib/fugit/SciTE.properties", "lib/fugit.rb", "lib/icons", "lib/icons/asterisk_yellow.png", "lib/icons/disk.png", "lib/icons/folder_add.png", "lib/icons/folder_delete.png", "lib/icons/page_add.png", "lib/icons/page_delete.png", "lib/icons/page_down.gif", "lib/icons/page_up.gif", "lib/icons/plus_minus.gif", "lib/icons/script.png", "lib/icons/script_add.png", "lib/icons/script_delete.png", "lib/icons/script_edit.png", "lib/icons/text_signature.png", "lib/icons/tick.png"]
+  s.files = ["fugit.gemspec", "SciTE.properties", "VERSION.yml", "bin/fugit", "lib/fugit", "lib/fugit/commit_dialog.rb", "lib/fugit/commit_tab.rb", "lib/fugit/commit_tab_toolbar.rb", "lib/fugit/console.rb", "lib/fugit/delete_branch_dialog.rb", "lib/fugit/diff.rb", "lib/fugit/graph_renderer.rb", "lib/fugit/history_list.rb", "lib/fugit/history_tab.rb", "lib/fugit/icon_loader.rb", "lib/fugit/index_list.rb", "lib/fugit/io_get_line.rb", "lib/fugit/main_frame.rb", "lib/fugit/messages.rb", "lib/fugit/push_dialog.rb", "lib/fugit/SciTE.properties", "lib/fugit.rb", "lib/icons", "lib/icons/arrow_divide.png", "lib/icons/arrow_divide_delete.png", "lib/icons/arrow_join.png", "lib/icons/arrow_undo.png", "lib/icons/asterisk_yellow.png", "lib/icons/cherry.png", "lib/icons/disk.png", "lib/icons/folder_add.png", "lib/icons/folder_delete.png", "lib/icons/page_add.png", "lib/icons/page_delete.png", "lib/icons/page_down.gif", "lib/icons/page_up.gif", "lib/icons/plus_minus.gif", "lib/icons/script.png", "lib/icons/script_add.png", "lib/icons/script_delete.png", "lib/icons/script_edit.png", "lib/icons/text_signature.png", "lib/icons/tick.png"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/tekkub/fugit}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]

data/lib/fugit.rb

@@ -3,18 +3,21 @@ $:.unshift File.dirname(__FILE__)
 
 require 'wx'
 
-require "fugit/io_get_line"
-require "fugit/messages"
 require "fugit/icon_loader"
-require "fugit/main_frame"
+
+require "fugit/commit_dialog"
 require "fugit/commit_tab"
-require "fugit/commit"
+require "fugit/commit_tab_toolbar"
 require "fugit/console"
+require "fugit/delete_branch_dialog"
 require "fugit/diff"
-require "fugit/index_list"
-require "fugit/history_tab"
 require "fugit/graph_renderer"
 require "fugit/history_list"
+require "fugit/history_tab"
+require "fugit/index_list"
+require "fugit/io_get_line"
+require "fugit/main_frame"
+require "fugit/messages"
 require "fugit/push_dialog"
 
 

data/lib/fugit/{commit.rb → commit_dialog.rb}

@@ -2,58 +2,66 @@ include Wx
 include IconLoader
 
 module Fugit
-	class Commit < Panel
+	class CommitDialog < Dialog
 		def initialize(parent)
-			super(parent, ID_ANY)
+			super(parent, ID_ANY, "Commit changes", :size => Size.new(500, 250))
 
 			@input = TextCtrl.new(self, ID_ANY, nil, nil, nil, TE_MULTILINE|TE_DONTWRAP)
+			@amend_check = CheckBox.new(self, ID_ANY)
+			@amend_check.set_label("&Amend previous commit")
 			@author = TextCtrl.new(self, ID_ANY)
 			@committer = TextCtrl.new(self, ID_ANY)
 			@committer.disable
 
-			@toolbar = ToolBar.new(self, ID_ANY)
-			@toolbar.set_tool_bitmap_size(Size.new(16,16))
-			@toolbar.add_tool(101, "Commit", get_icon("disk.png"), "Commit")
-			@toolbar.add_tool(102, "Sign off", get_icon("text_signature.png"), "Sign off")
-			@toolbar.add_separator
-			@toolbar.add_tool(103, "Push", get_icon("page_up.gif"), "Push")
-			#~ @toolbar.add_tool(104, "Pull", get_icon("page_down.gif"), "Pull")
-			@toolbar.realize
-
-			box = BoxSizer.new(HORIZONTAL)
-			box.add(@committer, 1, EXPAND)
-			box.add(@author, 1, EXPAND)
-
-			flex = FlexGridSizer.new(2,2,0,0)
-			flex.add(StaticText.new(self, ID_ANY, "Committer/Author:"), 0, EXPAND)
-			flex.add(box, 0, EXPAND)
-			flex.add(StaticText.new(self, ID_ANY, "Commit message:"), 0, EXPAND)
+			evt_checkbox(@amend_check, :on_amend_checked)
+
+			flex = FlexGridSizer.new(4,2,4,4)
+			flex.add(StaticText.new(self, ID_ANY, "Committer:"), 0, ALIGN_RIGHT)
+			flex.add(@committer, 0, EXPAND)
+			flex.add(StaticText.new(self, ID_ANY, "Author:"), 0, ALIGN_RIGHT)
+			flex.add(@author, 0, EXPAND)
+			flex.add(StaticText.new(self, ID_ANY, "Commit message:"), 0, ALIGN_RIGHT)
 			flex.add(@input, 0, EXPAND)
-			flex.add_growable_row(1)
+			flex.add(1,1) # Filler
+			flex.add(@amend_check, 0)
+			flex.add_growable_row(2)
 			flex.add_growable_col(1)
 
+			butt_sizer = create_button_sizer(OK|CANCEL)
+			butt_sizer.get_children.map {|s| s.get_window}.compact.each {|b| b.set_label("Commit") if b.get_label == "OK"}
+			evt_button(get_affirmative_id, :on_ok)
+
 			box = BoxSizer.new(VERTICAL)
-			box.add(@toolbar, 0, EXPAND)
-			box.add_spacer(4)
-			box.add(flex, 1, EXPAND)
+			box.add(flex, 1, EXPAND|ALL, 4)
+			box.add(butt_sizer, 0, EXPAND|BOTTOM, 4)
 			self.set_sizer(box)
 
-			evt_tool(101, :on_commit_clicked)
-			evt_tool(103, :on_push_clicked)
-
-			register_for_message(:save_clicked, :on_commit_clicked)
-			register_for_message(:commit_saved, :on_commit_saved)
-			register_for_message(:refresh, :update)
+			self.accelerator_table = AcceleratorTable.new(AcceleratorEntry.new(MOD_CMD, ?s, ID_OK))
+		end
 
+		def show_modal
 			name = `git config user.name`
 			email = `git config user.email`
 			@committer.set_value("#{name.chomp} <#{email.chomp}>")
 			@author.set_value("#{name.chomp} <#{email.chomp}>")
+			@input.set_value("")
+			@amend_check.set_value(false)
+			@input.set_focus
+
+			super
+		end
+
+		def on_amend_checked(event)
+			return unless event.is_checked && @input.get_value.empty?
+
+			raw_log = `git log -1 --pretty=raw`
+			@author.set_value($1) if raw_log =~ /author (.+>)/
+			@input.set_value($1.split("\n").map {|l| l.strip}.join("\n")) if raw_log =~ /\n\n    (.+)\n\Z/m
 		end
 
-		def on_commit_clicked
+		def on_ok
 			msg = @input.get_value
-			if !has_staged_changes?
+			if !has_staged_changes? && !@amend_check.is_checked
 				@nothing_to_commit_error ||= MessageDialog.new(self, "No changes are staged to commit.", "Commit error", OK|ICON_ERROR)
 				@nothing_to_commit_error.show_modal
 			elsif msg.empty?
@@ -62,19 +70,13 @@ module Fugit
 			else
 				commit_file = File.join(Dir.pwd, ".git", "fugit_commit.txt")
 				File.open(commit_file, "w") {|f| f << msg}
-				`git commit --file=.git/fugit_commit.txt --author="#{@author.get_value}"`
+				amend = @amend_check.is_checked ? "--amend " : ""
+				`git commit #{amend}--file=.git/fugit_commit.txt --author="#{@author.get_value}"`
 				File.delete(commit_file)
-				send_message(:commit_saved)
+				end_modal ID_OK
 			end
 		end
 
-		def on_commit_saved
-			name = `git config user.name`
-			email = `git config user.email`
-			@author.set_value("#{name.chomp} <#{email.chomp}>")
-			@input.set_value("")
-		end
-
 		def has_staged_changes?
 			staged = `git ls-files --stage`
 			last_commit = `git ls-tree -r HEAD`
@@ -95,10 +97,5 @@ module Fugit
 			!staged.empty?
 		end
 
-		def on_push_clicked
-			@push_dialog ||= PushDialog .new(self)
-			@push_dialog.show
-		end
-
 	end
 end

data/lib/fugit/commit_tab.rb

@@ -9,18 +9,16 @@ module Fugit
 			@vsplitter = SplitterWindow.new(self, ID_ANY)
 			@vsplitter.set_minimum_pane_size(150)
 
-			@hsplitter = SplitterWindow.new(@vsplitter, ID_ANY)
-			@hsplitter.set_minimum_pane_size(150)
-			@hsplitter.set_sash_gravity(1.0)
 
-			@diff = Diff.new(@hsplitter)
-			@commit = Commit.new(@hsplitter)
-			@hsplitter.split_horizontally(@diff, @commit)
+			@toolbar = CommitTabToolbar.new(self)
+			@diff = Diff.new(@vsplitter)
 
 			@index = IndexList.new(@vsplitter)
-			@vsplitter.split_vertically(@index, @hsplitter, 200)
+			@vsplitter.split_vertically(@index, @diff, 200)
 
 			box = BoxSizer.new(VERTICAL)
+			box.add(@toolbar, 0, EXPAND)
+			box.add_spacer(3)
 			box.add(@vsplitter, 1, EXPAND)
 			self.set_sizer(box)
 

data/lib/fugit/commit_tab_toolbar.rb

@@ -0,0 +1,111 @@
+include Wx
+include IconLoader
+
+module Fugit
+	class CommitTabToolbar < ToolBar
+		def initialize(parent)
+			super(parent, ID_ANY, nil, nil, TB_HORIZONTAL|NO_BORDER|TB_NODIVIDER)
+
+			self.set_tool_bitmap_size(Size.new(16,16))
+
+			stage_all_button = self.add_tool(ID_ANY, "Stage all", get_icon("folder_add.png"), "Stage all")
+			evt_tool(stage_all_button, :on_stage_all_clicked)
+
+			stage_button = self.add_tool(ID_ANY, "Stage", get_icon("page_add.png"), "Stage changed files")
+			evt_tool(stage_button, :on_stage_changed_clicked)
+
+			unstage_all_button = self.add_tool(ID_ANY, "Unstage all", get_icon("folder_delete.png"), "Unstage all")
+			evt_tool(unstage_all_button, :on_unstage_all_clicked)
+
+			self.add_separator
+
+			commit = self.add_tool(ID_ANY, "Commit", get_icon("disk.png"), "Commit")
+			evt_tool(commit, :on_commit_clicked)
+
+			self.add_separator
+
+			push = self.add_tool(ID_ANY, "Push", get_icon("page_up.gif"), "Push")
+			evt_tool(push, :on_push_clicked)
+
+			pull = self.add_tool(ID_ANY, "Pull", get_icon("page_down.gif"), "Pull")
+			self.enable_tool(pull.get_id, false)
+
+			self.add_separator
+
+			self.add_control(@branch = Choice.new(self, ID_ANY))
+			set_branches
+			evt_choice(@branch, :on_branch_choice)
+
+			merge_branch_button = self.add_tool(ID_ANY, "Merge branch", get_icon("arrow_join.png"), "Merge branch")
+			self.enable_tool(merge_branch_button.get_id, false)
+
+			delete_branch_button = self.add_tool(ID_ANY, "Delete branch", get_icon("arrow_divide_delete.png"), "Delete branch")
+			evt_tool(delete_branch_button, :on_delete_branch_clicked)
+
+			self.realize
+
+			register_for_message(:tab_switch, :update_tools)
+			register_for_message(:branch_deleted, :update_tools)
+			register_for_message(:refresh, :update_tools)
+			register_for_message(:save_clicked, :on_commit_clicked)
+			register_for_message(:push_clicked, :on_push_clicked)
+		end
+
+		def update_tools
+			return unless is_shown_on_screen
+			set_branches
+		end
+
+		def set_branches
+			branches = `git branch`
+			current = branches.match(/\* (.+)/).to_a.last
+			@branch.clear
+			branches.split("\n").each {|b| @branch.append(b.split(" ").last)}
+			@branch.set_string_selection(current) if current
+		end
+
+		def on_stage_all_clicked(event)
+			`git add --all 2>&1`
+			send_message(:index_changed)
+		end
+
+		def on_stage_changed_clicked(event)
+			`git add --update 2>&1`
+			send_message(:index_changed)
+		end
+
+		def on_unstage_all_clicked(event)
+			`git reset 2>&1`
+			send_message(:index_changed)
+		end
+
+		def on_commit_clicked
+			@commit_dialog ||= CommitDialog.new(self)
+			send_message(:commit_saved) if @commit_dialog.show_modal == ID_OK
+		end
+
+		def on_push_clicked
+			@push_dialog ||= PushDialog.new(self)
+			@push_dialog.show
+		end
+
+		def on_branch_choice(event)
+			branch = @branch.get_string(event.get_selection)
+			err = `git checkout #{branch} 2>&1`
+			if err =~ /Switched to branch "#{branch}"/
+				send_message(:branch_checkout)
+			else
+				MessageDialog.new(self, err, "Branch checkout error", OK|ICON_ERROR).show_modal
+				branches = `git branch`
+				current = branches.match(/\* (.+)/).to_a.last
+				@branch.set_string_selection(current) if current
+			end
+		end
+
+		def on_delete_branch_clicked
+			@delete_branch_dialog ||= DeleteBranchDialog.new(self)
+			@delete_branch_dialog.show
+		end
+
+	end
+end

data/lib/fugit/delete_branch_dialog.rb

@@ -0,0 +1,48 @@
+include Wx
+
+module Fugit
+	class DeleteBranchDialog < Dialog
+		def initialize(parent)
+			super(parent, ID_ANY, "Delete branches", :size => Size.new(250, 300))
+
+			@branch_list = CheckListBox.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("Delete") if b.get_label == "OK"}
+			evt_button(get_affirmative_id, :on_ok)
+
+			box = BoxSizer.new(VERTICAL)
+			box.add(StaticText.new(self, ID_ANY, "Select branches:"), 0, EXPAND|ALL, 4)
+			box.add(@branch_list, 1, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(butt_sizer, 0, EXPAND|BOTTOM, 4)
+
+			self.set_sizer(box)
+		end
+
+		def show
+			branches = `git branch`
+			branches = branches.split("\n").reject {|b| b[0..0] == "*"}.map {|b| b.strip}
+			@branch_list.set(branches)
+
+			super
+		end
+
+		def on_ok
+			unmerged = `git branch --no-merged`
+			unmerged.split("\n").map {|b| b.strip}
+
+			branches = @branch_list.get_checked_items.map {|i| @branch_list.get_string(i)}
+			unless (unmerged_to_delete = branches.reject {|b| !unmerged.include?(b)}).empty?
+				dialog = MessageDialog.new(self, "These branches are not merged into the current HEAD:\n    #{unmerged_to_delete.join("\n    ")}\n\nDeleting them may cause data loss, continue?",
+					"Unmerged branches", YES_NO|NO_DEFAULT|ICON_EXCLAMATION)
+				return if dialog.show_modal != ID_YES
+			end
+			`git branch -D #{branches.join(" ")} 2>&1`
+
+			send_message(:branch_deleted)
+
+			end_modal(ID_OK)
+		end
+
+	end
+end

data/lib/fugit/diff.rb

@@ -3,11 +3,10 @@ include Wx
 module Fugit
 	class Diff < Panel
 		def initialize(parent)
-			super(parent, ID_ANY)
+			super(parent, ID_ANY, :style => SIMPLE_BORDER)
 			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 = ListCtrl.new(self, ID_ANY, :style => LC_REPORT|LC_VRULES|NO_BORDER|LC_NO_HEADER)
 			@list.hide
 
 			@list_menu = Menu.new
@@ -25,8 +24,8 @@ module Fugit
 			self.set_sizer(@box)
 
 			#~ evt_tree_sel_changed(@list.get_id, :on_click)
-			evt_tree_item_menu(@list.get_id, :on_item_menu_request)
-			evt_tree_item_activated(@list.get_id, :on_double_click)
+			evt_list_item_right_click(@list.get_id, :on_item_menu_request)
+			evt_list_item_activated(@list.get_id, :on_double_click)
 
 			register_for_message(:commit_saved, :clear)
 			register_for_message(:diff_clear, :clear)
@@ -43,8 +42,11 @@ module Fugit
 			@text.hide
 			@list.hide
 
-			@list.delete_children(@root)
+			@list.clear_all
+			@list.insert_column(0, "Graph")
 
+			reverse_diff = type == :staged ? ["-", "\\+"] : ["+", "-"]
+			last_id = -1
 			chunks.each do |chunk|
 				chunk_diff = header + "\n" + chunk
 				chunk_diff += "\n" if chunk_diff[-1..-1] != "\n" # git bitches if we don't have a proper newline at the end of the diff
@@ -57,16 +59,14 @@ module Fugit
 							diff_val = chunk_lines.first.match(/\A@@ -\d+,(\d+)/)[1].to_i + (line[0..0] == "+" ? 1 : -1)
 							chunk_lines[0] = chunk_lines.first.gsub(/\+(\d+),\d+/, '+\1,' + diff_val.to_s)
 							chunk_lines.delete_at(i)
-							chunk_lines.map! {|l| l.gsub(/\A-/, " ")}
+							chunk_lines.map! {|l| l[0..0] == reverse_diff[0] ? "#{line}~~~DELETE~~~" : l.gsub(/\A#{reverse_diff[1]}/, " ")}
 							chunk_lines.insert(i, line)
-							chunk_lines.reject! {|l| l[0..0] == "+" && l != line}
+							chunk_lines.reject! {|l| l == "#{line}~~~DELETE~~~"}
 							header + "\n" + chunk_lines.join("\n") + "\n"
 						else
 							""
 						end
 
-					id = @list.append_item(@root, line.gsub("\t", "        "), -1, -1, [chunk_diff, line_diff, type])
-
 					color = case line[0..0]
 						when "+"
 							Colour.new(0, 96, 0)
@@ -83,11 +83,22 @@ module Fugit
 						when "@"
 							Colour.new(220, 220, 225)
 						end
-					@list.set_item_text_colour(id, color) if color
-					@list.set_item_background_colour(id, bgcolor) if bgcolor
+
+					item = ListItem.new
+					item.set_id(last_id += 1)
+					item.set_column(0)
+					item.set_data([chunk_diff, line_diff, type])
+					item.set_text(line.gsub("\t", "        "))
+					item.set_text_colour(color) if color
+					item.set_background_colour(bgcolor) if bgcolor
+
+					@list.insert_item(item)
 				end
 			end
 
+			@list.set_column_width(0, -1)
+			@list.set_column_width(0, [@list.get_column_width(0), self.size.width].max)
+
 			@list.show
 			@list.set_focus
 			@box.layout
@@ -107,15 +118,11 @@ module Fugit
 		end
 
 		def on_item_menu_request(event)
-			i = event.get_item
-			@menu_data = nil
-			unless @root == i
-				@menu_data = @list.get_item_data(i)
-				@list_menu.set_label(@menu_stage_chunk.get_id, (@menu_data[2] == :staged ? "Unstage chunk" : "Stage chunk"))
-				@list_menu.set_label(@menu_stage_line.get_id, (@menu_data[2] == :staged ? "Unstage line" : "Stage line"))
-				@menu_stage_line.enable(!@menu_data[1].empty?)
-				@list.popup_menu(@list_menu)
-			end
+			@menu_data = event.get_item.get_data
+			@list_menu.set_label(@menu_stage_chunk.get_id, (@menu_data[2] == :staged ? "Unstage chunk" : "Stage chunk"))
+			@list_menu.set_label(@menu_stage_line.get_id, (@menu_data[2] == :staged ? "Unstage line" : "Stage line"))
+			@menu_stage_line.enable(!@menu_data[1].empty?)
+			@list.popup_menu(@list_menu)
 		end
 
 		def on_menu_stage_chunk(event)
@@ -127,11 +134,8 @@ module Fugit
 		end
 
 		def on_double_click(event)
-			i = event.get_item
-			unless @root == i
-				menu_data = @list.get_item_data(i)
-				apply_diff(menu_data[1], menu_data[2]) if menu_data
-			end
+			menu_data = event.get_item.get_data
+			apply_diff(menu_data[1], menu_data[2]) if menu_data
 		end
 
 		def apply_diff(diff, type)
@@ -139,8 +143,12 @@ module Fugit
 			reverse = (type == :staged ? "--reverse" : "")
 			diff_file = File.join(Dir.pwd, ".git", "fugit_partial.diff")
 			File.open(diff_file, "wb") {|f| f << diff} # Write out in binary mode to preserve newlines, otherwise git freaks out
-			`git apply --cached #{reverse} .git/fugit_partial.diff`
-			send_message(:index_changed)
+			err = `git apply --cached #{reverse} .git/fugit_partial.diff  2>&1`
+			if err.empty?
+				send_message(:index_changed)
+			else
+				MessageDialog.new(self, err, "Error applying diff", OK|ICON_ERROR).show_modal
+			end
 		end
 	end
 end

data/lib/fugit/graph_renderer.rb

@@ -2,7 +2,9 @@
 
 module Fugit
 	module GraphRenderer
-		def graphify(commits)
+		def graphify(commits, branch_refs)
+			branch_refs = branch_refs.map {|b| b[1]}.uniq
+
 			graph = []
 			branch_parents = [commits.first[0]]
 			commits.each do |sha, parents, comment|
@@ -14,7 +16,8 @@ module Fugit
 					indicator = "│"
 					indicator = " " if parent.empty?
 					indicator = "┼" if parent_found && children.size > 1 && !parent.empty?
-					indicator = "●" if sha == parent && !parent_found
+					indicator = "○" if sha == parent && !parent_found
+					indicator = "□" if sha == "uncomitted"
 					indicator = "┘" if sha == parent && parent_found
 					children.shift if sha == parent && parent_found
 					parent_found = true if sha == parent
@@ -35,7 +38,7 @@ module Fugit
 						branch_parents << p
 						branches << "┐" if sha_index
 					end
-					branches << "●" unless sha_index
+					branches << "○" unless sha_index
 					if parents.empty?
 						found = false
 						branchoffs = branches.select{|b| b == "┘"}
@@ -49,7 +52,7 @@ module Fugit
 								else
 									b
 								end
-							found ||= b == "●"
+							found ||= b == "○"
 							val
 						end
 						branches.reverse!
@@ -73,7 +76,7 @@ module Fugit
 								else
 									b
 								end
-							found = b == "●" if !found
+							found = b == "○" if !found
 							val
 						end
 					end
@@ -86,6 +89,7 @@ module Fugit
 					match
 				end
 				branch_parents.reverse!
+				branches.map! {|b| b == "○" ? "●" : b} if branch_refs.include?(sha)
 				graph << [branches.join, comment, sha]
 			end
 			graph

data/lib/fugit/history_list.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 include Wx
+include IconLoader
 include Fugit::GraphRenderer
 
 module Fugit
@@ -10,45 +11,172 @@ module Fugit
 
 			@list = ListCtrl.new(self, ID_ANY, :style => LC_REPORT|LC_VRULES|NO_BORDER)
 
+			@list_menu = Menu.new
+			@menu_create_branch = MenuItem.new(@list_menu, ID_ANY, 'Create new branch here')
+			@menu_create_branch.set_bitmap(get_icon("arrow_divide.png"))
+			@list_menu.append_item(@menu_create_branch)
+			evt_menu(@menu_create_branch, :on_menu_create_branch)
+
+			@menu_cherry_pick = MenuItem.new(@list_menu, ID_ANY, 'Cherry-pick this commit')
+			@menu_cherry_pick.set_bitmap(get_icon("cherry.png"))
+			@list_menu.append_item(@menu_cherry_pick)
+			evt_menu(@menu_cherry_pick, :on_menu_cherry_pick)
+
+			@list_menu.append_separator
+
+			@menu_soft_reset = @list_menu.append('Soft-reset branch to here')
+			evt_menu(@menu_soft_reset, :on_menu_soft_reset)
+
+			@menu_mixed_reset = @list_menu.append('Mixed-reset branch to here')
+			evt_menu(@menu_mixed_reset, :on_menu_mixed_reset)
+
+			@menu_hard_reset = MenuItem.new(@list_menu, ID_ANY, 'Hard-reset branch to here')
+			@menu_hard_reset.set_bitmap(get_icon("arrow_undo.png"))
+			@list_menu.append_item(@menu_hard_reset)
+			evt_menu(@menu_hard_reset, :on_menu_hard_reset)
+
 			@box = BoxSizer.new(VERTICAL)
 			@box.add(@list, 1, EXPAND)
 			self.set_sizer(@box)
 
-			register_for_message(:history_tab_shown) do
-				update_list unless @has_initialized
-				@list.set_focus
-			end
+			evt_list_item_right_click(@list.get_id, :on_list_menu_request)
+
+			register_for_message(:history_tab_shown, :update_list)
+			register_for_message(:tab_switch, :update_list)
+			register_for_message(:refresh, :update_list)
 			register_for_message(:exiting) {self.hide} # Things seem to run smoother if we hide before destruction
 		end
 
 		def update_list
+			return unless is_shown_on_screen
 			@list.hide
 			@list.clear_all
 
-			@list.insert_column(0, "Graph")
-			@list.insert_column(1, "SHA1")
-			@list.insert_column(2, "Commit note")
+			@list.insert_column(0, "")
+			@list.insert_column(1, "Branches")
+			@list.insert_column(2, "SHA1")
+			@list.insert_column(3, "Commit note")
 
 			mono_font = Font.new(8, FONTFAMILY_TELETYPE, FONTSTYLE_NORMAL, FONTWEIGHT_NORMAL)
 
+			branches = `git branch -v -a --no-abbrev`
+			branches = branches.split("\n").map {|b| [b[2..-1].split(" ")[0..1], b[0..0] == "*"].flatten}
+
 			output = `git log --pretty=format:"%H\t%P\t%s" --date-order --all`
 			lines = output.split("\n").map! {|line| line.split("\t")}
-			log = graphify(lines)
+			current_sha = branches.reject {|b| !b.last}.first[1]
+			lines.insert(0, ["uncomitted", current_sha, "<Uncomitted changes>"]) if has_uncomitted_changes?
+			log = graphify(lines, branches)
 
 			log.each_index do |i|
 				(graph, comment, sha) = log[i]
+				comment_branches = branches.reject {|b| b[1] != sha}.map {|b| (b.last ? "*" : "") + b.first}
 				@list.insert_item(i, sha)
 				@list.set_item(i, 0, graph)
-				@list.set_item(i, 1, sha[0..7])
-				@list.set_item(i, 2, (comment.nil? || comment.empty?) ? "<No comment>" : comment)
+				@list.set_item(i, 1, comment_branches.join(" "))
+				@list.set_item(i, 2, sha == "uncomitted" ? "" : sha[0..7])
+				@list.set_item(i, 3, (comment.nil? || comment.empty?) ? "<No comment>" : comment)
+				@list.set_item_data(i, sha)
+				@list.set_item_background_colour(i, Colour.new(255, 220, 220)) if sha == "uncomitted"
+				@list.set_item_background_colour(i, Colour.new(220, 220, 225)) if comment_branches.join =~ /\*/
 			end
 
 			@list.set_column_width(0, -1)
+			@list.set_column_width(0, [150, @list.get_column_width(0)].min)
 			@list.set_column_width(1, -1)
-			@list.set_column_width(2, -2)
+			@list.set_column_width(1, [150, @list.get_column_width(1)].min)
+			@list.set_column_width(2, -1)
+			@list.set_column_width(3, -1)
 
 			@list.show
-			@has_initialized = true
+			@list.set_focus
+		end
+
+		def on_list_menu_request(event)
+			@menu_data = event.get_item.get_data
+			@list.popup_menu(@list_menu)
+		end
+
+		def on_menu_create_branch(event)
+			@new_branch_dialog ||= TextEntryDialog.new(self, "New branch name:", "Create branch")
+			@new_branch_dialog.set_value("")
+			if @new_branch_dialog.show_modal == ID_OK
+				err = `git branch #{@new_branch_dialog.get_value} #{@menu_data} 2>&1`
+				if err.empty?
+					send_message(:refresh)
+				else
+					MessageDialog.new(self, err, "Error creating branch", OK|ICON_ERROR).show_modal
+				end
+			end
+		end
+
+		def on_menu_cherry_pick(event)
+			err = `git cherry-pick  #{@menu_data} 2>&1`
+			if err =~ /Automatic cherry-pick failed/
+				MessageDialog.new(self, err, "Error cherry-picking", OK|ICON_ERROR).show_modal
+			else
+				send_message(:refresh)
+			end
+		end
+
+		def on_menu_soft_reset(event)
+			err = `git reset --soft  #{@menu_data} 2>&1`
+			if !err.empty?
+				MessageDialog.new(self, err, "Error resetting", OK|ICON_ERROR).show_modal
+			else
+				send_message(:refresh)
+			end
+		end
+
+		def on_menu_mixed_reset(event)
+			err = `git reset --mixed  #{@menu_data} 2>&1`
+			#~ if !(err =~ /HEAD is now at/)
+				#~ MessageDialog.new(self, err, "Error resetting", OK|ICON_ERROR).show_modal
+			#~ else
+				send_message(:refresh)
+			#~ end
+		end
+
+		def on_menu_hard_reset(event)
+			if has_uncomitted_changes?
+				@uncomitted_hard_dialog ||= MessageDialog.new(self, "Uncommitted changes will be lost, continue?", "Uncomitted changes", YES_NO|NO_DEFAULT|ICON_EXCLAMATION)
+				return if @uncomitted_hard_dialog.show_modal != ID_YES
+			end
+
+			err = `git reset --hard  #{@menu_data} 2>&1`
+			if !(err =~ /HEAD is now at/)
+				MessageDialog.new(self, err, "Error resetting", OK|ICON_ERROR).show_modal
+			else
+				send_message(:refresh)
+			end
+		end
+
+		def has_uncomitted_changes?
+			deleted = `git ls-files --deleted`
+			modified = `git ls-files --modified`
+			staged = `git ls-files --stage`
+			last_commit = `git ls-tree -r HEAD`
+
+			committed = {}
+			last_commit.split("\n").map do |line|
+				(info, file) = line.split("\t")
+				sha = info.match(/[a-f0-9]{40}/)[0]
+				committed[file] = sha
+			end
+
+			deleted = deleted.split("\n")
+			modified = modified.split("\n")
+			staged = staged.split("\n").map do |line|
+				(info, file) = line.split("\t")
+				sha = info.match(/[a-f0-9]{40}/)[0]
+				[file, sha]
+			end
+			committed.each_pair do |file, sha|
+				staged << [file, ""] unless staged.assoc(file)
+			end
+			staged.reject! {|file, sha| committed[file] == sha}
+
+			return !(deleted + modified + staged).empty?
 		end
 
 	end

data/lib/fugit/icon_loader.rb

@@ -2,7 +2,7 @@
 module IconLoader
 	IconBasePath = File.expand_path(File.join(File.dirname(__FILE__), "..", "icons"))
 
-	def get_icon(name, type = "png")
+	def get_icon(name)
 		icon = File.join(IconBasePath, name)
 		case name[-3..-1].downcase
 		when "png"

data/lib/fugit/index_list.rb

@@ -6,7 +6,7 @@ module Fugit
 		def initialize(parent)
 			super(parent, ID_ANY)
 
-			@index = TreeCtrl.new(self, ID_ANY, nil, nil, NO_BORDER|TR_MULTIPLE|TR_HIDE_ROOT|TR_FULL_ROW_HIGHLIGHT|TR_NO_LINES)
+			@index = TreeCtrl.new(self, ID_ANY, nil, nil, TR_MULTIPLE|TR_HIDE_ROOT|TR_FULL_ROW_HIGHLIGHT|TR_NO_LINES)
 
 			imagelist = ImageList.new(16, 16)
 			imagelist << get_icon("asterisk_yellow.png")
@@ -23,15 +23,6 @@ module Fugit
 			@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))
-			stage_all_button = @toolbar.add_tool(ID_ANY, "Stage all", get_icon("folder_add.png"), "Stage all")
-			stage_button = @toolbar.add_tool(ID_ANY, "Stage", get_icon("page_add.png"), "Stage file")
-			@toolbar.add_separator
-			unstage_button = @toolbar.add_tool(ID_ANY, "Unstage", get_icon("page_delete.png"), "Unstage file")
-			unstage_all_button = @toolbar.add_tool(ID_ANY, "Unstage all", get_icon("folder_delete.png"), "Unstage all")
-			@toolbar.realize
-
 			@unstaged_menu = Menu.new
 			@menu_stage_file = @unstaged_menu.append('Stage file')
 			@menu_revert_changes = @unstaged_menu.append('Revert changes')
@@ -43,19 +34,16 @@ module Fugit
 			evt_tree_item_menu(@index.get_id, :on_menu_request)
 
 			box = BoxSizer.new(VERTICAL)
-			box.add(@toolbar, 0, EXPAND)
 			box.add(@index, 1, EXPAND)
 			self.set_sizer(box)
 
 			evt_tree_sel_changed(@index.get_id, :on_click)
 			evt_tree_item_activated(@index.get_id, :on_double_click)
 
-			evt_tool(stage_all_button, :on_stage_all_clicked)
-			evt_tool(unstage_all_button, :on_unstage_all_clicked)
-
 			evt_tree_item_collapsing(@index.get_id) {|event| event.veto}
 
-			register_for_message(:refresh, :update_tree)
+			register_for_message(:refresh) {update_tree if is_shown_on_screen}
+			register_for_message(:branch_checkout) {update_tree if is_shown_on_screen}
 			register_for_message(:commit_saved, :update_tree)
 			register_for_message(:index_changed, :update_tree)
 			register_for_message(:exiting) {self.hide} # Things seem to run smoother if we hide before destruction
@@ -145,21 +133,6 @@ 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
@@ -212,12 +185,12 @@ module Fugit
 			when :unstaged
 				case change
 				when :deleted
-					`git rm --cached "#{file}"`
+					`git rm --cached "#{file}" 2>&1`
 				else
-					`git add "#{file}"`
+					`git add "#{file}" 2>&1`
 				end
 			when :staged
-				`git reset "#{file}"`
+				`git reset "#{file}" 2>&1`
 			end
 
 			send_message(:index_changed)

data/lib/fugit/main_frame.rb

@@ -24,7 +24,7 @@ module Fugit
 			icon_file = File.expand_path(File.join(IconBasePath, "plus_minus.gif"))
 			self.icon = Icon.new(icon_file, BITMAP_TYPE_GIF)
 
-			evt_notebook_page_changed(@notebook) {|event| send_message(:history_tab_shown) if event.get_selection == 1}
+			evt_notebook_page_changed(@notebook) {|event| send_message(:tab_switch)}
 
 			menu_bar = MenuBar.new
 
@@ -32,6 +32,7 @@ module Fugit
 			menu_file = Menu.new
 			# Using ID_EXIT standard id means the menu item will be given the right label for the platform and language, and placed in the correct platform-specific menu - eg on OS X, in the Application's menu
 			menu_file.append(ID_SAVE, "&Save commit\tCtrl-S", "Save commit")
+			push = menu_file.append(ID_ANY, "&Push\tCtrl-P", "Push commits to a remote repo")
 			refresh = menu_file.append(ID_ANY, "&Refresh\tF5", "Refresh the index list")
 			menu_file.append(ID_EXIT, "E&xit", "Quit this program")
 			menu_bar.append(menu_file, "&File")
@@ -45,6 +46,7 @@ module Fugit
 			self.menu_bar = menu_bar
 
 			evt_menu(ID_SAVE) {|event| send_message(:save_clicked)}
+			evt_menu(push) {|event| send_message(:push_clicked)}
 			evt_menu(refresh) {|event| send_message(:refresh)}
 			evt_menu(ID_EXIT) {|event| close} # End the application; it should finish automatically when the last window is closed.
 			evt_menu(ID_ABOUT) do |event|

data/lib/fugit/push_dialog.rb

@@ -3,35 +3,30 @@ include Wx
 module Fugit
 	class PushDialog < Dialog
 		def initialize(parent)
-			super(parent, ID_ANY, "Push branches", :size => Size.new(350, 500))
+			super(parent, ID_ANY, "Push branches", :size => Size.new(400, 500))
 
 			@branch_list = CheckListBox.new(self, ID_ANY)
+			@tag_check = CheckBox.new(self, ID_ANY)
+			@tag_check.set_label("Include &tags")
+			@force_check = CheckBox.new(self, ID_ANY)
+			@force_check.set_label("&Force update")
+			@remote = ComboBox.new(self, ID_ANY)
 			@log = TextCtrl.new(self, ID_ANY, :size => Size.new(20, 150), :style => TE_MULTILINE|TE_DONTWRAP|TE_READONLY)
 			@progress = Gauge.new(self, ID_ANY, 100, :size => Size.new(20, 20))
 
-			@remote = ComboBox.new(self, ID_ANY)
-
-			check_panel = Panel.new(self, ID_ANY)
-			@tag_check = CheckBox.new(check_panel, ID_ANY)
-			@force_check = CheckBox.new(check_panel, ID_ANY)
-
-			flex = FlexGridSizer.new(1,2,4,4)
-			flex.add(@tag_check, 0, EXPAND)
-			flex.add(StaticText.new(check_panel, ID_ANY, "Include tags"), 0, EXPAND)
-			flex.add(@force_check, 0, EXPAND)
-			flex.add(StaticText.new(check_panel, ID_ANY, "Force update"), 0, EXPAND)
-
-			check_panel.set_sizer(flex)
-
 			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)
 			box2 = BoxSizer.new(HORIZONTAL)
+			box3 = BoxSizer.new(VERTICAL)
+
+			box3.add(@tag_check, 1)
+			box3.add(@force_check, 1, TOP, 4)
 
 			box2.add(@branch_list, 1, EXPAND|LEFT|RIGHT|BOTTOM, 4)
-			box2.add(check_panel, 1)
+			box2.add(box3, 1, ALL, 4)
 
 			box.add(StaticText.new(self, ID_ANY, "Select branches:"), 0, EXPAND|ALL, 4)
 			box.add(box2, 1, EXPAND)
@@ -49,8 +44,9 @@ module Fugit
 			branches = `git branch`
 			remotes = `git remote`
 			@remote.clear
-			remotes.split("\n").each {|r| @remote.append(r)}
-			@remote.set_value(@remote.get_string(0))
+			remotes = remotes.split("\n")
+			remotes.each {|r| @remote.append(r)}
+			@remote.set_value(remotes.include?("origin") ? "origin" : remotes[0])
 			current = branches.match(/\* (.+)/).to_a.last
 			branches = branches.split("\n").map {|b| b.split(" ").last}
 			@branch_list.set(branches)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tekkub-fugit
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tekkub
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-18 00:00:00 -08:00
+date: 2009-02-27 00:00:00 -08:00
 default_executable: fugit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,9 +36,11 @@ files:
 - VERSION.yml
 - bin/fugit
 - lib/fugit
-- lib/fugit/commit.rb
+- lib/fugit/commit_dialog.rb
 - lib/fugit/commit_tab.rb
+- lib/fugit/commit_tab_toolbar.rb
 - lib/fugit/console.rb
+- lib/fugit/delete_branch_dialog.rb
 - lib/fugit/diff.rb
 - lib/fugit/graph_renderer.rb
 - lib/fugit/history_list.rb
@@ -52,7 +54,12 @@ files:
 - lib/fugit/SciTE.properties
 - lib/fugit.rb
 - lib/icons
+- lib/icons/arrow_divide.png
+- lib/icons/arrow_divide_delete.png
+- lib/icons/arrow_join.png
+- lib/icons/arrow_undo.png
 - lib/icons/asterisk_yellow.png
+- lib/icons/cherry.png
 - lib/icons/disk.png
 - lib/icons/folder_add.png
 - lib/icons/folder_delete.png