braid 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0b2f225e7f0c82f88971cbd3bf9a64e5577928d
-  data.tar.gz: 644ccc97b60f9dbbf8442300d7ee7361ef58111f
+  metadata.gz: 22c192bf298deec94e78ff118cbb19ab8fedc6e6
+  data.tar.gz: cf7ab24e69fb9c3272e9fde0d71a93db16f4f289
 SHA512:
-  metadata.gz: f7bcbac3193bdf5a1c42b1d72bf231f84330f54d906465b34086faa24403a1245ad1fd5fbd6fa75e8579796df14f3911e7bd483a53881e712756da9c7b43e0ef
-  data.tar.gz: d9051b3e28fc9f67ef0e4f09572f84d02e4ee60be26752878b0ea7e159d01de8941449a03b367968e4caf3b652074ce3d9ae19add14f9907ab143cdc06b73356
+  metadata.gz: 6a2aa594064557e3c0fb8d1ed7452f8607b98bb101fcf42a3b7265779ce0ea16168dbbeb69dcf74e5883a008d6c7ab4686015a28ecbebe236b95d592087d56ba
+  data.tar.gz: 5d1cb3f00d03531dc5c5ca7319aa733bc36e55e1bdab40c11d49f52f22c0a680a40a6792d438e10f53fa8fbc93faf20c54f1cb1ee69c7127ce328d0d52c70611

data/lib/braid/commands/update.rb

@@ -75,6 +75,7 @@ module Braid
             git.merge_subtree(target_revision)
           end
         rescue Operations::MergeError => error
+          print error.conflicts_text
           msg 'Caught merge error. Breaking.'
         end
 

data/lib/braid/operations.rb

@@ -8,8 +8,11 @@ module Braid
 
   module Operations
     class ShellExecutionError < BraidError
-      def initialize(err = nil)
+      attr_reader :err, :out
+
+      def initialize(err = nil, out = nil)
         @err = err
+        @out = out
       end
 
       def message
@@ -38,6 +41,12 @@ module Braid
       end
     end
     class MergeError < BraidError
+      attr_reader :conflicts_text
+
+      def initialize(conflicts_text)
+        @conflicts_text = conflicts_text
+      end
+
       def message
         'could not merge'
       end
@@ -134,7 +143,7 @@ module Braid
 
       def exec!(cmd)
         status, out, err = exec(cmd)
-        raise ShellExecutionError, err unless status == 0
+        raise ShellExecutionError.new(err, out) unless status == 0
         [status, out, err]
       end
 
@@ -242,7 +251,8 @@ module Braid
         invoke(:merge, '-s subtree --no-commit --no-ff', opt)
         true
       rescue ShellExecutionError
-        raise MergeError
+        # TODO: Figure out how to pass along conflict messages.
+        raise MergeError, ''
       end
 
       # Merge three trees (local_treeish should match the current state of the
@@ -256,8 +266,9 @@ module Braid
       def merge_trees(base_treeish, local_treeish, remote_treeish)
         invoke(:merge_recursive, base_treeish, "-- #{local_treeish} #{remote_treeish}")
         true
-      rescue ShellExecutionError
-        raise MergeError
+      rescue ShellExecutionError => error
+        # "CONFLICT" messages go to stdout.
+        raise MergeError, error.out
       end
 
       def read_ls_files(prefix)

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: braid
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple tool for tracking vendor branches in git.