svn_command_helper 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4136d2e62bccd090142f60b3066fe827358ed331
-  data.tar.gz: 5cff7f8d944a0df5f62ce831077f1aedb21ffbea
+  metadata.gz: 0a4ce823897241b18d9f4884d9247495b2da7386
+  data.tar.gz: f96dd812b11e7211102040fd855412bde219f90f
 SHA512:
-  metadata.gz: 644a746013d48ae0be9be58fea0dd55e73195c95104c98a9ce111e57eab24fbfa8e22a455d9c6b4ae08c8e9c8d9d1103655ee1938ca2f83d1403515020c60f80
-  data.tar.gz: 71025eca99d0eac8f41dc23e21f07d1c07c9557c707672e0b8a70f90d83d2b158f65ca1f05570b2a5cd3c9face0472965cd5756c463ca2b2177e93c4c40fae3f
+  metadata.gz: e4da0345f5b11ea16723a5764296eddd7321c699c6b924c595ea3a60b80cd29dcc40240ebb6e489fd96625fd29311eaa4e47d8c47bc9a307d7a565f3f296ec9f
+  data.tar.gz: a49bcd4829440db97d440718020b40d9ad921c822a5d8def80ee2a10f7e6a7d3e0d31c65c956648e511ce9beaffe7f43b73613bfd19f98b8400259ea284d3686

data/lib/svn_command_helper.rb

@@ -178,13 +178,15 @@ module SvnCommandHelper
           sys "svn copy --parents #{only_from_transactions.map(&:from).join(' ')} #{transaction.to_base} -m '#{message}'"
         else
           Dir.mktmpdir do |dir|
-            sys "svn checkout --depth empty #{transaction.to_base} ."
-            sys "svn copy --parents #{only_from_transactions.map(&:from).join(' ')} ."
-            to_exist_transactions.each do |_transaction|
-              sys "svn update --set-depth infinity #{_transaction.file}"
-              sys "svn merge --accept theirs-full #{_transaction.from} #{_transaction.file}"
+            Dir.chdir(dir) do
+              sys "svn checkout --depth empty #{transaction.to_base} ."
+              sys "svn copy --parents #{only_from_transactions.map(&:from).join(' ')} ."
+              to_exist_transactions.each do |_transaction|
+                sys "svn update --set-depth infinity #{_transaction.file}"
+                sys "svn merge --accept theirs-full #{_transaction.from} #{_transaction.file}"
+              end
+              Svn.commit(message, ".")
             end
-            Svn.commit(message, ".")
           end
         end
       end
@@ -197,19 +199,21 @@ module SvnCommandHelper
         transactions.each do |transaction|
           raise "copy_multi: #{transaction.from} not exists" unless transaction.from_exist?
         end
-        Dir.tmpdir do |dir|
-          sys "svn checkout --depth empty #{base_uri} ."
-          transactions.each do |transaction|
-            relative_to = transaction.relative_to(base_uri)
-            Svn.update_deep(relative_to, "empty") # mkpath的な なくてもエラーにはならないので
-
-            if transaction.to_exist?  # toがある場合マージ
-              sys "svn merge --accept theirs-full #{transaction.from} #{relative_to}"
-            else # toがない場合コピー
-              sys "svn copy --parents #{transaction.from} #{relative_to}"
+        Dir.mktmpdir do |dir|
+          Dir.chdir(dir) do
+            sys "svn checkout --depth empty #{base_uri} ."
+            transactions.each do |transaction|
+              relative_to = transaction.relative_to(base_uri)
+              Svn.update_deep(relative_to, "empty") # mkpath的な なくてもエラーにはならないので
+
+              if transaction.to_exist?  # toがある場合マージ
+                sys "svn merge --accept theirs-full #{transaction.from} #{relative_to}"
+              else # toがない場合コピー
+                sys "svn copy --parents #{transaction.from} #{relative_to}"
+              end
             end
+            Svn.commit(message, ".")
           end
-          Svn.commit(message, ".")
         end
       end
 

data/lib/svn_command_helper/version.rb

@@ -1,4 +1,4 @@
 module SvnCommandHelper
   # version
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

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