svn_command_helper 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ed319daca7d4f6456d4adedafb1f8b8ea01fd85
-  data.tar.gz: 685413932344a4a488fcf3054ec98942fc3157a9
+  metadata.gz: 8a04d1ffee7008227fc5be923d5bbde0a425a9e8
+  data.tar.gz: cebf87d6b3a2b3ca7e00511984b379cd9f97a11e
 SHA512:
-  metadata.gz: 738a56bbb2526afc473bb3f6d5f1b0b9c07b1d9c5394db8e763a8e9b5b6c8abb36f6159b2225b171dab4c5544372b5530a8a8d3d0bff4f30f35fb4aa0849ba6a
-  data.tar.gz: ecaed0d02d0e3f097ee315c5fa4b68548addcf8d5f73657fe7be604e3ce15c72f6db2251a8551e001eddf1d6f035b03664b0b4cca67d20b3697d14ec254045bd
+  metadata.gz: 6264f9c979f7e17a225f0ea5ca99c314a70da37dd27cae624cf2f98849ade586ce93cf69c7c9807e0ceefb7fa8c49a038906319f4ffc5b9e58b063f9f1990ad7
+  data.tar.gz: 8fa7b2f1870ece39af35f2e8c13a3185dbe215a07e0ad7587d654b2c3e64fcd31c4f6bd17195b185cf8238950eeaf1a025f19166ef1c23ed822810e6deb8529d

data/lib/svn_command_helper.rb

@@ -139,12 +139,13 @@ module SvnCommandHelper
       # @param [path string like] path target path
       # @param [Integer] depth --set-depth for only new updated dirs
       # @param [Boolean] exist_path_update middle path update flag
-      def update_deep(path, depth = nil, exist_path_update = true)
+      # @param [String] root working copy root path
+      def update_deep(path, depth = nil, exist_path_update = true, root: nil)
         exist_path = path
         until File.exist?(exist_path)
           exist_path = File.dirname(exist_path)
         end
-        root = Pathname.new(Svn.working_copy_root_path(exist_path))
+        root = Pathname.new(root || Svn.working_copy_root_path(exist_path))
         end_path = Pathname.new(path.to_s).expand_path
         parents = [end_path]
         while parents.first != root
@@ -164,8 +165,9 @@ module SvnCommandHelper
       # @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 merge1_command(start_rev, end_rev, from_uri, to_path)
+      # @param [String] extra extra options
+      def merge1(start_rev, end_rev, from_uri, to_path = ".", extra = "")
+        safe_merge merge1_command(start_rev, end_rev, from_uri, to_path, extra)
       end
 
       # svn merge -r start_rev:end_rev from_uri to_path --dry-run
@@ -173,8 +175,9 @@ module SvnCommandHelper
       # @param [Integer] end_rev end revision
       # @param [String] from_uri from uri
       # @param [String] to_path to local path
-      def merge1_dry_run(start_rev, end_rev, from_uri, to_path = ".")
-        merge_dry_run merge1_command(start_rev, end_rev, from_uri, to_path)
+      # @param [String] extra extra options
+      def merge1_dry_run(start_rev, end_rev, from_uri, to_path = ".", extra = "")
+        merge_dry_run merge1_command(start_rev, end_rev, from_uri, to_path, extra)
       end
 
       # "svn merge -r start_rev:end_rev from_uri to_path"
@@ -182,9 +185,10 @@ module SvnCommandHelper
       # @param [Integer] end_rev end revision
       # @param [String] from_uri from uri
       # @param [String] to_path to local path
+      # @param [String] extra extra options
       # @param [Boolean] dry_run --dry-run
-      def merge1_command(start_rev, end_rev, from_uri, to_path = ".", dry_run: false)
-        "svn merge -r #{start_rev}:#{end_rev} #{from_uri} #{to_path} #{dry_run ? "--dry-run" : ""}"
+      def merge1_command(start_rev, end_rev, from_uri, to_path = ".", extra = "", dry_run: false)
+        "svn merge -r #{start_rev}:#{end_rev} #{from_uri} #{to_path} #{extra} #{dry_run ? "--dry-run" : ""}"
       end
 
       # merge after dry-run conflict check
@@ -203,7 +207,7 @@ module SvnCommandHelper
       # @param [String] command svn merge full command
       def merge_dry_run(command)
         cap("#{command} --dry-run")
-          .each_line.map(&:chomp).reject {|line| line.start_with?('-')}
+          .each_line.map(&:chomp).reject {|line| line[4] != " "}
           .map {|line| OpenStruct.new({status: line[0...4], path: line[5..-1]})}
       end
 
@@ -336,13 +340,17 @@ module SvnCommandHelper
           Dir.mktmpdir do |dir|
             Dir.chdir(dir) do
               sys "svn checkout --depth empty #{transaction.to_base} ."
+              # なくてもエラーにならないので全部update
+              sys "svn update --set-depth infinity #{transactions.map(&:file).join(' ')}"
               unless only_from_transactions.empty?
                 sys "svn copy --parents #{only_from_transactions.map(&:from).join(' ')} ."
               end
-              sys "svn update --set-depth infinity #{to_exist_transactions.map(&:file).join(' ')}"
               to_exist_transactions.each do |_transaction|
-                sys "svn export --force #{_transaction.from} #{_transaction.file}"
-                sys "svn add --force #{_transaction.file}"
+                begin
+                  Svn.merge1(1, "HEAD", _transaction.from, _transaction.file, "--accept theirs-full")
+                rescue
+                  sys "svn export --force #{_transaction.from} #{_transaction.file}"
+                end
               end
               Svn.commit(message, ".")
             end
@@ -361,15 +369,19 @@ module SvnCommandHelper
         Dir.mktmpdir do |dir|
           Dir.chdir(dir) do
             sys "svn checkout --depth empty #{base_uri} ."
+            root = Svn.working_copy_root_path(".")
             transactions.each do |transaction|
               relative_to = transaction.relative_to(base_uri)
 
               if transaction.to_exist?  # toがある場合マージ
-                Svn.update_deep(relative_to, "empty", false)
-                sys "svn export --force #{transaction.from} #{relative_to}"
-                sys "svn add --force #{relative_to}"
+                Svn.update_deep(relative_to, "empty", false, root: root)
+                begin
+                  Svn.merge1(1, "HEAD", transaction.from, relative_to, "--accept theirs-full")
+                rescue
+                  sys "svn export --force #{transaction.from} #{relative_to}"
+                end
               else # toがない場合コピー
-                Svn.update_deep(File.dirname(relative_to), "empty", false) # mkpath的な なくてもエラーにはならないので
+                Svn.update_deep(File.dirname(relative_to), "empty", false, root: root) # mkpath的な なくてもエラーにはならないので
                 sys "svn copy --parents #{transaction.from} #{relative_to}"
               end
             end

data/lib/svn_command_helper/version.rb

@@ -1,4 +1,4 @@
 module SvnCommandHelper
   # version
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

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