diff --git a/TODO.txt b/TODO.txt index 5185af4e649afdb7ddd8573c9ff88bbb1f00ca3a_VE9ETy50eHQ=..eb05594fc3c8f243337eb714eaf9982ee82b3a16_VE9ETy50eHQ= 100644 --- a/TODO.txt +++ b/TODO.txt @@ -14,8 +14,6 @@ FETCH =========== -* gfetch command -* only try to import non-mapped commits * tag conversion MAPPING ISSUES diff --git a/dulwich/client.py b/dulwich/client.py index 5185af4e649afdb7ddd8573c9ff88bbb1f00ca3a_ZHVsd2ljaC9jbGllbnQucHk=..eb05594fc3c8f243337eb714eaf9982ee82b3a16_ZHVsd2ljaC9jbGllbnQucHk= 100644 --- a/dulwich/client.py +++ b/dulwich/client.py @@ -65,6 +65,5 @@ return ret return None - CAPABILITIES = ["multi_ack", "side-band-64k", "ofs-delta"] @@ -69,6 +68,5 @@ CAPABILITIES = ["multi_ack", "side-band-64k", "ofs-delta"] - class GitClient(object): """Git smart server client. @@ -89,8 +87,8 @@ self.proto = Protocol(read, write, report_activity) self._can_read = can_read self._capabilities = list(CAPABILITIES) - if thin_packs: - self._capabilities.append("thin-pack") + #if thin_packs: + # self._capabilities.append("thin-pack") def capabilities(self): return " ".join(self._capabilities) diff --git a/dulwich/object_store.py b/dulwich/object_store.py index 5185af4e649afdb7ddd8573c9ff88bbb1f00ca3a_ZHVsd2ljaC9vYmplY3Rfc3RvcmUucHk=..eb05594fc3c8f243337eb714eaf9982ee82b3a16_ZHVsd2ljaC9vYmplY3Rfc3RvcmUucHk= 100644 --- a/dulwich/object_store.py +++ b/dulwich/object_store.py @@ -176,7 +176,7 @@ :param path: Path to the pack file. """ p = PackData(path) - entries = p.sorted_entries() + entries = p.sorted_entries(self.get_raw) basename = os.path.join(self.pack_dir, "pack-%s" % iter_sha1(entry[0] for entry in entries)) write_pack_index_v2(basename+".idx", entries, p.get_stored_checksum()) diff --git a/dulwich/pack.py b/dulwich/pack.py index 5185af4e649afdb7ddd8573c9ff88bbb1f00ca3a_ZHVsd2ljaC9wYWNrLnB5..eb05594fc3c8f243337eb714eaf9982ee82b3a16_ZHVsd2ljaC9wYWNrLnB5 100644 --- a/dulwich/pack.py +++ b/dulwich/pack.py @@ -508,7 +508,6 @@ postponed = defaultdict(list) class Postpone(Exception): """Raised to postpone delta resolving.""" - def get_ref_text(sha): assert len(sha) == 20 if sha in found: