class Git::Branch

Constants

BRANCH_NAME_REGEXP

Attributes

full[RW]
name[RW]
remote[RW]

Public Class Methods

new(base, name) click to toggle source
# File lib/git/branch.rb, line 7
def initialize(base, name)
  @full = name
  @base = base
  @gcommit = nil
  @stashes = nil
  @remote, @name = parse_name(name)
end

Public Instance Methods

archive(file, opts = {}) click to toggle source
# File lib/git/branch.rb, line 29
def archive(file, opts = {})
  @base.lib.archive(@full, file, opts)
end
checkout() click to toggle source
# File lib/git/branch.rb, line 24
def checkout
  check_if_create
  @base.checkout(@full)
end
contains?(commit) click to toggle source
# File lib/git/branch.rb, line 61
def contains?(commit)
  !@base.lib.branch_contains(commit, self.name).empty?
end
create() click to toggle source
# File lib/git/branch.rb, line 49
def create
  check_if_create
end
current() click to toggle source
# File lib/git/branch.rb, line 57
def current
  determine_current
end
delete() click to toggle source
# File lib/git/branch.rb, line 53
def delete
  @base.lib.branch_delete(@name)
end
gcommit() click to toggle source
# File lib/git/branch.rb, line 15
def gcommit
  @gcommit ||= @base.gcommit(@full)
  @gcommit
end
in_branch(message = 'in branch work') { || ... } click to toggle source

g.branch(‘new_branch’).in_branch do

# create new file
# do other stuff
return true # auto commits and switches back

end

# File lib/git/branch.rb, line 38
def in_branch(message = 'in branch work')
  old_current = @base.lib.branch_current
  checkout
  if yield
    @base.commit_all(message)
  else
    @base.reset_hard
  end
  @base.checkout(old_current)
end
merge(branch = nil, message = nil) click to toggle source
# File lib/git/branch.rb, line 65
def merge(branch = nil, message = nil)
  if branch
    in_branch do
      @base.merge(branch, message)
      false
    end
    # merge a branch into this one
  else
    # merge this branch into the current one
    @base.merge(@name)
  end
end
stashes() click to toggle source
# File lib/git/branch.rb, line 20
def stashes
  @stashes ||= Git::Stashes.new(@base)
end
to_a() click to toggle source
# File lib/git/branch.rb, line 86
def to_a
  [@full]
end
to_s() click to toggle source
# File lib/git/branch.rb, line 90
def to_s
  @full
end
update_ref(commit) click to toggle source
# File lib/git/branch.rb, line 78
def update_ref(commit)
  if @remote
    @base.lib.update_ref("refs/remotes/#{@remote.name}/#{@name}", commit)
  else
    @base.lib.update_ref("refs/heads/#{@name}", commit)
  end
end

Private Instance Methods

check_if_create() click to toggle source
# File lib/git/branch.rb, line 96
def check_if_create
  @base.lib.branch_new(@name) rescue nil
end
determine_current() click to toggle source
# File lib/git/branch.rb, line 100
def determine_current
  @base.lib.branch_current == @name
end
parse_name(name) click to toggle source

Given a full branch name return an Array containing the remote and branch names.

Removes ‘remotes’ from the beggining of the name (if present). Takes the second part (splittign by ‘/’) as the remote name. Takes the rest as the repo name (can also hold one or more ‘/’).

Example:

# local branches
parse_name('master') #=> [nil, 'master']
parse_name('origin/master') #=> [nil, 'origin/master']
parse_name('origin/master/v2') #=> [nil, 'origin/master']

# remote branches
parse_name('remotes/origin/master') #=> ['origin', 'master']
parse_name('remotes/origin/master/v2') #=> ['origin', 'master/v2']
parse_name('refs/remotes/origin/master') #=> ['origin', 'master']
parse_name('refs/remotes/origin/master/v2') #=> ['origin', 'master/v2']

param [String] name branch full name. return [<Git::Remote,NilClass,String>] an Array containing the remote and branch names.

# File lib/git/branch.rb, line 135
def parse_name(name)
  # Expect this will always match
  match = name.match(BRANCH_NAME_REGEXP)
  remote = match[:remote_name] ? Git::Remote.new(@base, match[:remote_name]) : nil
  branch_name = match[:branch_name]
  [ remote, branch_name ]
end