Class: Braid::Operations::Git

Inherits:
Proxy
  • Object
show all
Defined in:
lib/braid/operations.rb

Instance Method Summary collapse

Methods inherited from Proxy

command, #require_version, #require_version!, #version

Dynamic Method Handling

This class handles dynamic methods through the method_missing method in the class Braid::Operations::Proxy

Instance Method Details

#apply(diff, *args) ⇒ Object

Raises:



289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
 
# File 'lib/braid/operations.rb', line 289

def apply(diff, *args)
  err = nil

  if defined?(JRUBY_VERSION)
    Open3.popen3("git apply --index --whitespace=nowarn #{args.join(' ')} -") do |stdin, stdout, stderr|
      stdin.puts(diff)
      stdin.close
      err = stderr.read
    end
    status = $?.exitstatus
  else
    status = Open4.popen4("git apply --index --whitespace=nowarn #{args.join(' ')} -") do |pid, stdin, stdout, stderr|
      stdin.puts(diff)
      stdin.close
      err = stderr.read
    end.exitstatus
  end

  raise ShellExecutionError, err unless status == 0
  true
end

#branch ⇒ Object 



284
285
286
287
 
# File 'lib/braid/operations.rb', line 284

def branch
  status, out, err = exec!("git branch | grep '*'")
  out[2..-1]
end

#checkout(treeish) ⇒ Object 



181
182
183
184
 
# File 'lib/braid/operations.rb', line 181

def checkout(treeish)
  invoke(:checkout, treeish)
  true
end

#clone(*args) ⇒ Object 



311
312
313
314
 
# File 'lib/braid/operations.rb', line 311

def clone(*args)
  # overrides builtin
  invoke(:clone, *args)
end

#commit(message, *args) ⇒ Object 



154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
 
# File 'lib/braid/operations.rb', line 154

def commit(message, *args)
  cmd = "git commit --no-verify"
  if message # allow nil
    message_file = Tempfile.new("braid_commit")
    message_file.print("Braid: #{message}")
    message_file.flush
    cmd << " -F #{message_file.path}"
  end
  cmd << " #{args.join(' ')}" unless args.empty?
  status, out, err = exec(cmd)
  message_file.unlink if message_file

  if status == 0
    true
  elsif out.match(/nothing.* to commit/)
    false
  else
    raise ShellExecutionError, err
  end
end

#diff_tree(src_tree, dst_tree, prefix = nil) ⇒ Object 



264
265
266
267
268
269
 
# File 'lib/braid/operations.rb', line 264

def diff_tree(src_tree, dst_tree, prefix = nil)
  cmd = "git diff-tree -p --binary #{src_tree} #{dst_tree}"
  cmd << " --src-prefix=a/#{prefix}/ --dst-prefix=b/#{prefix}/" if prefix
  status, out, err = exec!(cmd)
  out
end

#ensure_clean! ⇒ Object 



276
277
278
 
# File 'lib/braid/operations.rb', line 276

def ensure_clean!
  status_clean? || raise(LocalChangesPresent)
end

#fetch(remote = nil, *args) ⇒ Object 



175
176
177
178
179
 
# File 'lib/braid/operations.rb', line 175

def fetch(remote = nil, *args)
  args.unshift "-n #{remote}" if remote
  # open4 messes with the pipes of index-pack
  sh("git fetch #{args.join(' ')} 2>&1 >/dev/null")
end

#head ⇒ Object 



280
281
282
 
# File 'lib/braid/operations.rb', line 280

def head
  rev_parse("HEAD")
end

#merge_base(target, source) ⇒ Object

Returns the base commit or nil.



187
188
189
190
191
 
# File 'lib/braid/operations.rb', line 187

def merge_base(target, source)
  invoke(:merge_base, target, source)
rescue ShellExecutionError
  nil
end

#merge_ours(opt) ⇒ Object

Implies no commit.



228
229
230
231
 
# File 'lib/braid/operations.rb', line 228

def merge_ours(opt)
  invoke(:merge, "-s ours --no-commit", opt)
  true
end

#merge_recursive(base_hash, local_hash, remote_hash) ⇒ Object 



242
243
244
245
246
247
 
# File 'lib/braid/operations.rb', line 242

def merge_recursive(base_hash, local_hash, remote_hash)
  invoke(:merge_recursive, base_hash, "-- #{local_hash} #{remote_hash}")
  true
rescue ShellExecutionError
  raise MergeError
end

#merge_subtree(opt) ⇒ Object

Implies no commit.



234
235
236
237
238
239
240
 
# File 'lib/braid/operations.rb', line 234

def merge_subtree(opt)
  # TODO which options are needed?
  invoke(:merge, "-s subtree --no-commit --no-ff", opt)
  true
rescue ShellExecutionError
  raise MergeError
end

#read_tree_prefix(treeish, prefix) ⇒ Object 



249
250
251
252
 
# File 'lib/braid/operations.rb', line 249

def read_tree_prefix(treeish, prefix)
  invoke(:read_tree, "--prefix=#{prefix}/ -u", treeish)
  true
end

#remote_add(remote, path, branch) ⇒ Object

Implies tracking.



200
201
202
203
 
# File 'lib/braid/operations.rb', line 200

def remote_add(remote, path, branch)
  invoke(:remote, "add", "-t #{branch} -m #{branch}", remote, path)
  true
end

#remote_rm(remote) ⇒ Object 



205
206
207
208
 
# File 'lib/braid/operations.rb', line 205

def remote_rm(remote)
  invoke(:remote, "rm", remote)
  true
end

#remote_url(remote) ⇒ Object

Checks git and svn remotes.



211
212
213
214
215
216
217
218
219
220
 
# File 'lib/braid/operations.rb', line 211

def remote_url(remote)
  key = "remote.#{remote}.url"
  begin
    invoke(:config, key)
  rescue ShellExecutionError
    invoke(:config, "svn-#{key}")
  end
rescue ShellExecutionError
  nil
end

#reset_hard(target) ⇒ Object 



222
223
224
225
 
# File 'lib/braid/operations.rb', line 222

def reset_hard(target)
  invoke(:reset, "--hard", target)
  true
end

#rev_parse(opt) ⇒ Object 



193
194
195
196
197
 
# File 'lib/braid/operations.rb', line 193

def rev_parse(opt)
  invoke(:rev_parse, opt)
rescue ShellExecutionError
  raise UnknownRevision, opt
end

#rm_r(path) ⇒ Object 



254
255
256
257
 
# File 'lib/braid/operations.rb', line 254

def rm_r(path)
  invoke(:rm, "-r", path)
  true
end

#status_clean? ⇒ Boolean

Returns:

  • (Boolean) 


271
272
273
274
 
# File 'lib/braid/operations.rb', line 271

def status_clean?
  status, out, err = exec("git status")
  !out.split("\n").grep(/nothing to commit/).empty?
end

#tree_hash(path, treeish = "HEAD") ⇒ Object 



259
260
261
262
 
# File 'lib/braid/operations.rb', line 259

def tree_hash(path, treeish = "HEAD")
  out = invoke(:ls_tree, treeish, "-d", path)
  out.split[2]
end