summaryrefslogtreecommitdiffstats
path: root/vendor/ruby-git
diff options
context:
space:
mode:
authorJohan Sørensen <johan@johansorensen.com>2008-01-13 14:32:01 +0100
committerJohan Sørensen <johan@johansorensen.com>2008-01-13 14:32:01 +0100
commit22e024d553832231dd19371b6b409a50b7b91775 (patch)
treeba47a2ba6691a67a81a4c5a403c380f947f68ec0 /vendor/ruby-git
parent5bb77558c6cc179d85836924142514a1f6443450 (diff)
downloadgitorious-mainline-outdated-22e024d553832231dd19371b6b409a50b7b91775.zip
gitorious-mainline-outdated-22e024d553832231dd19371b6b409a50b7b91775.tar.gz
gitorious-mainline-outdated-22e024d553832231dd19371b6b409a50b7b91775.tar.bz2
support --skip in git-log
Diffstat (limited to 'vendor/ruby-git')
-rw-r--r--vendor/ruby-git/lib/git/base.rb4
-rw-r--r--vendor/ruby-git/lib/git/lib.rb2
-rw-r--r--vendor/ruby-git/lib/git/log.rb6
3 files changed, 8 insertions, 4 deletions
diff --git a/vendor/ruby-git/lib/git/base.rb b/vendor/ruby-git/lib/git/base.rb
index 2986864..f93eaf7 100644
--- a/vendor/ruby-git/lib/git/base.rb
+++ b/vendor/ruby-git/lib/git/base.rb
@@ -171,8 +171,8 @@ module Git
end
# returns a Git::Log object with count commits
- def log(count = 30)
- Git::Log.new(self, count)
+ def log(count = 30, skip = 0)
+ Git::Log.new(self, count, skip)
end
# returns a Git::Status object
diff --git a/vendor/ruby-git/lib/git/lib.rb b/vendor/ruby-git/lib/git/lib.rb
index c6d3580..0e74f5e 100644
--- a/vendor/ruby-git/lib/git/lib.rb
+++ b/vendor/ruby-git/lib/git/lib.rb
@@ -61,6 +61,7 @@ module Git
def log_commits(opts = {})
arr_opts = ['--pretty=oneline']
arr_opts << "-#{opts[:count]}" if opts[:count]
+ arr_opts << "--skip=#{opts[:skip]}" if opts[:skip]
arr_opts << "--since=\"#{opts[:since]}\"" if opts[:since].is_a? String
arr_opts << "#{opts[:between][0].to_s}..#{opts[:between][1].to_s}" if (opts[:between] && opts[:between].size == 2)
arr_opts << opts[:object] if opts[:object].is_a? String
@@ -72,6 +73,7 @@ module Git
def full_log_commits(opts = {})
arr_opts = ['--pretty=raw']
arr_opts << "-#{opts[:count]}" if opts[:count]
+ arr_opts << "--skip=#{opts[:skip]}" if opts[:skip]
arr_opts << "--since=\"#{opts[:since]}\"" if opts[:since].is_a? String
arr_opts << "#{opts[:between][0].to_s}..#{opts[:between][1].to_s}" if (opts[:between] && opts[:between].size == 2)
arr_opts << opts[:object] if opts[:object].is_a? String
diff --git a/vendor/ruby-git/lib/git/log.rb b/vendor/ruby-git/lib/git/log.rb
index 9437ea6..4f81357 100644
--- a/vendor/ruby-git/lib/git/log.rb
+++ b/vendor/ruby-git/lib/git/log.rb
@@ -15,10 +15,11 @@ module Git
@dirty_flag = nil
- def initialize(base, count = 30)
+ def initialize(base, count = 30, skip = 0)
dirty_log
@base = base
@count = count
+ @skip = skip
end
def object(objectish)
@@ -85,7 +86,8 @@ module Git
# actually run the 'git log' command
def run_log
log = @base.lib.full_log_commits(:count => @count, :object => @object,
- :path_limiter => @path, :since => @since, :between => @between)
+ :path_limiter => @path, :since => @since,
+ :between => @between, :skip => @skip)
@commits = log.map { |c| Git::Object::Commit.new(@base, c['sha'], c) }
end