redcar 0.3.10.1dev → 0.4

data/plugins/scm/lib/scm/commit_mirror.rb

@@ -0,0 +1,72 @@
+
+module Redcar
+  module Scm
+    class CommitMirror
+      include Redcar::Document::Mirror
+      
+      def initialize(repo, change=nil)
+        @repo = repo
+        @change = change
+      end
+      
+      def title
+        "Commit message"
+      end
+      
+      def exists?
+        true
+      end
+      
+      # Commits don't change till they are commited, at which point
+      # they are closed.
+      def changed?
+        false
+      end
+      
+      def read
+        if @change
+          @repo.commit_message(@change)
+        else
+          @repo.commit_message
+        end
+      end
+      
+      def commit(contents)
+        # filter the contents for comments and generally clean it up
+        contents = contents.split("\n").map{|l| l[0,1] == "#" ? "" : l}.join("\n").rstrip
+        
+        # throw an error if our spring clean left nothing
+        raise "Empty commit message. Commit aborted." if contents.empty?
+        
+        @repo.commit!(contents, @change)
+        
+        notify_listeners(:change)
+      end
+      
+      class SaveCommand < Command
+        sensitize :open_commit_tab
+        
+        def execute
+          tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
+          begin
+            doc = tab.edit_view.document
+            doc.mirror.commit(doc.to_s)
+          rescue
+            Application::Dialog.message_box($!.message)
+          end
+        end
+      end
+      
+      class OpenCommand < Command
+        sensitize :open_scm
+        
+        def execute
+          project = Project::Manager.focussed_project
+          info = Scm::Manager.project_repositories[project]
+          
+          Scm::Manager.open_commit_tab(info['repo'])
+        end
+      end
+    end
+  end
+end

data/plugins/scm/lib/scm/diff_mirror.rb

@@ -0,0 +1,31 @@
+
+module Redcar
+  module Scm
+    class DiffMirror
+      include Redcar::Document::Mirror
+      
+      def initialize(change, diff)
+        @change = change
+        @diff = diff
+      end
+      
+      def title
+        "Diff: #{@change.path}"
+      end
+      
+      def exists?
+        true
+      end
+      
+      # Diffs don't change. Each time the tree is refreshed, new Change
+      # objects are created.
+      def changed?
+        false
+      end
+      
+      def read
+        @diff
+      end
+    end
+  end
+end

data/plugins/scm/lib/scm/errors.rb

@@ -0,0 +1,8 @@
+
+module Redcar
+  module Scm
+    
+    class MergeConflictError < RuntimeError; end
+    
+  end
+end

data/plugins/scm/lib/scm/model.rb

