gvcsfx 0.3

data/handlers/tab_branches.rb

@@ -0,0 +1,312 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+module GvcsFx
+  module TabBranches
+
+    class VcsStash < Hash
+
+      def to_s
+      end
+    end
+
+    class VcsBranch
+      include Antrapol::ToolRack::ExceptionUtils
+
+      attr_accessor :name, :stash, :current
+      def initialize
+        @name = ""
+        @stash = VcsStash.new
+        @current = false
+      end
+
+      def name=(val)
+        if not_empty?(val)
+          if val =~ /\*/
+            @current = true
+            @name = val.gsub("*","").strip
+          else
+            @name = val
+          end
+        end
+      end
+
+      def to_s
+        res = []
+        res << "#{(@current ? "* #{@name}" : @name)}"
+        if not_empty?(@stash)
+          res << "(#{@stash.length} stash(es) on this branch found)"
+        end
+        res.join(" ")
+      end
+    end # VcsBranch
+
+    def init_tab_branches
+
+      @lstBranches.add_event_handler(javafx.scene.input.MouseEvent::MOUSE_CLICKED, Proc.new do |evt|
+        if evt.button == javafx.scene.input.MouseButton::SECONDARY
+          # right click on item
+          branches_ctxmenu.show(@lstBranches, evt.screen_x, evt.screen_y)
+        #elsif evt.button == javafx.scene.input.MouseButton::PRIMARY and evt.click_count == 2
+        #  # double click on item - view file
+        #  sel = @tblChanges.selection_model.selected_items
+        #  if sel.length > 0
+        #    sel.each do |s|
+        #      fullPath = File.join(@selWs.path,s.path.strip)
+        #      if not File.directory?(fullPath)
+        #        view_file(s.path)
+        #      end
+        #    end
+        #  end
+
+        end
+      end)
+
+    end
+
+    def refresh_tab_branches
+     
+      @lstBranches.items.clear
+
+      st, br = @selWs.local_branches
+      if st
+        sst, sinfo = @selWs.stash_list
+        if sst
+
+          bbr = { }
+          br.each do |b|
+            vb = VcsBranch.new
+            vb.name = b
+            bbr[vb.name] = vb
+          end
+
+          sinfo.each do |k,v|
+            if bbr.keys.include?(v[0])
+              bbr[v[0]].stash[k] = v
+            end
+          end
+
+          @lstBranches.items.add_all(bbr.values)
+
+        else
+          @lstBranches.items.add_all(br)
+        end
+      end
+      
+      @txtNewBranchName.clear
+    end # refresh_tab_branches
+
+    def create_branch(evt)
+
+      bn = @txtNewBranchName.text
+      if is_empty?(bn)
+        fx_alert_error("Branch name cannot be empty","Empty Branch Name",main_stage)
+      else
+        st, res = @selWs.create_branch(bn)
+        if st
+          set_success_gmsg("New branch '#{bn}' successfully created.")
+          refresh_tab_branches
+        else
+          fx_alert_error(res.strip,"New Branch Creation Failed", main_stage)
+        end
+      end
+    end # create_branch
+
+    def branch_clicked(evt)
+      if evt.button == javafx.scene.input.MouseButton::PRIMARY and evt.click_count == 2
+        selBr = @lstBranches.selection_model.selected_item  
+        if not_empty?(selBr)
+          if selBr.current #is_current_branch(selBr)
+          else
+            # switch branch
+            st, res = @selWs.switch_branch(selBr.name)
+            if st
+              set_info_gmsg("Workspace's branch switched to '#{selBr.name}'")
+              refresh_tab_branches
+            else
+              prompt_error("Failed to switch to branch '#{selBr.name}'. Error was :\n\n#{res}")
+            end
+          end
+        end
+      end
+    end
+
+    # hooked on text field of new branch
+    def new_branch_keypressed(evt)
+      if evt.code == javafx.scene.input.KeyCode::ENTER
+        create_branch(nil)
+      end
+    end
+
+    def show_stash_restore_win(options, stageTitle = "GVCS - Stash Restore")
+
+      #javafx.application.Platform.run_later do
+
+        stage = javafx.stage.Stage.new
+        stage.title = stageTitle
+        stage.initModality(javafx.stage.Modality::WINDOW_MODAL)
+        stage.initOwner(main_stage)
+        dlg = StashSelectController.load_into(stage)
+        dlg.options = options
+        stage.showAndWait
+
+        dlg.result
+      #end # run_later
+
+    end # show_options_win
+
+
+    def branches_ctxmenu
+      
+      @selBranch = @lstBranches.selection_model.selected_items
+
+      @branchesCtxMenu = javafx.scene.control.ContextMenu.new
+
+      if @selBranch.length > 0
+
+        selBr = @selBranch.first
+        bst, currBranch = @selWs.current_branch
+
+
+        if not selBr.current #is_current_branch(selBr)
+
+
+          mergeMnuItm = javafx.scene.control.MenuItem.new("Merge with #{currBranch}")
+          mergeMnuItm.on_action do |evt|
+
+            res = fx_alert_confirmation("Merge changes in branch '#{selBr.name}' into '#{currBranch}'?", nil, "Confirmation to Merge Branches", main_stage)
+            if res == :ok
+              st,res = @selWs.merge_branch(selBr.name)
+              if st
+                set_success_gmsg("Branch '#{selBr.name}' merged into '#{currBranch}' successfully.")
+              else
+                log_error("Merge branch '#{selBr.name}' inito '#{currBranch}' failed. [#{res}]")
+                prompt_error("Merge branch '#{selBr.name}' inito '#{currBranch}' failed. [#{res}]")
+              end
+            end # if user answer ok to merge
+
+
+          end  # on_action do .. end
+
+          @branchesCtxMenu.items.add(mergeMnuItm)
+
+
+          @branchesCtxMenu.items.add(javafx.scene.control.SeparatorMenuItem.new)
+
+          delMnuItm = javafx.scene.control.MenuItem.new("Delete branch")
+          delMnuItm.on_action do |evt|
+
+            res = fx_alert_confirmation("Delete branch '#{selBr.name}'?", nil, "Confirmation to Delete Branch", main_stage)
+            if res == :ok
+              st,res = @selWs.delete_branch(selBr.name)
+              if st
+                set_success_gmsg("Branch '#{selBr.name}' deleted successfully.")
+                refresh_tab_branches
+              else
+                log_error("Delete branch '#{selBr.name}' failed. [#{res}]")
+                prompt_error("Delete branch '#{selBr.name}' failed. [#{res}]")
+              end
+            end # if user answer ok to delete
+
+
+          end  # on_action do .. end
+
+          @branchesCtxMenu.items.add(delMnuItm)
+
+        else
+          #@branchesCtxMenu.items.add(javafx.scene.control.SeparatorMenuItem.new) if @branchesCtxMenu.items.count > 0
+
+          #if not_empty?(selBr.stash)
+
+          #  lsMnuItm = javafx.scene.control.MenuItem.new("Restore Stash to new branch")
+          #  lsMnuItm.on_action do |evt|
+
+          #    st, sel, branch = show_stash_restore_win(selBr.stash)
+          #    if st
+          #      if is_empty?(sel)
+          #        prompt_error("Please select one of the Stash to restore.","Empty Stash Selection")
+          #      elsif is_empty?(branch)
+          #        prompt_error("Please provide a branch name.","Empty Branch Name")
+          #      else
+          #        sst, sres = @selWs.stash_to_new_branch(branch, sel.key)
+
+          #        if sst
+          #          set_success_gmsg(sres)
+          #        else
+          #          prompt_error("Failed to store the stash to #{currBranch}. Error was : #{sres}")
+          #        end
+          #      end
+          #    end
+
+          #  end  # on_action do .. end
+
+          #  @branchesCtxMenu.items.add(lsMnuItm)
+
+          #end
+ 
+        end # if selected branch is not current branch
+
+
+        if not_empty?(selBr.stash)
+
+          @branchesCtxMenu.items.add(javafx.scene.control.SeparatorMenuItem.new) if @branchesCtxMenu.items.count > 0
+
+          lsMnuItm = javafx.scene.control.MenuItem.new("Restore Stash to new branch")
+          lsMnuItm.on_action do |evt|
+            
+              st, sel, branch = show_stash_restore_win(selBr.stash)
+              if st
+                if is_empty?(sel)
+                  prompt_error("Please select one of the Stash to restore.","Empty Stash Selection")
+                elsif is_empty?(branch)
+                  prompt_error("Please provide a branch name.","Empty Branch Name")
+                else
+                  sst, sres = @selWs.stash_to_new_branch(branch, sel.key)
+
+                  if sst
+                    set_success_gmsg(sres)
+                    refresh_tab_branches
+                  else
+                    prompt_error("Failed to restore the stash '#{sel.key}' to new branch #{branch}. Error was : #{sres}")
+                  end
+                end
+              end
+
+          end  # on_action do .. end
+
+          @branchesCtxMenu.items.add(lsMnuItm)
+        
+        end
+
+
+      end
+
+      @branchesCtxMenu
+      
+    end
+
+    def is_current_branch(br)
+      if is_empty?(br)
+        false
+      else
+        (br =~ /\*/) != nil
+      end
+    end
+
+  end
+end

