lib/git/branch.rb
# frozen_string_literal: true require 'git/path' module Git class Branch < Path attr_accessor :full, :remote, :name def initialize(base, name) @full = name @base = base @gcommit = nil @stashes = nil @remote, @name = parse_name(name) end def gcommit @gcommit ||= @base.gcommit(@full) @gcommit end def stashes @stashes ||= Git::Stashes.new(@base) end def checkout check_if_create @base.checkout(@full) end def archive(file, opts = {}) @base.lib.archive(@full, file, opts) end # g.branch('new_branch').in_branch do # # create new file # # do other stuff # return true # auto commits and switches back # end 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 def create check_if_create end def delete @base.lib.branch_delete(@name) end def current determine_current end def contains?(commit) !@base.lib.branch_contains(commit, self.name).empty? end 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 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 def to_a [@full] end def to_s @full end private def check_if_create @base.lib.branch_new(@name) rescue nil end def determine_current @base.lib.branch_current == @name end BRANCH_NAME_REGEXP = %r{ ^ # Optional 'refs/remotes/' at the beggining to specify a remote tracking branch # with a <remote_name>. <remote_name> is nil if not present. (?: (?:(?:refs/)?remotes/)(?<remote_name>[^/]+)/ )? (?<branch_name>.*) $ }x # 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. 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 end end