@@ -0,0 +1,254 @@
+
+module Redcar
+  module Scm
+    # This class acts as an interface definition for SCM's.
+    # Override as much as possible that is supported by your SCM of choice.
+    module Model
+      # Returns a string giving the name of the SCM
+      def repository_type
+        ""
+      end
+      
+      # REQUIRED. Checks if a given directory is a repository supported by 
+      # the SCM.
+      def repository?(path)
+        raise "Scm.repository? not implemented."
+      end
+      
+      # REQUIRED. Initialises the SCM with a path. This path should be used
+      # for all future interactions. Repeated calls to load should be treated
+      # as a breaking error.
+      def load(path)
+        raise "Scm.load not implemented."
+      end
+      
+      # RECOMMENDED. If we call this method, than we expect the repository to
+      # return all fresh data for any subsequent calls. Any caching should be
+      # reset.
+      def refresh
+        nil
+      end
+      
+      # REQUIRED to be useful. If no commands are supported, than the SCM will
+      # will essentially be useless. These commands loosely translate to the
+      # common operations of a distributed CVS. 
+      #
+      # Supported values to date:
+      #  * :init
+      #  * :push
+      #  * :pull
+      #  * :pull_targetted
+      #  * :commit
+      #  * :index
+      #  * :switch_branch
+      #  * :merge
+      #
+      # Note about non-distributed CVS's: If your CVS doesn't support local
+      # commits, ie. subversion, then implement :commit and :pull, and then
+      # provide translations via the translations method.
+      def supported_commands
+        []
+      end
+      
+      # This method allows SCM's to override the default names for different
+      # commands and bring them into line with the normal vocabulary in their
+      # respective worlds. ie, SVN calls :commit and :pull "checkin" and 
+      # "checkout" respectively. If you overload this method, you need to
+      # provide names for all commands you support with supported_commands
+      def translations
+        {
+          :init => "Initialise " + repository_type.capitalize,
+          :push => "Push Changesets",
+          :unpushed_commits => "Unpushed commits",
+          :pull => "Pull Changesets",
+          :pull_targetted => "Pull...",
+          :commit => "Commit Changes",
+          :uncommited_changes => "Uncommited changes",
+          :indexed_changes => "Indexed changes",
+          :unindexed_changes => "Unindexed changes",
+          :index_add => "Add File",
+          :index_ignore => "Ignore File",
+          :index_save => "Index Changes",
+          :index_unsave => "Revert Index",
+          :index_revert => "Revert Changes",
+          :index_restore => "Restore File",
+          :index_delete => "Delete File",
+          :commitable => "Commit Changes to Subproject",
+          :switch_branch => "Switch Branch",
+          :merge => "Merge...",
+        }
+      end
+      
+      # REQUIRED for :init. Initialise a repository in a given path. 
+      # Returns false on error.
+      def init!(path)
+        raise "Scm.init not implemented." if supported_commands.include?(:init)
+        nil
+      end
+      
+      # REQUIRED for :commit if :index is not supported. Returns an 
+      # array of changes currently waiting for commit.
+      #
+      # @return [Array<Redcar::Scm::ScmChangesMirror::Change>]
+      def uncommited_changes
+        raise "Scm.uncommited_changes not implemented." if supported_commands.include?(:commit)
+        []
+      end
+      
+      # REQUIRED for :commit if :index is supported. Returns an array
+      # of changes currently in the index.
+      #
+      # @return [Array<Redcar::Scm::ScmChangesMirror::Change>]
+      def indexed_changes
+        raise "Scm.indexed_changes not implemented." if supported_commands.include?(:commit)
+        []
+      end
+      
+      # REQUIRED for :commit if :index is supported. Returns an array
+      # of changes currently not in the index.
+      #
+      # @return [Array<Redcar::Scm::ScmChangesMirror::Change>]
+      def unindexed_changes
+        raise "Scm.unindexed_changes not implemented." if supported_commands.include?(:commit)
+        []
+      end
+      
+      # REQUIRED for :index. Adds a new file to the index.
+      def index_add(change)
+        raise "Scm.index_add not implemented" if supported_commands.include?(:index)
+        nil
+      end
+      
+      # REQUIRED for :index. Ignores a new file so it won't show in changes.
+      def index_ignore(change)
+        raise "Scm.index_ignore not implemented" if supported_commands.include?(:index)
+        nil
+      end
+      
+      # REQUIRED for :index. Reverts a file to its last commited state.
+      def index_revert(change)
+        raise "Scm.index_revert not implemented" if supported_commands.include?(:index)
+        nil
+      end
+      
+      # REQUIRED for :index. Reverts a file in the index back to it's 
+      # last commited state, but leaves the file intact.
+      def index_unsave(change)
+        raise "Scm.index_unsave not implemented" if supported_commands.include?(:index)
+        nil
+      end
+      
+      # REQUIRED for :index. Saves changes made to a file in the index.
+      def index_save(change)
+        raise "Scm.index_save not implemented" if supported_commands.include?(:index)
+        nil
+      end
+      
+      # REQUIRED for :index. Restores a file to the last known state of
+      # the file. This may be from the index, or the last commit.
+      def index_restore(change)
+        raise "Scm.index_restore not implemented" if supported_commands.include?(:index)
+        nil
+      end
+      
+      # REQUIRED for :index. Marks a file as deleted in the index.
+      def index_delete(change)
+        raise "Scm.index_delete not implemented" if supported_commands.include?(:index)
+        nil
+      end
+      
+      # REQUIRED for :commit. Commits the currently indexed changes 
+      # in the subproject.
+      #
+      # @param change Required for :commitable changes. Ignore if
+      # you don't provide these.
+      def commit!(message, change=nil)
+        raise "Scm.commit! not implemented." if supported_commands.include?(:index)
+        nil
+      end
+      
+      # REQUIRED for :commit. Gets a default commit message for the 
+      # currently indexed changes.
+      #
+      # @param change Required for :commitable changes. Ignore if
+      # you don't provide these.
+      def commit_message(change=nil)
+        "\n\n# Please enter your commit message above."
+      end
+      
+      # REQUIRED for :push. Returns an array of unpushed changesets for
+      # a given target.
+      #
+      # @return [Array<Redcar::Scm::ScmCommitsMirror::Commit>]
+      def unpushed_commits(target='')
+        raise "Scm.unpushed_commits not implemented." if supported_commands.include?(:push)
+        nil
+      end
+      
+      # REQUIRED for :push. Pushes all current changesets to the remote
+      # repository for the given target only.
+      def push!(target='')
+        raise "Scm.push! not implemented." if supported_commands.include?(:push)
+        nil
+      end
+      
+      # RECOMMENDED for :push. Allows to provide a list of targets that
+      # can be pushed.
+      #
+      # @return [Array<Redcar::Scm::ScmCommitsMirror::CommitsNode>]
+      def push_targets
+        []
+      end
+      
+      # REQUIRED for :pull and :pull_targetted. Pulls all remote changesets from the 
+      # remote repository.
+      # 
+      # Note: If you only support :pull, you can implement this without the
+      # argument. It will never be called with an explicit nil.
+      def pull!(remote=nil)
+        raise "Scm.pull! not implemented." if supported_commands.include?(:pull)
+        nil
+      end
+      
+      # REQUIRED for :pull_targetted. Returns an array of pull targets.
+      def pull_targets
+        raise "Scm.pull_targets not implemented." if supported_commands.include?(:pull_targeted)
+        []
+      end
+      
+      # REQUIRED for :switch_branch and :merge. Returns an array of branch names.
+      #
+      # @return [Array<String>]
+      def branches
+        raise "Scm.branches not implemented." if supported_commands.include?(:switch_branch) or supported_commands.include?(:merge)
+        []
+      end
+      
+      # REQUIRED for :switch_branch. Returns the name of the current branch.
+      def current_branch
+        raise "Scm.current_branch not implemented." if supported_commands.include?(:switch_branch)
+        ''
+      end
+      
+      # REQUIRED for :switch_branch. Switches to the named branch.
+      def switch!(branch)
+        raise "Scm.switch! not implemented." if supported_commands.include?(:switch_branch)
+        nil
+      end
+      
+      # REQUIRED for :merge. Merges the target branch with the current one.
+      def merge!(branch)
+        raise "Scm.switch! not implemented." if supported_commands.include?(:merge)
+        nil
+      end
+      
+      # Allows the SCM to provide a custom adapter which is injected into the
+      # project instead of old_adapter. This allows interception of file 
+      # modifications such as move and copy, which you may wish to do via
+      # your SCM instead of normal file system operations.
+      def adapter(old_adapter)
+        nil
+      end
+    end
+  end
+end

