redcar-dev 0.12.17dev

data/plugins/scm_git/lib/scm_git/change.rb

@@ -0,0 +1,137 @@
+
+module Redcar
+  module Scm
+    module Git
+      class Change
+        include Redcar::Scm::ScmChangesMirror::Change
+
+        STATUS_MAP_INDEXED = {
+          'M ' => [:indexed],
+          'A ' => [:indexed],
+          'D ' => [:deleted],
+          'R ' => [:moved],
+          'C ' => [:moved],
+          'AM' => [:indexed],
+          'MM' => [:indexed],
+          'RM' => [:moved],
+          'CM' => [:moved],
+          'AD' => [:indexed],
+          'MD' => [:indexed],
+          'RD' => [:moved],
+          'CD' => [:moved],
+        }
+
+        STATUS_MAP_UNINDEXED = {
+          '??' => [:new],
+          'UU' => [:unmerged],
+          'AM' => [:changed],
+          'MM' => [:changed],
+          'RM' => [:changed],
+          'CM' => [:changed],
+          'AD' => [:missing],
+          'MD' => [:missing],
+          'RD' => [:missing],
+          'CD' => [:missing],
+          ' M' => [:changed],
+          ' D' => [:missing],
+        }
+
+        attr_reader :repo, :type
+
+        def initialize(file, repo, type=:file, indexed=false, children=[])
+          @file     = file
+          @repo     = repo
+          @type     = type
+          @indexed  = indexed
+          @children = children
+        end
+
+        def path
+          if @file.type_raw[0,1] == "R" or @file.type_raw[0,1] == "C"
+            paths = @file.path.split(' -> ')
+            paths[1]
+          else
+            @file.path
+          end
+        end
+
+        def git_status
+          @file.type_raw
+        end
+
+        def status
+          # Subprojects should be commitable, but we can't update the
+          # current index while they are dirty.
+          if @type == :sub_project and @indexed and children.length > 0
+            [:commitable]
+          elsif @type == :sub_project and @repo.cache['submodules'][path].uncommited_changes.length > 0
+            []
+          elsif @indexed
+            STATUS_MAP_INDEXED[@file.type_raw] || []
+          else
+            STATUS_MAP_UNINDEXED[@file.type_raw] || []
+          end
+        end
+
+        def text
+          if @file.type_raw[0,1] == "R" or @file.type_raw[0,1] == "C"
+            @file.path
+          else
+            begin
+              pathname = Pathname.new(
+                File.expand_path(File.dirname(@file.path),@repo.repo.dir.path)
+              )
+              repopath = Pathname.new(@repo.path)
+              relpath  = pathname.relative_path_from(repopath).to_s
+            rescue Object => e
+              relpath = File.dirname(@file.path)
+            end
+            "#{File.basename(@file.path)} (#{relpath})"
+          end
+        end
+
+        def icon
+          icon = (@type == :file ? "notebook" : "folder")
+          case
+          when ((@file.type_raw == "??") or (@file.type_raw[0,1] == "A" and @indexed))
+            icon << "--plus"
+          when ((@file.type_raw[0,1] == "M" and @indexed) or (@file.type_raw[1,1] == "M" and (not @indexed)))
+            icon << "--pencil"
+          when (['C', 'R'].include?(@file.type_raw[0,1]) and @indexed)
+            icon << "--arrow"
+          when ((@file.type_raw[0,1] == "D" and @indexed) or (@file.type_raw[1,1] == "D" and (not @indexed)))
+            icon << "--minus"
+          when (@file.type_raw[0,1] == "U" and (not @indexed))
+            icon << "--exclamation"
+          else
+            icon = (@type == :file ? :file : :directory)
+          end
+          icon.to_sym
+        end
+
+        def leaf?
+          icon == :file
+        end
+
+        def children
+          @children
+        end
+
+        def diff
+          if (not @indexed) and @file.type_raw == "??"
+            # No diff available
+            nil
+          elsif @indexed
+            @repo.repo.lib.diff_full('HEAD', nil, {:path_limiter => path, :cached => true})
+          else
+            @repo.repo.lib.diff_full('HEAD', nil, {:path_limiter => path})
+          end
+        end
+
+        def to_data
+          "#{@file.type_raw}:#{@file.path}:#{@repo.repo.dir.path}:#{@type.to_s}:#{@indexed}"
+        end
+      end
+    end
+  end
+end

data/plugins/scm_git/lib/scm_git/commit.rb

@@ -0,0 +1,18 @@
+
+module Redcar
+  module Scm
+    module Git
+      class Commit
+        include Redcar::Scm::ScmCommitsMirror::Commit
+        
+        def initialize(commit)
+          @commit = commit
+        end
+        
+        def text
+          @commit.sha[0, 7] + " - " + @commit.message.split("\n").first
+        end
+      end
+    end
+  end
+end

data/plugins/scm_git/lib/scm_git/config_file.rb

@@ -0,0 +1,31 @@
+
+module Redcar
+  module Scm
+    module Git
+      class ConfigFile
+        
+        def self.parse(path)
+          f = File.open(path)
+          config = {}
+          current = ""
+          
+          f.each_line do |line|
+            line = line.rstrip
+            if line[0, 1] == "[" and line[line.length - 1, 1] == "]"
+              current = line[1, line.length - 2]
+              config[current] ||= {}
+            elsif line[0, 1] == "\t"
+              line = line[1, line.length - 1]
+              
+              values = line.split(' = ', 2)
+              config[current][values[0]] = values[1]
+            end
+          end
+          f.close
+          config
+        end
+        
+      end
+    end
+  end
+end

data/plugins/scm_git/plugin.rb

@@ -0,0 +1,7 @@
+Plugin.define do
+  name    "scm_git"
+  version "0.1"
+  file    "lib", "scm_git"
+  object  "Redcar::Scm::Git::Manager"
+  dependencies "scm", ">0"
+end

data/plugins/scm_hg/lib/scm_hg.rb

@@ -0,0 +1,30 @@
+
+module Redcar
+  module Scm
+    module Mercurial
+      class Manager
+        include Redcar::Scm::Model
+        
+        def self.scm_module
+          Redcar::Scm::Mercurial::Manager
+        end
+        
+        def self.supported?
+          # not implemented, and hence never supported
+          Redcar.log.debug "SCM     Mercurial support is currently unimplemented"
+          false
+        end
+      
+        # Whether to print debugging messages. Default to whatever scm is using.
+        def self.debug
+          Redcar::Scm::Manager.debug
+        end
+        
+        def debug
+          Redcar::Scm::Mercurial::Manager.debug
+        end
+      end
+    end
+  end
+end
+

data/plugins/scm_hg/plugin.rb

@@ -0,0 +1,7 @@
+Plugin.define do
+  name    "scm_hg"
+  version "0.1"
+  file    "lib", "scm_hg"
+  object  "Redcar::Scm::Mercurial::Manager"
+  dependencies "scm", ">0"
+end

data/plugins/scm_svn/LICENSE

@@ -0,0 +1,48 @@
+The TMate Open Source License.
+
+
+This license applies to all portions of TMate SVNKit library, which 
+are not externally-maintained libraries (e.g. Ganymed SSH library).
+
+All the source code and compiled classes in package org.tigris.subversion.javahl
+except SvnClient class are covered by the license in JAVAHL-LICENSE file
+
+Copyright (c) 2004-2009 TMate Software. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer.
+      
+    * Redistributions in binary form must reproduce the above copyright notice, 
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution.
+      
+    * Redistributions in any form must be accompanied by information on how to 
+      obtain complete source code for the software that uses SVNKit and any 
+      accompanying software that uses the software that uses SVNKit. The source 
+      code must either be included in the distribution or be available for no 
+      more than the cost of distribution plus a nominal fee, and must be freely 
+      redistributable under reasonable conditions. For an executable file, complete 
+      source code means the source code for all modules it contains. It does not 
+      include source code for modules or files that typically accompany the major 
+      components of the operating system on which the executable file runs.
+      
+    * Redistribution in any form without redistributing source code for software 
+      that uses SVNKit is possible only when such redistribution is explictly permitted 
+      by TMate Software. Please, contact TMate Software at support@svnkit.com to 
+      get such permission.
+
+THIS SOFTWARE IS PROVIDED BY TMATE SOFTWARE ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE 
+DISCLAIMED. 
+
+IN NO EVENT SHALL TMATE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/plugins/scm_svn/features/add_and_commit.feature

@@ -0,0 +1,18 @@
+Feature: Adding and committing files in a working copy
+
+  Scenario: Adding and committing new files to a repository
+    When I checkout a local repository
+    And I create a wc file named "README,foo.rb"
+    And I add "foo.rb" to the index
+    And I commit my changes with message "Hark! This is a commit."
+    Then there should be "1" unindexed files and "0" indexed files
+    And if I checkout to a new working copy, it should have "1" files
+
+  Scenario: Adding and committing new directories to a repository
+    When I checkout a local repository
+    And I create a wc directory named "lib"
+    And I create a wc file named "lib/foo.rb"
+    And I add "lib/foo.rb" to the index
+    And I commit my changes with message "Hark! This is a commit."
+    Then there should be "0" unindexed files and "0" indexed files
+    And if I checkout to a new working copy, it should have "1" files

data/plugins/scm_svn/features/checkout.feature

@@ -0,0 +1,5 @@
+Feature: Checking out a repository
+
+  Scenario: Checking out a repository via the 'file' protocol
+    When I checkout a local repository
+    Then I should have a working copy

data/plugins/scm_svn/features/edit_and_index.feature

@@ -0,0 +1,12 @@
+Feature: Editing and indexing files in a working copy
+
+  Scenario: Editing a file and viewing unindexed modified files
+    When I checkout a local repository
+    And I create a wc file named "README"
+    Then there should be "1" unindexed files and "0" indexed files
+
+  Scenario: Editing a file and adding to the index
+    When I checkout a local repository
+    And I create a wc file named "README,foo.rb"
+    And I add "foo.rb" to the index
+    Then there should be "1" unindexed files and "1" indexed files

data/plugins/scm_svn/features/ignore_files.feature

@@ -0,0 +1,14 @@
+Feature: Ignoring external files within a working directory
+
+  Scenario: Ignoring certain files
+    When I checkout a local repository
+    And I create a wc file named "foo.rb"
+    And I ignore "foo.rb"
+    Then there should be "0" unindexed files and "0" indexed files
+
+  Scenario: Ignoring all files of a type
+    When I checkout a local repository
+    And I create a wc file named "foo.rb,bar.rb,README"
+    Then there should be "3" unindexed files and "0" indexed files
+    When I ignore "rb" files
+    Then there should be "1" unindexed files and "0" indexed files

data/plugins/scm_svn/features/merge.feature

@@ -0,0 +1,34 @@
+Feature: Merging two branches together
+
+  Scenario: Merging a branch into trunk
+    When I checkout a local repository
+    And I create a wc directory named "trunk,branches,branches/version1,branches/version2"
+    And I create a wc file named "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt"
+    And I add "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt" to the index
+    And I commit my changes with message "Initial commit"
+    Given I will open "trunk" branch as a new project
+    When I open a directory
+    And I merge the "version1" branch
+    Then I should see "b.txt" in "trunk" branch
+
+  Scenario: Merging two branches together
+    When I checkout a local repository
+    And I create a wc directory named "trunk,branches,branches/version1,branches/version2"
+    And I create a wc file named "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt"
+    And I add "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt" to the index
+    And I commit my changes with message "Initial commit"
+    Given I will open "version1" branch as a new project
+    When I open a directory
+    And I merge the "version2" branch
+    Then I should see "c.txt" in "version1" branch
+
+  Scenario: Merging trunk into a branch
+    When I checkout a local repository
+    And I create a wc directory named "trunk,branches,branches/version1,branches/version2"
+    And I create a wc file named "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt"
+    And I add "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt" to the index
+    And I commit my changes with message "Initial commit"
+    Given I will open "version2" branch as a new project
+    When I open a directory
+    And I merge the "trunk" branch
+    Then I should see "a.txt" in "version2" branch

