svn_command_helper 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49f39ad55dc5cb31c499dc1421d4051a5b8ff3c6
-  data.tar.gz: 4153d0ca030e1738fa05c35785e59cfb371b018a
+  metadata.gz: c76b5ad4dad201a7824cd3ceaa6b16fb717d866b
+  data.tar.gz: b888a7a706cf64ad30f796042b3de0c63bd0a365
 SHA512:
-  metadata.gz: f71b08b8338bd8866a86159901c864e40cdd3fea8253be102fe53e42fa5802363e4ce088aa1bba1478c68afb33a90d80515b844d5e87801c66d9e7c9a5429138
-  data.tar.gz: 47fa6ab5c989c8b56ba9ab74b1e1cb3da6acb3bddc28f15345687b74b82db75d178d7398ce52e247467e50bc68d3785acf4e3ef70730b32622371d1cfe248739
+  metadata.gz: c378bcb135924e360faf210fccf1dcd3c5260755ad01c0eb83edd62f7be1238e258952a50eb451dce981b6acb2f8432fa1e34694c4fd314fa105239ba8a777ad
+  data.tar.gz: e29ad93b6ddda05d0bbfde866806016d65d8250d1b07432cc89ab9759399c9ddbda506707c0c8938368a62e7e16043612cd31599ef39dae2265fe6e948407f1a

data/lib/svn_command_helper/version.rb

@@ -1,4 +1,4 @@
 module SvnCommandHelper
   # version
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/svn_command_helper.rb

@@ -136,6 +136,47 @@ module SvnCommandHelper
         end
       end
 
+      # svn merge -r start_rev:end_rev from_uri to_path
+      # @param [Integer] start_rev start revision
+      # @param [Integer] end_rev end revision
+      # @param [String] from_uri from uri
+      # @param [String] to_path to local path
+      def merge1(start_rev, end_rev, from_uri, to_path = ".")
+        safe_merge "svn merge -r #{start_rev}:#{end_rev} #{from_uri} #{to_path}"
+      end
+
+      # merge after dry-run conflict check
+      # @param [String] command svn merge full command
+      def safe_merge(command)
+        dry_run = cap("#{command} --dry-run")
+        if dry_run.each_line.any? {|line| line.start_with?("C")}
+          raise "[ERROR] merge_branch_to_trunk: `#{command}` has conflict!\n#{dry_run}"
+        else
+          sys command
+        end
+      end
+
+      # svn merge branch to trunk with detecting revision range
+      # @param [String] from_uri from uri
+      # @param [String] to_path to local path
+      def merge_branch_to_trunk(from_uri, to_path = ".")
+        start_rev = copied_revision(from_uri)
+        end_rev = revision(from_uri)
+        merge1(start_rev, end_rev, from_uri, to_path)
+      end
+
+      # reverse merge single revision
+      # @param [Integer] start_rev start revision
+      # @param [Integer] end_rev end revision (if no end_rev then "-c start_rev")
+      # @param [String] path local path
+      def reverse_merge(start_rev, end_rev = nil, path = ".")
+        if end_rev
+          safe_merge "svn merge -r #{end_rev}:#{start_rev} #{path}"
+        else
+          safe_merge "svn merge -c #{start_rev} #{path}"
+        end
+      end
+
       # svn info -> yaml parse
       # @param [path string like] path target path
       # @return [Hash<String, String>] svn info contents

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svn_command_helper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Narazaka