rugged 0.17.0.b7 → 0.18.0.b1

data/test/index_test.rb~

@@ -1,218 +0,0 @@
-require "test_helper"
-require 'base64'
-require 'tempfile'
-require 'fileutils'
-
-def new_index_entry
-    now = Time.now
-    {
-      :path => "new_path",
-      :oid => "d385f264afb75a56a5bec74243be9b367ba4ca08",
-      :mtime => now,
-      :ctime => now,
-      :file_size => 1000,
-      :dev => 234881027,
-      :ino => 88888,
-      :mode => 33199,
-      :uid => 502,
-      :gid => 502,
-      :stage => 3,
-    }
-end
-
-context "Rugged::Index reading stuff" do
-  setup do
-    path = File.dirname(__FILE__) + '/fixtures/testrepo.git/index'
-    @index = Rugged::Index.new(path)
-  end
-
-  test "can iterate through the index" do
-    enum = @index.each
-    assert enum.kind_of? Enumerable
-
-    i = 0
-    @index.each { |e| i += 1 }
-    assert_equal @index.count, i
-  end
-
-  test "can count index entries" do
-    assert_equal 2, @index.count
-  end
-
-  test "can clear the in-memory index" do
-    @index.clear
-    assert_equal 0, @index.count
-  end
-
-  test "can remove entries from the index" do
-    @index.remove 0
-    assert_equal 1, @index.count
-  end
-
-  test "can get all data from an entry" do
-    e = @index.get_entry(0)
-    assert_equal 'README', e[:path]
-    assert_equal '1385f264afb75a56a5bec74243be9b367ba4ca08', e[:oid]
-    assert_equal 1273360380, e[:mtime].to_i
-    assert_equal 1273360380, e[:ctime].to_i
-    assert_equal 4, e[:file_size]
-    assert_equal 234881026, e[:dev]
-    assert_equal 6674088, e[:ino]
-    assert_equal 33188, e[:mode]
-    assert_equal 501, e[:uid]
-    assert_equal 0, e[:gid]
-    assert_equal false, e[:valid]
-    assert_equal 0, e[:stage]
-
-    e = @index.get_entry(1)
-    assert_equal 'new.txt', e[:path]
-    assert_equal 'fa49b077972391ad58037050f2a75f74e3671e92', e[:oid]
-  end
-
-  test "can iterate over the entries" do
-    itr_test = @index.sort { |a, b| a[:oid] <=> b[:oid] }.map { |e| e[:path] }.join(':')
-    assert_equal "README:new.txt", itr_test
-  end
-
-  test "can update entries" do
-    now = Time.at Time.now.to_i
-    e = @index.get_entry(0)
-
-    e[:oid] = "12ea3153a78002a988bb92f4123e7e831fd1138a"
-    e[:mtime] = now
-    e[:ctime] = now
-    e[:file_size] = 1000
-    e[:dev] = 234881027
-    e[:ino] = 88888
-    e[:mode] = 33199
-    e[:uid] = 502
-    e[:gid] = 502
-    e[:stage] = 3
-
-    @index.add(e)
-    new_e = @index[e[:path]]
-
-    # git only sets executable bit based on owner
-    e[:mode] = 33188
-    assert_equal e, new_e
-  end
-
-  test "can add new entries" do
-    e = new_index_entry
-    @index << e
-    assert_equal 3, @index.count
-    itr_test = @index.sort { |a, b| a[:oid] <=> b[:oid] }.map { |x| x[:path] }.join(':')
-    assert_equal "README:new_path:new.txt", itr_test
-  end
-end
-
-context "Rugged::Index writing stuff" do
-  setup do
-    path = File.dirname(__FILE__) + '/fixtures/testrepo.git/index'
-    @tmppath = Tempfile.new('index').path
-    FileUtils.copy(path, @tmppath)
-    @index = Rugged::Index.new(@tmppath)
-  end
-
-  test "add raises if it gets something weird" do
-    assert_raise TypeError do
-      @index.add(21)
-    end
-  end
-
-  test "can write a new index" do
-    e = new_index_entry
-    @index << e
-
-    e[:path] = "else.txt"
-    @index << e
-
-    @index.write
-
-    index2 = Rugged::Index.new(@tmppath)
-
-    itr_test = index2.sort { |a, b| a[:oid] <=> b[:oid] }.map { |x| x[:path] }.join(':')
-    assert_equal "README:else.txt:new_path:new.txt", itr_test
-    assert_equal 4, index2.count
-  end
-end
-
-context "Rugged::Index with working directory" do
-  setup do
-    @tmppath = Dir.mktmpdir
-    @repo = Rugged::Repository.init_at(@tmppath, false)
-    @index = @repo.index
-  end
-
-  teardown do
-    FileUtils.remove_entry_secure(@tmppath)
-  end
-
-  test "can add from a path" do
-    File.open(File.join(@tmppath, 'test.txt'), 'w') do |f|
-      f.puts "test content"
-    end
-    @index.add('test.txt')
-    @index.write
-
-    index2 = Rugged::Index.new(@tmppath + '/.git/index')
-    assert_equal index2.get_entry(0)[:path], 'test.txt'
-  end
-
-  test "can reload the index" do
-    File.open(File.join(@tmppath, 'test.txt'), 'w') do |f|
-      f.puts "test content"
-    end
-    @index.add('test.txt', 2)
-    @index.write
-
-    sleep(1) # we need this sleep to sync at the FS level
-    # most FSs have 1s granularity on mtimes
-
-    rindex = Rugged::Index.new(File.join(@tmppath, '/.git/index'))
-    e = rindex['test.txt']
-    assert_equal 2, e[:stage]
-
-    rindex << new_index_entry
-    rindex.write
-
-    assert_equal 1, @index.count
-    @index.reload
-    assert_equal 2, @index.count
-
-    e = @index['new_path']
-    assert_equal e[:mode], 33199
-  end
-end
-
-
-context "Rugged::Index with Rugged::Repository" do
-  setup do
-    @path = temp_repo("testrepo.git")
-    @repo = Rugged::Repository.new(@path)
-    @index = @repo.index
-  end
-
-  test "idempotent read_tree/write_tree" do
-    head_sha = Rugged::Reference.lookup(@repo,'HEAD').resolve.target
-    tree = @repo.lookup(head_sha).tree
-    @index.read_tree(tree)
-
-    index_tree_sha = @index.write_tree
-    index_tree = @repo.lookup(index_tree_sha)
-    assert_equal tree.oid, index_tree.oid
-  end
-
-
-  test "build tree from index on non-HEAD branch" do
-    head_sha = Rugged::Reference.lookup(@repo,'refs/remotes/origin/packed').resolve.target
-    tree = @repo.lookup(head_sha).tree
-    @index.read_tree(tree)
-    @index.remove('second.txt')
-
-    new_tree_sha = @index.write_tree
-    assert head_sha != new_tree_sha
-    pp @repo.lookup(new_tree_sha)
-    assert_nil @repo.lookup(new_tree_sha)['second.txt']
-  end
-end

