From 9fc7b9a068189cc0d249d0870dfb0112ab5dec92 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 5 May 2011 15:25:11 +0200 Subject: Made most primal imports work, but stopped here as there are many more changes when doing the merge --- git/index/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git/index/base.py') diff --git a/git/index/base.py b/git/index/base.py index 88410e20..7f3db35d 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -63,7 +63,7 @@ from fun import ( ) from gitdb.base import IStream -from gitdb.db import MemoryDB +from gitdb.db.py import PureMemoryDB from gitdb.util import to_bin_sha from itertools import izip @@ -512,7 +512,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): :raise UnmergedEntriesError: """ # we obtain no lock as we just flush our contents to disk as tree # If we are a new index, the entries access will load our data accordingly - mdb = MemoryDB() + mdb = PureMemoryDB() entries = self._entries_sorted() binsha, tree_items = write_tree_from_cache(entries, mdb, slice(0, len(entries))) -- cgit v1.2.3 From acf5e6ea64a2f24117f1d419c208ed1c38c43690 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 6 May 2011 15:03:14 +0200 Subject: replaced all gitdb strings with git --- git/index/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'git/index/base.py') diff --git a/git/index/base.py b/git/index/base.py index 7f3db35d..06917b0e 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -62,9 +62,9 @@ from fun import ( S_IFGITLINK ) -from gitdb.base import IStream -from gitdb.db.py import PureMemoryDB -from gitdb.util import to_bin_sha +from git.base import IStream +from git.db.py import PureMemoryDB +from git.util import to_bin_sha from itertools import izip __all__ = ( 'IndexFile', 'CheckoutError' ) -- cgit v1.2.3 From 7ae36c3e019a5cc16924d1b6007774bfb625036f Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 6 May 2011 18:53:59 +0200 Subject: Started to fix imports - tests still have no chance to work as database changed drastically. Now the actual work begins --- git/index/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/index/base.py') diff --git a/git/index/base.py b/git/index/base.py index 06917b0e..75bfc6fe 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -63,7 +63,7 @@ from fun import ( ) from git.base import IStream -from git.db.py import PureMemoryDB +from git.db.py.mem import PureMemoryDB from git.util import to_bin_sha from itertools import izip -- cgit v1.2.3 From 024adf37acddd6a5d8293b6b5d15795c59a142c0 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 30 May 2011 13:06:37 +0200 Subject: Fixed tests far enough to allow basic repository tests to be applied to any of the new database types. This reduces code duplication to the mere minimum, but allows custom tests to be added on top easily and flexibly --- git/index/base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'git/index/base.py') diff --git a/git/index/base.py b/git/index/base.py index 75bfc6fe..e7002b29 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -63,7 +63,6 @@ from fun import ( ) from git.base import IStream -from git.db.py.mem import PureMemoryDB from git.util import to_bin_sha from itertools import izip @@ -512,7 +511,9 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): :raise UnmergedEntriesError: """ # we obtain no lock as we just flush our contents to disk as tree # If we are a new index, the entries access will load our data accordingly - mdb = PureMemoryDB() + # Needs delayed import as db.py import IndexFile as well + import git.db.py.mem + mdb = git.db.py.mem.PureMemoryDB() entries = self._entries_sorted() binsha, tree_items = write_tree_from_cache(entries, mdb, slice(0, len(entries))) -- cgit v1.2.3 From 93668b0f672bc85f59b943b7a105dd042defd55d Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Tue, 7 Jun 2011 14:25:05 +0200 Subject: Fixed index checkout return code parsing to work with latest git version --- git/index/base.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'git/index/base.py') diff --git a/git/index/base.py b/git/index/base.py index e7002b29..12097922 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -960,12 +960,16 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): if not line.startswith("git checkout-index: ") and not line.startswith("git-checkout-index: "): is_a_dir = " is a directory" unlink_issue = "unable to unlink old '" + already_exists_issue = ' already exists, no checkout' # created by entry.c:checkout_entry(...) if line.endswith(is_a_dir): failed_files.append(line[:-len(is_a_dir)]) failed_reasons.append(is_a_dir) elif line.startswith(unlink_issue): failed_files.append(line[len(unlink_issue):line.rfind("'")]) failed_reasons.append(unlink_issue) + elif line.endswith(already_exists_issue): + failed_files.append(line[:-len(already_exists_issue)]) + failed_reasons.append(already_exists_issue) else: unknown_lines.append(line) continue -- cgit v1.2.3