tekkub-fugit 0.0.5 → 0.0.6

data/Rakefile

@@ -0,0 +1,19 @@
+require 'rake'
+
+begin
+	require 'jeweler'
+	Jeweler::Tasks.new do |s|
+		s.name = "fugit"
+		s.email = "tekkub@gmail.com"
+		s.homepage = "http://github.com/tekkub/fugit"
+		s.description = "A cross-platform replacement for git-gui based on wxruby"
+		s.summary = s.description
+		s.authors = ["Tekkub"]
+		s.bindir = 'bin'
+		s.add_dependency('wxruby', [">= 1.9.9"])
+	end
+rescue LoadError
+	puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+task :default => :gemspec

data/VERSION.yml

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

data/lib/fugit/commit_dialog.rb

@@ -40,10 +40,9 @@ module Fugit
 		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}>")
+			user = "#{repo.config["user.name"]} <#{repo.config["user.email"]}>"
+			@committer.set_value(user)
+			@author.set_value(user)
 			@input.set_value("")
 			@amend_check.set_value(false)
 			@input.set_focus
@@ -68,11 +67,9 @@ module Fugit
 				@no_msg_error ||= MessageDialog.new(self, "Please enter a commit message.", "Commit error", OK|ICON_ERROR)
 				@no_msg_error.show_modal
 			else
-				commit_file = File.join(Dir.pwd, ".git", "fugit_commit.txt")
-				File.open(commit_file, "w") {|f| f << msg}
-				amend = @amend_check.is_checked ? "--amend " : ""
-				`git commit #{amend}--file=.git/fugit_commit.txt --author="#{@author.get_value}"`
-				File.delete(commit_file)
+				vals = {:author => %Q|"#{@author.get_value}"|}
+				vals[:amend] = true if @amend_check.is_checked
+				repo.git.commit(vals, '-m', msg.gsub('"', '\"'))
 				end_modal ID_OK
 			end
 		end

data/lib/fugit/commit_tab.rb

@@ -10,7 +10,7 @@ module Fugit
 			@vsplitter.set_minimum_pane_size(150)
 
 
-			@toolbar = CommitTabToolbar.new(self)
+			@toolbar = TabToolbar.new(self)
 			@diff = Diff.new(@vsplitter)
 
 			@index = IndexList.new(@vsplitter)

data/lib/fugit/create_branch_dialog.rb

@@ -0,0 +1,65 @@
+include Wx
+
+module Fugit
+	class CreateBranchDialog < Dialog
+		def initialize(parent)
+			super(parent, ID_ANY, "Create branch", :size => Size.new(300, 165))
+
+			@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.")
+
+			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"}
+			evt_button(get_affirmative_id, :on_ok)
+
+			box = BoxSizer.new(VERTICAL)
+			box.add(StaticText.new(self, ID_ANY, "New branch name:"), 0, EXPAND|ALL, 4)
+			box.add(@name, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			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(butt_sizer, 0, EXPAND|BOTTOM, 4)
+
+			self.set_sizer(box)
+		end
+
+		def show(ref = "HEAD")
+			branches = `git branch -a`
+			branches = ["HEAD"] + branches.split("\n").map {|b| b[2..-1]}
+			@refs.clear
+			branches.each {|b| @refs.append(b)}
+			@refs.set_value(ref)
+			@name.set_value("")
+			@force_check.set_value(false)
+
+			super()
+			@name.set_focus
+		end
+
+		def on_ok
+			force = @force_check.is_checked ? "-f " : ""
+			name = @name.get_value
+			ref = @refs.get_value
+
+			if name.strip.empty?
+				@no_name_dialog ||= MessageDialog.new(self, "Cannot create branch without a name.", "No branch name", ICON_EXCLAMATION)
+				@no_name_dialog.show_modal
+				return
+			end
+
+			err = `git branch #{force}#{name} #{ref} 2>&1`
+
+			if err.empty?
+				send_message(:branch_created)
+				end_modal(ID_OK)
+			else
+				MessageDialog.new(self, err, "Error creating branch", OK|ICON_ERROR).show_modal
+			end
+		end
+
+	end
+end

data/lib/fugit/delete_branch_dialog.rb

@@ -34,7 +34,7 @@ module Fugit
 			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)
+					"Unmerged branches", YES_NO|ICON_EXCLAMATION)
 				return if dialog.show_modal != ID_YES
 			end
 			`git branch -D #{branches.join(" ")} 2>&1`