data/vendor/libgit2/src/pkt.h

@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2009-2012 the libgit2 contributors
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#ifndef INCLUDE_pkt_h__
-#define INCLUDE_pkt_h__
-
-#include "common.h"
-#include "transport.h"
-#include "buffer.h"
-#include "posix.h"
-#include "git2/net.h"
-
-enum git_pkt_type {
-	GIT_PKT_CMD,
-	GIT_PKT_FLUSH,
-	GIT_PKT_REF,
-	GIT_PKT_HAVE,
-	GIT_PKT_ACK,
-	GIT_PKT_NAK,
-	GIT_PKT_PACK,
-	GIT_PKT_COMMENT,
-	GIT_PKT_ERR,
-	GIT_PKT_DATA,
-	GIT_PKT_PROGRESS,
-};
-
-/* Used for multi-ack */
-enum git_ack_status {
-	GIT_ACK_NONE,
-	GIT_ACK_CONTINUE,
-	GIT_ACK_COMMON,
-	GIT_ACK_READY
-};
-
-/* This would be a flush pkt */
-typedef struct {
-	enum git_pkt_type type;
-} git_pkt;
-
-struct git_pkt_cmd {
-	enum git_pkt_type type;
-	char *cmd;
-	char *path;
-	char *host;
-};
-
-/* This is a pkt-line with some info in it */
-typedef struct {
-	enum git_pkt_type type;
-	git_remote_head head;
-	char *capabilities;
-} git_pkt_ref;
-
-/* Useful later */
-typedef struct {
-	enum git_pkt_type type;
-	git_oid oid;
-	enum git_ack_status status;
-} git_pkt_ack;
-
-typedef struct {
-	enum git_pkt_type type;
-	char comment[GIT_FLEX_ARRAY];
-} git_pkt_comment;
-
-typedef struct {
-	enum git_pkt_type type;
-	int len;
-	char data[GIT_FLEX_ARRAY];
-} git_pkt_data;
-
-typedef git_pkt_data git_pkt_progress;
-
-typedef struct {
-	enum git_pkt_type type;
-	char error[GIT_FLEX_ARRAY];
-} git_pkt_err;
-
-int git_pkt_parse_line(git_pkt **head, const char *line, const char **out, size_t len);
-int git_pkt_buffer_flush(git_buf *buf);
-int git_pkt_send_flush(GIT_SOCKET s);
-int git_pkt_buffer_done(git_buf *buf);
-int git_pkt_buffer_wants(const git_vector *refs, git_transport_caps *caps, git_buf *buf);
-int git_pkt_buffer_have(git_oid *oid, git_buf *buf);
-void git_pkt_free(git_pkt *pkt);
-
-#endif

