Class: Git::Branch

Inherits:
Path
  • Object
show all
Defined in:
lib/git/branch.rb

Instance Attribute Summary collapse

Attributes inherited from Path

#path

Instance Method Summary collapse

Methods inherited from Path

#readable?, #writable?

Constructor Details

#initialize(base, name) ⇒ Branch

Returns a new instance of Branch.



9
10
11
12
13
14
15
 
# File 'lib/git/branch.rb', line 9

def initialize(base, name)
  @full = name
  @base = base
  @gcommit = nil
  @stashes = nil
  @remote, @name = parse_name(name)
end

Instance Attribute Details

#full ⇒ Object

Returns the value of attribute full.



7
8
9
 
# File 'lib/git/branch.rb', line 7

def full
  @full
end

#name ⇒ Object

Returns the value of attribute name.



7
8
9
 
# File 'lib/git/branch.rb', line 7

def name
  @name
end

#remote ⇒ Object

Returns the value of attribute remote.



7
8
9
 
# File 'lib/git/branch.rb', line 7

def remote
  @remote
end

Instance Method Details

#archive(file, opts = {}) ⇒ Object 



31
32
33
 
# File 'lib/git/branch.rb', line 31

def archive(file, opts = {})
  @base.lib.archive(@full, file, opts)
end

#checkout ⇒ Object 



26
27
28
29
 
# File 'lib/git/branch.rb', line 26

def checkout
  check_if_create
  @base.checkout(@full)
end

#create ⇒ Object 



51
52
53
 
# File 'lib/git/branch.rb', line 51

def create
  check_if_create
end

#current ⇒ Object 



59
60
61
 
# File 'lib/git/branch.rb', line 59

def current
  determine_current
end

#delete ⇒ Object 



55
56
57
 
# File 'lib/git/branch.rb', line 55

def delete
  @base.lib.branch_delete(@name)
end

#gcommit ⇒ Object 



17
18
19
20
 
# File 'lib/git/branch.rb', line 17

def gcommit
  @gcommit ||= @base.gcommit(@full)
  @gcommit
end

#in_branch(message = 'in branch work') ⇒ Object

g.branch(‘new_branch’).in_branch do

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

end



40
41
42
43
44
45
46
47
48
49
 
# File 'lib/git/branch.rb', line 40

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) ⇒ Object 



63
64
65
66
67
68
69
70
71
72
73
74
 
# File 'lib/git/branch.rb', line 63

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 ⇒ Object 



22
23
24
 
# File 'lib/git/branch.rb', line 22

def stashes
  @stashes ||= Git::Stashes.new(@base)
end

#to_a ⇒ Object 



80
81
82
 
# File 'lib/git/branch.rb', line 80

def to_a
  [@full]
end

#to_s ⇒ Object 



84
85
86
 
# File 'lib/git/branch.rb', line 84

def to_s
  @full
end

#update_ref(commit) ⇒ Object 



76
77
78
 
# File 'lib/git/branch.rb', line 76

def update_ref(commit)
  @base.lib.update_ref(@full, commit)
end