data/lib/fugit/fetch_dialog.rb

@@ -0,0 +1,52 @@
+include Wx
+
+module Fugit
+	class FetchDialog < Dialog
+		def initialize(parent)
+			super(parent, ID_ANY, "Fetch remotes", :size => Size.new(250, 300))
+
+			@remotes = CheckListBox.new(self, ID_ANY)
+			@tag_check = CheckBox.new(self, ID_ANY)
+			@tag_check.set_label("Include &tags")
+			@prune_check = CheckBox.new(self, ID_ANY)
+			@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)
+			box.add(StaticText.new(self, ID_ANY, "Fetch from:"), 0, EXPAND|ALL, 4)
+			box.add(@remotes, 1, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(@tag_check, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(@prune_check, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(butt_sizer, 0, EXPAND|BOTTOM, 4)
+
+			self.set_sizer(box)
+		end
+
+		def show
+			remotes = `git remote`
+			remotes = remotes.split("\n")
+			@remotes.set(remotes)
+			@remotes.check(@remotes.find_string("origin")) if remotes.include?("origin")
+			@tag_check.set_value(true)
+			@prune_check.set_value(false)
+
+			super
+		end
+
+		def on_ok
+			remotes = @remotes.get_checked_items.map {|i| @remotes.get_string(i)}
+			tags = @tag_check.is_checked ? "" : "--no-tags "
+
+			self.end_modal(ID_OK)
+
+			@log_dialog ||= LoggedDialog.new(self, "Fetching remotes")
+			@log_dialog.show
+			remotes.each {|remote| @log_dialog.run_command("git fetch #{tags}#{remote}", remote == remotes.last && !@prune_check.is_checked)}
+			remotes.each {|remote| @log_dialog.run_command("git remote prune #{remote}", remote == remotes.last)} if @prune_check.is_checked
+		end
+
+	end
+end

data/lib/fugit/history_list.rb

@@ -13,7 +13,7 @@ module Fugit
 
 			@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"))
+			@menu_create_branch.set_bitmap(get_icon("arrow_divide_add.png"))
 			@list_menu.append_item(@menu_create_branch)
 			evt_menu(@menu_create_branch, :on_menu_create_branch)
 
@@ -24,6 +24,11 @@ module Fugit
 
 			@list_menu.append_separator
 
+			@menu_revert_commit = MenuItem.new(@list_menu, ID_ANY, 'Revert this commit')
+			@menu_revert_commit.set_bitmap(get_icon("cross.png"))
+			@list_menu.append_item(@menu_revert_commit)
+			evt_menu(@menu_revert_commit, :on_menu_revert_commit)
+
 			@menu_soft_reset = @list_menu.append('Soft-reset branch to here')
 			evt_menu(@menu_soft_reset, :on_menu_soft_reset)
 
@@ -43,6 +48,8 @@ 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_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
 		end
@@ -98,16 +105,8 @@ module Fugit
 		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
+			@new_branch_dialog ||= CreateBranchDialog.new(self)
+			@new_branch_dialog.show(@menu_data)
 		end
 
 		def on_menu_cherry_pick(event)
@@ -119,6 +118,11 @@ module Fugit
 			end
 		end
 
+		def on_menu_revert_commit(event)
+			@revert_commit_dialog ||= RevertCommitDialog.new(self)
+			@revert_commit_dialog.show(@menu_data)
+		end
+
 		def on_menu_soft_reset(event)
 			err = `git reset --soft  #{@menu_data} 2>&1`
 			if !err.empty?
@@ -139,7 +143,7 @@ module Fugit
 
 		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)
+				@uncomitted_hard_dialog ||= MessageDialog.new(self, "Uncommitted changes will be lost, continue?", "Uncomitted changes", YES_NO|ICON_EXCLAMATION)
 				return if @uncomitted_hard_dialog.show_modal != ID_YES
 			end
 

data/lib/fugit/history_tab.rb

@@ -7,8 +7,11 @@ module Fugit
 			super
 
 			@history_list = HistoryList.new(self)
+			@toolbar = TabToolbar.new(self, false)
 
 			box = BoxSizer.new(VERTICAL)
+			box.add(@toolbar, 0, EXPAND)
+			box.add_spacer(3)
 			box.add(@history_list, 1, EXPAND)
 			self.set_sizer(box)
 		end

data/lib/fugit/index_list.rb

@@ -46,6 +46,7 @@ module Fugit
 			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(:tab_switch, :update_tree)
 			register_for_message(:exiting) {self.hide} # Things seem to run smoother if we hide before destruction
 
 			update_tree
@@ -138,8 +139,12 @@ module Fugit
 			when :unstaged
 				case change
 				when :new
-					val = File.read(file)
-					send_message(:diff_raw, val)
+				  if File.directory?(file)
+				    send_message(:diff_raw, "Git repo\n\nNote that staging with fugit will stage the files inside the repo,\nit will *not* add a git-submodule.")
+			    else
+					  val = File.read(file)
+					  send_message(:diff_raw, val)
+					end
 				when :modified, :deleted
 					val = `git diff -- "#{file}"`
 					send_message(:diff_set, val, :unstaged)
@@ -167,7 +172,7 @@ module Fugit
 		end
 
 		def on_menu_revert_changes(event)
-			@confirm_revert ||= MessageDialog.new(self, "Are you sure you want to revert these changes?\nThe changes will be lost, this cannot be undone.", "Confirm revert", NO_DEFAULT|YES_NO|ICON_EXCLAMATION)
+			@confirm_revert ||= MessageDialog.new(self, "Are you sure you want to revert these changes?\nThe changes will be lost, this cannot be undone.", "Confirm revert", YES_NO|ICON_EXCLAMATION)
 
 			if @confirm_revert.show_modal == ID_YES
 				diff = `git diff -- "#{@menu_data[0]}"`

data/lib/fugit/io_get_line.rb

@@ -2,12 +2,12 @@
 class IO
 	def get_line
 		line = nil
+		ending = nil
 		while c = self.read(1)
+			line ||= ""
+			line << c
 			if c == "\r" || c == "\n"
-				break if line
-			else
-				line ||= ""
-				line << c
+				break
 			end
 		end
 		line

data/lib/fugit/logged_dialog.rb

@@ -0,0 +1,49 @@
+include Wx
+
+module Fugit
+	class LoggedDialog < Dialog
+		def initialize(parent, title)
+			super(parent, ID_ANY, title, :size => Size.new(600, 300))
+
+			@log = TextCtrl.new(self, ID_ANY, :size => Size.new(20, 150), :style => TE_MULTILINE|TE_DONTWRAP|TE_READONLY)
+			@current_line = StaticText.new(self, ID_ANY, "")
+			@progress = Gauge.new(self, ID_ANY, 100, :size => Size.new(20, 20))
+
+			box = BoxSizer.new(VERTICAL)
+			box.add(@log, 1, EXPAND|TOP|LEFT|RIGHT, 4)
+			box.add(@current_line, 0, EXPAND|ALL, 4)
+			box.add(@progress, 0, EXPAND|ALL, 4)
+			self.set_sizer(box)
+		end
+
+		def show()
+			@progress.set_value(0)
+			@log.clear
+			super
+		end
+
+		def run_command(command, close_on_success = true)
+			@progress.pulse
+			@log.append_text("#{@log.get_last_position == 0 ? "" : "\n"}> #{command}\n")
+
+			ret = IO.popen("#{command} 2>&1") do |io|
+				last_cr = true
+				while (line = io.get_line)
+					@log.append_text(@current_line.get_label) unless last_cr
+					@current_line.set_label(line)
+					@progress.pulse
+					last_cr = (line[-1..-1] == "\r")
+				end
+			end
+			@progress.set_value(0)
+			@log.append_text(@current_line.get_label)
+			@current_line.set_label("")
+			if $?.success? && close_on_success
+				send_message(:refresh)
+				@current_line.set_label("This window will close in 5 seconds")
+				Timer.after(5000) {self.end_modal(ID_OK)}
+			end
+		end
+
+	end
+end

data/lib/fugit/main_frame.rb

@@ -1,6 +1,19 @@
 include Wx
 include IconLoader
 
+module Wx
+	class EvtHandler
+		def repo
+			@@repo
+		end
+
+		def repo=(val)
+			@@repo = val
+		end
+	end
+end
+
+
 module Fugit
 	class MainFrame < Frame
 		def initialize(title, version)
@@ -9,6 +22,8 @@ module Fugit
 
 			@app_verion = version
 
+			self.repo = Grit::Repo.new(Dir.pwd)
+
 			@notebook = Notebook.new(self, ID_ANY, :style => FULL_REPAINT_ON_RESIZE)
 			@commit_panel = CommitTab.new(@notebook)
 			@history_panel = HistroyTab.new(@notebook)
@@ -33,7 +48,7 @@ module Fugit
 			# 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")
+			refresh = menu_file.append(ID_ANY, "&Refresh\tCtrl-R", "Refresh the index list")
 			menu_file.append(ID_EXIT, "E&xit", "Quit this program")
 			menu_bar.append(menu_file, "&File")
 

data/lib/fugit/merge_dialog.rb

@@ -0,0 +1,68 @@
+include Wx
+
+module Fugit
+	class MergeDialog < Dialog
+		def initialize(parent)
+			super(parent, ID_ANY, "Merge branches", :size => Size.new(250, 300))
+
+			@branch_list = CheckListBox.new(self, ID_ANY)
+			@log_check = CheckBox.new(self, ID_ANY)
+			@log_check.set_label("Include commit &log")
+			@log_check.set_tool_tip("Adds a log of commit summaries to the merge commit's message")
+			@commit_check = CheckBox.new(self, ID_ANY)
+			@commit_check.set_label("&Commit result")
+			@commit_check.set_tool_tip("If there are no merge conficts, commit the results automatically.")
+			@squash_check = CheckBox.new(self, ID_ANY)
+			@squash_check.set_label("&Squash result")
+			@squash_check.set_tool_tip("Instead of creating a merge commit, squash all of\nthe changes together and stage them for commit.\nThis will create the same changeset a normal\nmerge would, without creating a merge commit.")
+			@noff_check = CheckBox.new(self, ID_ANY)
+			@noff_check.set_label("&Fast-forward when possible")
+			@noff_check.set_tool_tip("Do not generate a merge commit if the merge resolved as a fast-forward, only update the branch pointer.")
+
+			butt_sizer = create_button_sizer(OK|CANCEL)
+			butt_sizer.get_children.map {|s| s.get_window}.compact.each {|b| b.set_label("Merge") 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(@log_check, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(@commit_check, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(@squash_check, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(@noff_check, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(butt_sizer, 0, EXPAND|BOTTOM, 4)
+
+			self.set_sizer(box)
+		end
+
+		def show
+			branches = `git branch -a --no-merged`
+			branches = branches.split("\n").map {|b| b.strip}
+			@branch_list.set(branches)
+
+			@log_check.set_value(false)
+			@commit_check.set_value(true)
+			@squash_check.set_value(false)
+			@noff_check.set_value(true)
+
+			super
+		end
+
+		def on_ok
+			branches = @branch_list.get_checked_items.map {|i| @branch_list.get_string(i)}
+			args = []
+			args << "--log" if @log_check.is_checked
+			args << "--no-commit" unless @commit_check.is_checked || @squash_check.is_checked
+			args << "--squash" if @squash_check.is_checked
+			args << "--no-ff" unless @noff_check.is_checked
+			command = "git merge #{args.empty? ? "" : "#{args.join(" ")} "}#{branches.join(" ")}"
+
+			self.end_modal(ID_OK)
+
+			@log_dialog ||= LoggedDialog.new(self, "Merging branches")
+			@log_dialog.show
+			@log_dialog.run_command(command)
+		end
+
+	end
+end

data/lib/fugit/push_dialog.rb

@@ -3,7 +3,7 @@ include Wx
 module Fugit
 	class PushDialog < Dialog
 		def initialize(parent)
-			super(parent, ID_ANY, "Push branches", :size => Size.new(400, 500))
+			super(parent, ID_ANY, "Push branches", :size => Size.new(250, 300))
 
 			@branch_list = CheckListBox.new(self, ID_ANY)
 			@tag_check = CheckBox.new(self, ID_ANY)
@@ -11,30 +11,18 @@ module Fugit
 			@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))
 
 			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(box3, 1, ALL, 4)
-
-			box.add(StaticText.new(self, ID_ANY, "Select branches:"), 0, EXPAND|ALL, 4)
-			box.add(box2, 1, EXPAND)
 			box.add(StaticText.new(self, ID_ANY, "Push to:"), 0, EXPAND|ALL, 4)
 			box.add(@remote, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
-			box.add(StaticText.new(self, ID_ANY, "Output:"), 0, EXPAND|ALL, 4)
-			box.add(@log, 0, EXPAND|LEFT|RIGHT, 4)
-			box.add(@progress, 0, EXPAND|ALL, 4)
+			box.add(StaticText.new(self, ID_ANY, "Select branches:"), 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(@branch_list, 1, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(@tag_check, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(@force_check, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
 			box.add(butt_sizer, 0, EXPAND|BOTTOM, 4)
 
 			self.set_sizer(box)
@@ -51,62 +39,24 @@ module Fugit
 			branches = branches.split("\n").map {|b| b.split(" ").last}
 			@branch_list.set(branches)
 			@branch_list.check(@branch_list.find_string(current)) if current
-
-			@progress.set_value(0)
-			@log.clear
+			@tag_check.set_value(false)
+			@force_check.set_value(false)
 
 			super
 		end
 
 		def on_ok
-			@progress.set_value(0)
-			failed = false
-			last_line_type = nil
-
 			branches = @branch_list.get_checked_items.map {|i| @branch_list.get_string(i)}
 			tags = @tag_check.is_checked ? "--tags " : ""
 			force = @force_check.is_checked ? "--force " : ""
 			remote = @remote.get_value
 			command = "git push #{tags}#{force}#{remote} #{branches.join(" ")}"
-			@log.append_text("#{@log.get_last_position == 0 ? "" : "\n\n"}> #{command}")
-
-			IO.popen("#{command} 2>&1") do |io|
-				while line = io.get_line
-					last_line_type = case line
-						when "Everything up-to-date"
-							@progress.set_value(100)
-							update_log(last_line_type, nil, line)
-						when /Counting objects: \d+, done./
-							@progress.set_value(10)
-							update_log(last_line_type, :counting, line)
-						when /Counting objects: \d+/
-							update_log(last_line_type, :counting, line)
-						when /Compressing objects:\s+\d+% \((\d+)\/(\d+)\)/
-							@progress.set_value(10 + (45*$1.to_f/$2.to_f).to_i)
-							update_log(last_line_type, :compressing, line)
-						when /Writing objects:\s+\d+% \((\d+)\/(\d+)\)/
-							@progress.set_value(55 + (45*$1.to_f/$2.to_f).to_i)
-							update_log(last_line_type, :writing, line)
-						when /\[rejected\]/
-							failed = true
-							@progress.set_value(100)
-							update_log(last_line_type, nil, line)
-						else
-							update_log(last_line_type, nil, line)
-						end
-				end
-			end
 
-			#~ end_modal(ID_OK) if success
-		end
+			end_modal(ID_OK)
 
-		def update_log(last, current, line)
-			if last == current && !last.nil?
-				@log.replace(@log.xy_to_position(0, @log.get_number_of_lines - 1), @log.get_last_position, line)
-			else
-				@log.append_text("\n" + line)
-			end
-			current
+			@log_dialog ||= LoggedDialog.new(self, "Pushing branches")
+			@log_dialog.show
+			@log_dialog.run_command(command)
 		end
 
 	end

data/lib/fugit/revert_commit_dialog.rb

@@ -0,0 +1,51 @@
+include Wx
+
+module Fugit
+	class RevertCommitDialog < Dialog
+		def initialize(parent)
+			super(parent, ID_ANY, "Revert commit", :size => Size.new(300, 120))
+
+			@name = TextCtrl.new(self, ID_ANY)
+
+			@commit_check = CheckBox.new(self, ID_ANY)
+			@commit_check.set_label("&Commit")
+			@commit_check.set_tool_tip("Commit the results of the revert")
+
+			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"}
+			evt_button(get_affirmative_id, :on_ok)
+
+			box = BoxSizer.new(VERTICAL)
+			box.add(StaticText.new(self, ID_ANY, "Ref:"), 0, EXPAND|ALL, 4)
+			box.add(@name, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(@commit_check, 1, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(butt_sizer, 0, EXPAND|BOTTOM, 4)
+
+			self.set_sizer(box)
+		end
+
+		def show(ref = "HEAD")
+			@name.set_value(ref)
+			@commit_check.set_value(true)
+
+			super()
+			@name.set_focus
+		end
+
+		def on_ok
+			ref = @name.get_value
+
+			opts = {:no_edit => true}
+			opts[:no_commit] = true unless @commit_check.is_checked
+			repo.git.revert(opts, ref)
+
+			if repo.git.last_status.success?
+				send_message(:commit_saved)
+				end_modal(ID_OK)
+			else
+				MessageDialog.new(self, repo.git.last_err, "Error reverting commit", OK|ICON_ERROR).show_modal
+			end
+		end
+
+	end
+end