data/vendor/libgit2/src/ppc/sha1.c

@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2009-2012 the libgit2 contributors
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-#include <stdio.h>
-#include <string.h>
-#include "sha1.h"
-
-extern void ppc_sha1_core(uint32_t *hash, const unsigned char *p,
-			 unsigned int nblocks);
-
-int ppc_SHA1_Init(ppc_SHA_CTX *c)
-{
-	c->hash[0] = 0x67452301;
-	c->hash[1] = 0xEFCDAB89;
-	c->hash[2] = 0x98BADCFE;
-	c->hash[3] = 0x10325476;
-	c->hash[4] = 0xC3D2E1F0;
-	c->len = 0;
-	c->cnt = 0;
-	return 0;
-}
-
-int ppc_SHA1_Update(ppc_SHA_CTX *c, const void *ptr, unsigned long n)
-{
-	unsigned long nb;
-	const unsigned char *p = ptr;
-
-	c->len += (uint64_t) n << 3;
-	while (n != 0) {
-		if (c->cnt || n < 64) {
-			nb = 64 - c->cnt;
-			if (nb > n)
-				nb = n;
-			memcpy(&c->buf.b[c->cnt], p, nb);
-			if ((c->cnt += nb) == 64) {
-				ppc_sha1_core(c->hash, c->buf.b, 1);
-				c->cnt = 0;
-			}
-		} else {
-			nb = n >> 6;
-			ppc_sha1_core(c->hash, p, nb);
-			nb <<= 6;
-		}
-		n -= nb;
-		p += nb;
-	}
-	return 0;
-}
-
-int ppc_SHA1_Final(unsigned char *hash, ppc_SHA_CTX *c)
-{
-	unsigned int cnt = c->cnt;
-
-	c->buf.b[cnt++] = 0x80;
-	if (cnt > 56) {
-		if (cnt < 64)
-			memset(&c->buf.b[cnt], 0, 64 - cnt);
-		ppc_sha1_core(c->hash, c->buf.b, 1);
-		cnt = 0;
-	}
-	if (cnt < 56)
-		memset(&c->buf.b[cnt], 0, 56 - cnt);
-	c->buf.l[7] = c->len;
-	ppc_sha1_core(c->hash, c->buf.b, 1);
-	memcpy(hash, c->hash, 20);
-	return 0;
-}

data/vendor/libgit2/src/ppc/sha1.h

