class Git::Base
Public Class Methods
opens a bare Git
Repository
- no working directory options
# File lib/git/base.rb, line 10 def self.bare(git_dir, opts = {}) self.new({:repository => git_dir}.merge(opts)) end
clones a git repository locally
repository - http://repo.or.cz/w/sinatra.git name - sinatra
options:
:repository :bare or :working_directory :index_file
# File lib/git/base.rb, line 27 def self.clone(repository, name, opts = {}) # run git-clone self.new(Git::Lib.new.clone(repository, name, opts)) end
Returns (and initialize if needed) a Git::Config
instance
@return [Git::Config] the current config instance.
# File lib/git/base.rb, line 35 def self.config return @@config ||= Config.new end
initializes a git repository
options:
:bare :index :repository
# File lib/git/base.rb, line 46 def self.init(working_dir, opts = {}) opts[:working_directory] ||= working_dir opts[:repository] ||= File.join(opts[:working_directory], '.git') FileUtils.mkdir_p(opts[:working_directory]) if opts[:working_directory] && !File.directory?(opts[:working_directory]) init_opts = { :bare => opts[:bare] } opts.delete(:working_directory) if opts[:bare] # Submodules have a .git *file* not a .git folder. # This file's contents point to the location of # where the git refs are held (In the parent repo) if File.file?('.git') git_file = File.open('.git').read[8..-1].strip opts[:repository] = git_file opts[:index] = git_file + '/index' end Git::Lib.new(opts).init(init_opts) self.new(opts) end
# File lib/git/base.rb, line 78 def initialize(options = {}) if working_dir = options[:working_directory] options[:repository] ||= File.join(working_dir, '.git') options[:index] ||= File.join(working_dir, '.git', 'index') end if options[:log] @logger = options[:log] @logger.info("Starting Git") else @logger = nil end @working_directory = options[:working_directory] ? Git::WorkingDirectory.new(options[:working_directory]) : nil @repository = options[:repository] ? Git::Repository.new(options[:repository]) : nil @index = options[:index] ? Git::Index.new(options[:index], false) : nil end
opens a new Git
Project from a working directory you can specify non-standard git_dir and index file in the options
# File lib/git/base.rb, line 74 def self.open(working_dir, opts={}) self.new({:working_directory => working_dir}.merge(opts)) end
Public Instance Methods
updates the repository index using the working directory content
@git.add('path/to/file') @git.add(['path/to/file1','path/to/file2']) @git.add(:all => true)
options:
:all => true
@param [String,Array] paths files paths to be added (optional, default=‘.’) @param [Hash] options
# File lib/git/base.rb, line 221 def add(*args) if args[0].instance_of?(String) || args[0].instance_of?(Array) self.lib.add(args[0],args[1]||{}) else self.lib.add('.', args[0]||{}) end end
adds a new remote to this repository url can be a git url or a Git::Base
object if it’s a local reference
@git.add_remote('scotts_git', 'git://repo.or.cz/rubygit.git') @git.fetch('scotts_git') @git.merge('scotts_git/master')
Options:
:fetch => true :track => <branch_name>
# File lib/git/base.rb, line 369 def add_remote(name, url, opts = {}) url = url.repo.path if url.is_a?(Git::Base) self.lib.remote_add(name, url, opts) Git::Remote.new(self, name) end
Creates a new git tag (Git::Tag) Usage:
repo.add_tag('tag_name', object_reference) repo.add_tag('tag_name', object_reference, {:options => 'here'}) repo.add_tag('tag_name', {:options => 'here'})
Options:
:a | :annotate -> true :d -> true :f -> true :m | :message -> String :s -> true
# File lib/git/base.rb, line 400 def add_tag(name, *opts) self.lib.tag(name, *opts) self.tag(name) end
# File lib/git/base.rb, line 424 def apply(file) if File.exist?(file) self.lib.apply(file) end end
# File lib/git/base.rb, line 430 def apply_mail(file) self.lib.apply_mail(file) if File.exist?(file) end
creates an archive file of the given tree-ish
# File lib/git/base.rb, line 411 def archive(treeish, file = nil, opts = {}) self.object(treeish).archive(file, opts) end
# File lib/git/base.rb, line 529 def cat_file(objectish) self.lib.object_contents(objectish) end
changes current working directory for a block to the git working directory
example
@git.chdir do # write files @git.add @git.commit('message') end
# File lib/git/base.rb, line 104 def chdir # :yields: the Git::Path Dir.chdir(dir.path) do yield dir.path end end
checks out a branch as the new git working directory
# File lib/git/base.rb, line 305 def checkout(branch = 'master', opts = {}) self.lib.checkout(branch, opts) end
checks out an old version of a file
# File lib/git/base.rb, line 310 def checkout_file(version, file) self.lib.checkout_file(version,file) end
# File lib/git/base.rb, line 468 def checkout_index(opts = {}) self.lib.checkout_index(opts) end
cleans the working directory
options:
:force :d
# File lib/git/base.rb, line 251 def clean(opts = {}) self.lib.clean(opts) end
commits all pending changes in the index file to the git repository
options:
:all :allow_empty :amend :author
# File lib/git/base.rb, line 292 def commit(message, opts = {}) self.lib.commit(message, opts) end
commits all pending changes in the index file to the git repository, but automatically adds all modified files without having to explicitly calling @git.add() on them.
# File lib/git/base.rb, line 299 def commit_all(message, opts = {}) opts = {:add_all => true}.merge(opts) self.lib.commit(message, opts) end
g.config(‘user.name’, ‘Scott Chacon’) # sets value g.config(‘user.email’, ‘email@email.com’) # sets value g.config(‘user.name’) # returns ‘Scott Chacon’ g.config # returns whole config hash
# File lib/git/base.rb, line 114 def config(name = nil, value = nil) if(name && value) # set value lib.config_set(name, value) elsif (name) # return value lib.config_get(name) else # return hash lib.config_list end end
returns the name of the branch the working directory is currently on
# File lib/git/base.rb, line 534 def current_branch self.lib.branch_current end
deletes a tag
# File lib/git/base.rb, line 406 def delete_tag(name) self.lib.tag(name, {:d => true}) end
returns the most recent tag that is reachable from a commit
options:
:all :tags :contains :debug :exact_match :dirty :abbrev :candidates :long :always :match
# File lib/git/base.rb, line 270 def describe(committish=nil, opts={}) self.lib.describe(committish, opts) end
returns a reference to the working directory
@git.dir.path @git.dir.writeable?
# File lib/git/base.rb, line 130 def dir @working_directory end
iterates over the files which are unmerged
# File lib/git/base.rb, line 340 def each_conflict(&block) # :yields: file, your_version, their_version self.lib.conflicts(&block) end
fetches changes from a remote branch - this does not modify the working directory, it just gets the changes from the remote if there are any
# File lib/git/base.rb, line 316 def fetch(remote = 'origin', opts={}) self.lib.fetch(remote, opts) end
# File lib/git/base.rb, line 420 def gc self.lib.gc end
will run a grep for ‘string’ on the HEAD of the git repository
to be more surgical in your grep, you can call grep() off a specific git object. for example:
@git.object("v2.3").grep('TODO')
in any case, it returns a hash of arrays of the type:
hsh[tree-ish] = [[line_no, match], [line_no, match2]] hsh[tree-ish] = [[line_no, match], [line_no, match2]]
so you might use it like this:
@git.grep("TODO").each do |sha, arr| puts "in blob #{sha}:" arr.each do |match| puts "\t line #{match[0]}: '#{match[1]}'" end end
# File lib/git/base.rb, line 206 def grep(string, path_limiter = nil, opts = {}) self.object('HEAD').grep(string, path_limiter, opts) end
returns reference to the git index file
# File lib/git/base.rb, line 135 def index @index end
returns true
if the branch exists
# File lib/git/base.rb, line 175 def is_branch?(branch) branch_names = self.branches.map {|b| b.name} branch_names.include?(branch) end
returns true
if the branch exists locally
# File lib/git/base.rb, line 163 def is_local_branch?(branch) branch_names = self.branches.local.map {|b| b.name} branch_names.include?(branch) end
returns true
if the branch exists remotely
# File lib/git/base.rb, line 169 def is_remote_branch?(branch) branch_names = self.branches.remote.map {|b| b.name} branch_names.include?(branch) end
this is a convenience method for accessing the class that wraps all the actual ‘git’ forked system calls. At some point I hope to replace the Git::Lib
class with one that uses native methods or libgit C bindings
# File lib/git/base.rb, line 183 def lib @lib ||= Git::Lib.new(self, @logger) end
# File lib/git/base.rb, line 490 def ls_files(location=nil) self.lib.ls_files(location) end
# File lib/git/base.rb, line 525 def ls_tree(objectish) self.lib.ls_tree(objectish) end
merges one or more branches into the current working branch
you can specify more than one branch to merge by passing an array of branches
# File lib/git/base.rb, line 335 def merge(branch, message = 'merge') self.lib.merge(branch, message) end
pulls the given branch from the given remote into the current branch
@git.pull # pulls from origin/master @git.pull('upstream') # pulls from upstream/master @git.pull('upstream', 'develope') # pulls from upstream/develop
# File lib/git/base.rb, line 350 def pull(remote='origin', branch='master') self.lib.pull(remote, branch) end
pushes changes to a remote repository - easiest if this is a cloned repository, otherwise you may have to run something like this first to setup the push parameters:
@git.config('remote.remote-name.push', 'refs/heads/master:refs/heads/master')
# File lib/git/base.rb, line 325 def push(remote = 'origin', branch = 'master', opts = {}) # Small hack to keep backwards compatibility with the 'push(remote, branch, tags)' method signature. opts = {:tags => opts} if [true, false].include?(opts) self.lib.push(remote, branch, opts) end
# File lib/git/base.rb, line 472 def read_tree(treeish, opts = {}) self.lib.read_tree(treeish, opts) end
returns an array of Git:Remote objects
# File lib/git/base.rb, line 355 def remotes self.lib.remotes.map { |r| Git::Remote.new(self, r) } end
removes file(s) from the git repository
# File lib/git/base.rb, line 230 def remove(path = '.', opts = {}) self.lib.remove(path, opts) end
removes a remote from this repository
@git.remove_remote(‘scott_git’)
# File lib/git/base.rb, line 378 def remove_remote(name) self.lib.remote_remove(name) end
repacks the repository
# File lib/git/base.rb, line 416 def repack self.lib.repack end
returns reference to the git repository directory
@git.dir.path
# File lib/git/base.rb, line 141 def repo @repository end
returns the repository size in bytes
# File lib/git/base.rb, line 146 def repo_size Dir.chdir(repo.path) do return `du -s`.chomp.split.first.to_i end end
resets the working directory to the provided commitish
# File lib/git/base.rb, line 235 def reset(commitish = nil, opts = {}) self.lib.reset(commitish, opts) end
resets the working directory to the commitish with ‘–hard’
# File lib/git/base.rb, line 240 def reset_hard(commitish = nil, opts = {}) opts = {:hard => true}.merge(opts) self.lib.reset(commitish, opts) end
reverts the working directory to the provided commitish. Accepts a range, such as comittish..HEAD
options:
:no_edit
# File lib/git/base.rb, line 280 def revert(commitish = nil, opts = {}) self.lib.revert(commitish, opts) end
runs git rev-parse to convert the objectish to a full sha
@git.revparse("HEAD^^") @git.revparse('v2.4^{tree}') @git.revparse('v2.4:/doc/index.html')
# File lib/git/base.rb, line 521 def revparse(objectish) self.lib.revparse(objectish) end
# File lib/git/base.rb, line 152 def set_index(index_file, check = true) @lib = nil @index = Git::Index.new(index_file.to_s, check) end
# File lib/git/base.rb, line 157 def set_working(work_dir, check = true) @lib = nil @working_directory = Git::WorkingDirectory.new(work_dir.to_s, check) end
Shows objects
@param [String|NilClass] objectish the target object reference (nil == HEAD) @param [String|NilClass] path the path of the file to be shown @return [String] the object information
# File lib/git/base.rb, line 439 def show(objectish=nil, path=nil) self.lib.show(objectish, path) end
# File lib/git/base.rb, line 485 def update_ref(branch, commit) branch(branch).update_ref(commit) end
LOWER LEVEL INDEX OPERATIONS ##
# File lib/git/base.rb, line 445 def with_index(new_index) # :yields: new_index old_index = @index set_index(new_index, false) return_value = yield @index set_index(old_index) return_value end
# File lib/git/base.rb, line 453 def with_temp_index &blk # Workaround for JRUBY, since they handle the TempFile path different. # MUST be improved to be safer and OS independent. if RUBY_PLATFORM == 'java' temp_path = "/tmp/temp-index-#{(0...15).map{ ('a'..'z').to_a[rand(26)] }.join}" else tempfile = Tempfile.new('temp-index') temp_path = tempfile.path tempfile.close tempfile.unlink end with_index(temp_path, &blk) end
# File lib/git/base.rb, line 505 def with_temp_working &blk tempfile = Tempfile.new("temp-workdir") temp_dir = tempfile.path tempfile.close tempfile.unlink Dir.mkdir(temp_dir, 0700) with_working(temp_dir, &blk) end
# File lib/git/base.rb, line 494 def with_working(work_dir) # :yields: the Git::WorkingDirectory return_value = false old_working = @working_directory set_working(work_dir) Dir.chdir work_dir do return_value = yield @working_directory end set_working(old_working) return_value end
# File lib/git/base.rb, line 480 def write_and_commit_tree(opts = {}) tree = write_tree commit_tree(tree, opts) end
# File lib/git/base.rb, line 476 def write_tree self.lib.write_tree end