data/plugins/scm/lib/scm/scm_changes_controller.rb

@@ -0,0 +1,94 @@
+
+module Redcar
+  module Scm
+    class ScmChangesController
+      include Redcar::Tree::Controller
+      
+      COMMAND_MAP = {
+        :new => [:index_add, :index_ignore, :index_delete],
+        :indexed => [:index_revert, :index_unsave],
+        :deleted => [:index_unsave, :index_restore],
+        :missing => [:index_delete, :index_restore],
+        :changed => [:index_save, :index_revert],
+        :unmerged => [:index_save, :index_delete],
+        :commitable => [:commit],
+        :moved => [:index_unsave],
+      }
+      
+      def initialize(repo)
+        @repo = repo
+      end
+      
+      def activated(tree, node)
+        if node.respond_to?(:status) and node.status == [:unmerged]
+          Project::FileOpenCommand.new(node.path).run
+        elsif node.respond_to?(:diff)
+          diff = node.diff
+          if diff
+            tab = Redcar.app.focussed_window.new_tab(Redcar::EditTab)
+            edit_view = tab.edit_view  
+            mirror = Scm::DiffMirror.new(node, diff)
+            edit_view.document.mirror = mirror
+            edit_view.grammar = "Diff"
+            tab.focus
+          end
+        end
+      end
+      
+      def drag_controller(tree)
+        DragController.new(tree, @repo)
+      end
+      
+      def right_click(tree, node)
+        repo = @repo
+        
+        # TODO: In lieu of actually supporting multi-select, make it obvious
+        # that we don't.
+        if tree.selection.length > 1
+          tree.select(node)
+        end
+        
+        menu = Menu::Builder.build do
+          if node.is_a?(Scm::ScmChangesMirror::Change) and repo.supported_commands.include?(:index)
+            # commands may end up in the array twice, but include? doesn't care
+            commands = node.status.map {|s| COMMAND_MAP[s]}.flatten
+            
+            if (commands.include?(:commit))
+              item(repo.translations[:commitable]) { Scm::Manager.open_commit_tab(repo, node) }
+            end
+            if (commands.include?(:index_add))
+              item(repo.translations[:index_add]) { if repo.index_add(node); tree.refresh; end }
+            end
+            if (commands.include?(:index_ignore))
+              item(repo.translations[:index_ignore]) { if repo.index_ignore(node); tree.refresh; end }
+            end
+            if (commands.include?(:index_save))
+              item(repo.translations[:index_save]) { if repo.index_save(node); tree.refresh; end }
+            end
+            if (commands.include?(:index_unsave))
+              item(repo.translations[:index_unsave]) { if repo.index_unsave(node); tree.refresh; end }
+            end
+            if (commands.include?(:index_delete))
+              item(repo.translations[:index_delete]) { if repo.index_delete(node); tree.refresh; end }
+            end
+            if (commands.include?(:index_revert))
+              item(repo.translations[:index_revert]) { if repo.index_revert(node); tree.refresh; end }
+            end
+            if (commands.include?(:index_restore))
+              item(repo.translations[:index_restore]) { if repo.index_restore(node); tree.refresh; end }
+            end
+            
+            separator
+          elsif node.is_a?(Scm::ScmChangesMirror::ChangesNode) and node.change_types != :unindexed
+            item(repo.translations[:commit]) { Scm::Manager.open_commit_tab(repo) }
+            
+            separator
+          end
+          item("Refresh", :priority => :last) { repo.refresh; tree.refresh }
+        end
+        
+        Application::Dialog.popup_menu(menu, :pointer)
+      end
+    end
+  end
+end