@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2009-2012 the libgit2 contributors
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-#include <stdint.h>
-
-typedef struct {
-	uint32_t hash[5];
-	uint32_t cnt;
-	uint64_t len;
-	union {
-		unsigned char b[64];
-		uint64_t l[8];
-	} buf;
-} ppc_SHA_CTX;
-
-int ppc_SHA1_Init(ppc_SHA_CTX *c);
-int ppc_SHA1_Update(ppc_SHA_CTX *c, const void *p, unsigned long n);
-int ppc_SHA1_Final(unsigned char *hash, ppc_SHA_CTX *c);
-
-#define SHA_CTX		ppc_SHA_CTX
-#define SHA1_Init	ppc_SHA1_Init
-#define SHA1_Update	ppc_SHA1_Update
-#define SHA1_Final	ppc_SHA1_Final

data/vendor/libgit2/src/protocol.c

@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2009-2012 the libgit2 contributors
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-#include "common.h"
-#include "protocol.h"
-#include "pkt.h"
-#include "buffer.h"
-
-int git_protocol_store_refs(git_transport *t, int flushes)
-{
-	gitno_buffer *buf = &t->buffer;
-	git_vector *refs = &t->refs;
-	int error, flush = 0, recvd;
-	const char *line_end;
-	git_pkt *pkt;
-
-	do {
-		if (buf->offset > 0)
-			error = git_pkt_parse_line(&pkt, buf->data, &line_end, buf->offset);
-		else
-			error = GIT_EBUFS;
-
-		if (error < 0 && error != GIT_EBUFS)
-			return -1;
-
-		if (error == GIT_EBUFS) {
-			if ((recvd = gitno_recv(buf)) < 0)
-				return -1;
-
-			if (recvd == 0 && !flush) {
-				giterr_set(GITERR_NET, "Early EOF");
-				return -1;
-			}
-
-			continue;
-		}
-
-		gitno_consume(buf, line_end);
-		if (pkt->type == GIT_PKT_ERR) {
-			giterr_set(GITERR_NET, "Remote error: %s", ((git_pkt_err *)pkt)->error);
-			git__free(pkt);
-			return -1;
-		}
-
-		if (pkt->type != GIT_PKT_FLUSH && git_vector_insert(refs, pkt) < 0)
-			return -1;
-
-		if (pkt->type == GIT_PKT_FLUSH) {
-			flush++;
-			git_pkt_free(pkt);
-		}
-	} while (flush < flushes);
-
-	return flush;
-}
-
-int git_protocol_detect_caps(git_pkt_ref *pkt, git_transport_caps *caps)
-{
-	const char *ptr;
-
-	/* No refs or capabilites, odd but not a problem */
-	if (pkt == NULL || pkt->capabilities == NULL)
-		return 0;
-
-	ptr = pkt->capabilities;
-	while (ptr != NULL && *ptr != '\0') {
-		if (*ptr == ' ')
-			ptr++;
-
-		if(!git__prefixcmp(ptr, GIT_CAP_OFS_DELTA)) {
-			caps->common = caps->ofs_delta = 1;
-			ptr += strlen(GIT_CAP_OFS_DELTA);
-			continue;
-		}
-
-		if(!git__prefixcmp(ptr, GIT_CAP_MULTI_ACK)) {
-			caps->common = caps->multi_ack = 1;
-			ptr += strlen(GIT_CAP_MULTI_ACK);
-			continue;
-		}
-
-		if(!git__prefixcmp(ptr, GIT_CAP_INCLUDE_TAG)) {
-			caps->common = caps->include_tag = 1;
-			ptr += strlen(GIT_CAP_INCLUDE_TAG);
-			continue;
-		}
-
-		/* Keep side-band check after side-band-64k */
-		if(!git__prefixcmp(ptr, GIT_CAP_SIDE_BAND_64K)) {
-			caps->common = caps->side_band_64k = 1;
-			ptr += strlen(GIT_CAP_SIDE_BAND_64K);
-			continue;
-		}
-
-		if(!git__prefixcmp(ptr, GIT_CAP_SIDE_BAND)) {
-			caps->common = caps->side_band = 1;
-			ptr += strlen(GIT_CAP_SIDE_BAND);
-			continue;
-		}
-
-
-		/* We don't know this capability, so skip it */
-		ptr = strchr(ptr, ' ');
-	}
-
-	return 0;
-}