data/handlers/tab_files.rb

@@ -0,0 +1,27 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+module GvcsFx
+  module TabFiles
+
+    def refresh_files(*args)
+      puts "refresh files #{args}"
+    end
+
+  end
+end

data/handlers/tab_ignore_rules.rb

@@ -0,0 +1,40 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+module GvcsFx
+  module TabIgnoreRules
+
+    def init_tab_ignore_rules
+      @txtIgnoreRules.prompt_text = "No ignore rules defined"
+    end
+
+    def refresh_tab_ignore_rules
+      @txtIgnoreRules.text = @selWs.ignore_rules  
+    end
+
+    def on_save_ignore_rules(evt)
+      st,res = @selWs.update_ignore_rules(@txtIgnoreRules.text)   
+      if st
+        set_success_gmsg(res)
+      else
+        prompt_error(res,"Save Ignore Rules Error")
+      end
+    end
+
+  end
+end

data/handlers/tab_logs.rb

@@ -0,0 +1,222 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+require 'date'
+
+module GvcsFx
+  module TabLogs
+
+    class VcsLog
+      include Antrapol::ToolRack::ExceptionUtils
+      include javafx.beans.value.ObservableValue
+
+      attr_accessor :key, :date, :author_name, :author_email, :subject, :body, :notes
+      def reformatted_date
+        if not_empty?(@date)
+          dt = DateTime.strptime(@date,"%a %b %e %H:%M:%S %Y %z")
+          dt.strftime("%H:%M, %d.%b.%Y (%a)")
+        else
+          @date
+        end
+      end
+
+      def addListener(list)
+      end
+
+      def removeListener(list)
+      end
+
+      def value
+        self
+      end
+
+    end # VcsLog
+
+    class LogCellFactory < javafx.scene.control.TableCell
+      attr_accessor :tableColumn
+      def updateItem(itm,e)
+        super
+        if not itm.nil?
+          d = []
+          d << "Commit : #{itm.key}\n"
+          d << "#{itm.subject}"
+          lbl = javafx.scene.text.Text.new(d.join("\n"))
+          lbl.wrappingWidthProperty.bind(@tableColumn.widthProperty)
+          setGraphic(lbl)
+        else
+          setGraphic(nil)
+        end
+      end
+    end
+
+    def init_tab_logs
+
+      @tblLogs.placeholder = javafx.scene.control.Label.new("Log has no entries yet.")
+
+      @tblLogs.columns.clear
+      @tblLogs.column_resize_policy = javafx.scene.control.TableView::CONSTRAINED_RESIZE_POLICY
+
+      cols = []
+      colDate = TableColumn.new("Date")
+      colDate.cell_value_factory = Proc.new do |p|
+        SimpleStringProperty.new(p.value.reformatted_date)
+      end
+      colDate.sortable = false
+      cols << colDate
+      
+      colSubj = TableColumn.new("Subject")
+      colSubj.cell_value_factory = Proc.new do |p|
+        p.value
+      end
+      colSubj.cell_factory = Proc.new do |pa|
+        cell = LogCellFactory.new
+        cell.tableColumn = pa
+        cell
+      end
+      colSubj.sortable = false
+      cols << colSubj
+
+      colAuthor = TableColumn.new("Committer")
+      colAuthor.cell_value_factory = Proc.new do |p|
+        SimpleStringProperty.new(p.value.author_name)
+      end
+      colAuthor.sortable = false
+      cols << colAuthor
+
+
+      @tblLogs.columns.add_all(cols)
+
+      # set column width
+      #colState.pref_width_property.bind(@tblChanges.width_property.multiply(0.1))
+      #colState.max_width_property.bind(colState.pref_width_property)
+      #colState.resizable = false
+      colDate.pref_width = 220.0
+      colDate.max_width = colDate.pref_width
+      colDate.min_width = colDate.pref_width
+
+      colAuthor.pref_width = 180.0
+      colAuthor.max_width = colAuthor.pref_width
+      colAuthor.min_width = colAuthor.pref_width
+
+      @tblLogs.selection_model.selection_mode = javafx.scene.control.SelectionMode::SINGLE
+
+      @tblLogs.add_event_handler(javafx.scene.input.MouseEvent::MOUSE_CLICKED, Proc.new do |evt|
+        if evt.button == javafx.scene.input.MouseButton::SECONDARY
+          # right click on item
+          logs_ctxmenu.show(@tblLogs, evt.screen_x, evt.screen_y)
+        elsif evt.button == javafx.scene.input.MouseButton::PRIMARY and evt.click_count == 2
+         
+          sel = @tblLogs.selection_model.selected_item
+
+          if not sel.nil?
+
+            st, res = @selWs.show_log(sel.key)
+
+            if st
+              show_content_win("Log Detail", "Show Log Detail - #{sel.key}", res)
+            else
+              set_err_gmsg("Log detail for key '#{s.key}' failed. [#{res}]")
+            end
+
+          end
+
+        end
+
+      end)
+
+      @txtLogLimit.text = "50"
+      
+    end # init_tab_logs
+
+    def refresh_tab_logs
+      limit = @txtLogLimit.text
+      st, res = @selWs.logs({ limit: limit })
+      if st
+        
+        entries = []
+        res.each_line do |l|
+          
+          #puts l
+
+          ll = l.split("|")
+
+          log = VcsLog.new
+          log.key = ll[0].strip
+          log.date = ll[1].strip
+          author = ll[2].nil? ? "" : ll[2].strip
+          if not_empty?(author)
+            aa = author.split(",")
+            log.author_name = aa[0].nil? ? "" : aa[0].strip
+            log.author_email = aa[1].nil? ? "" : aa[1].strip
+          end
+          log.subject = ll[3].strip
+          log.body = ll[4].nil? ? "" : ll[4].strip
+          log.notes = ll[5].nil? ? "" : ll[5].strip
+          
+          entries << log
+        end
+
+        @tblLogs.items.clear
+        @tblLogs.items.add_all(entries)
+
+      else
+        @tblLogs.items.clear
+      end
+    end # refresh_tab_logs
+
+    def loglimit_keypressed(evt)
+      if (not evt.nil?) and evt.code == javafx.scene.input.KeyCode::ENTER
+        refresh_tab_logs
+      end
+    end
+
+    private
+    def logs_ctxmenu
+
+      @selLog = @tblLogs.selection_model.selected_items
+
+      @logsCtxMenu = javafx.scene.control.ContextMenu.new
+
+      if @selLog.length > 0
+
+        # 
+        # Copy subject menu item
+        #
+        ccmMnuItm = javafx.scene.control.MenuItem.new("Copy Commit Message")
+        ccmMnuItm.on_action do |evt|
+
+          s = @selLog.first
+          cc = javafx.scene.input.ClipboardContent.new
+          cc.putString(s.subject) 
+          javafx.scene.input.Clipboard.getSystemClipboard.setContent(cc)
+
+          set_info_gmsg("Commit message copied to system clipboard. Use Paste operation to paste it into destination.")
+
+        end
+        @logsCtxMenu.items.add(ccmMnuItm)
+        # 
+        # end diff menu item
+        #
+
+      end
+
+      @logsCtxMenu
+
+    end
+
+  end
+end