data/plugins/scm_svn/features/resolve_conflict.feature

@@ -0,0 +1,23 @@
+Feature: Resolving conflicts
+
+  Scenario: Resolving a file content conflict
+    When I checkout a local repository
+    And I create a wc file named "foo.rb"
+    And I replace "foo.rb" contents with "Never gonna make you cry"
+    And I add "foo.rb" to the index
+    And I commit my changes with message "Hark! This is a commit."
+    Then if I checkout to a new working copy, it should have "1" files
+    And the contents of wc file "foo.rb" in the new copy should be "Never gonna make you cry"
+    When I replace "foo.rb" contents with "Never gonna say goodbye"
+    And I commit my changes with message "Yarr! This is another commit."
+    And I replace "foo.rb" contents in the new copy with "Never gonna tell a lie and hurt you"
+    Then if I update my new working copy, it should have "4" files
+    And there should be "1" conflicted files in the new copy
+    When I replace "foo.rb" contents in the new copy with "Never gonna tell a lie and hurt you"
+    And and I resolve "foo.rb" conflicts in the new copy
+    Then if I update my new working copy, it should have "1" files
+    And there should be "0" conflicted files in the new copy
+    And the contents of wc file "foo.rb" in the new copy should be "Never gonna tell a lie and hurt you"
+    And I commit my changes in the new copy with message "Commit commit commit again!"
+    And if I update my working copy, it should have "1" files
+    And the contents of wc file "foo.rb" should be "Never gonna tell a lie and hurt you"

data/plugins/scm_svn/features/revert_and_delete.feature

@@ -0,0 +1,21 @@
+Feature: Reverting and deleting files in a working copy
+
+  Scenario: Reverting a dirty file to base revision
+    When I checkout a local repository
+    And I create a wc file named "foo.rb"
+    And I replace "foo.rb" contents with "Never gonna give you up"
+    And I add "foo.rb" to the index
+    And I commit my changes with message "Hark! This is a commit."
+    And I replace "foo.rb" contents with "Never gonna let you down"
+    And I revert "foo.rb"
+    Then there should be "0" unindexed files and "0" indexed files
+    And the contents of wc file "foo.rb" should be "Never gonna give you up"
+
+  Scenario: Deleting a file from version control
+    When I checkout a local repository
+    And I create a wc file named "foo.rb,bar.rb"
+    And I add "foo.rb,bar.rb" to the index
+    And I commit my changes with message "Hark! This be a commit."
+    And I wc delete "foo.rb"
+    And I commit my changes with message "Yarr! Committin' I be!"
+    Then if I checkout to a new working copy, it should have "1" files

data/plugins/scm_svn/features/step_definitions/branch_and_merge_steps.rb

@@ -0,0 +1,27 @@
+Given /^I will open "([^"]*)" branch as a new project$/ do |branch_name|
+  path = parse_branch_path(branch_name)
+  if path
+    Redcar.gui.dialog_adapter.set(:open_directory, path)
+    @svn_module = Redcar::Scm::Subversion::Manager.new
+    @svn_module.load(path)
+  end
+end
+
+When /^I switch to "([^"]*)" branch$/ do |branch_name|
+  path = parse_branch_path(branch_name)
+  Redcar.gui.dialog_adapter.set(:open_directory, path) if path
+  svn_module.switch!(branch_name)
+  svn_module.repository?(path).should == true
+end
+
+When /^I merge the "([^"]*)" branch$/ do |branch_name|
+  path = parse_branch_path(branch_name)
+  svn_module.merge!(branch_name)
+end
+
+Then /^I should see "([^"]*)" in "([^"]*)" branch$/ do |files, branch_name|
+  path = parse_branch_path(branch_name)
+  files.split(",").each {|f|
+    File.exist?(path + "/#{f}").should == true
+  }
+end