feat(oid): expand short sha by looking up in ODB

This commit is contained in:
Aleksey Kulikov 2021-08-25 19:25:05 +03:00
parent 747996b40c
commit 3bbcca3c75
6 changed files with 50 additions and 22 deletions

View file

@ -105,9 +105,8 @@ class Index {
oid = Oid.fromSHA(target);
tree = Tree.lookup(bindings.owner(_indexPointer), oid.pointer);
} else {
final shortOid = Oid.fromSHAn(target);
final odb = Odb(repo_bindings.odb(bindings.owner(_indexPointer)));
oid = Oid(odb.existsPrefix(shortOid.pointer, target.length));
oid = Oid.fromShortSHA(target, odb);
odb.free();
tree = Tree.lookup(bindings.owner(_indexPointer), oid.pointer);
}

View file

@ -1,6 +1,7 @@
import 'dart:ffi';
import 'bindings/libgit2_bindings.dart';
import 'bindings/oid.dart' as bindings;
import 'odb.dart';
import 'util.dart';
class Oid {
@ -20,13 +21,14 @@ class Oid {
_oidPointer = bindings.fromSHA(sha);
}
/// Initializes a new instance of [Oid] class from provided
/// hexadecimal [sha] string that is lesser than 40 characters long.
/// Initializes a new instance of [Oid] class by determining if an object can be found
/// in the object database of repository with provided hexadecimal [sha] string that is
/// lesser than 40 characters long and [Odb] object.
///
/// Throws a [LibGit2Error] if error occured.
Oid.fromSHAn(String sha) {
Oid.fromShortSHA(String sha, Odb odb) {
libgit2.git_libgit2_init();
_oidPointer = bindings.fromStrN(sha);
_oidPointer = odb.existsPrefix(bindings.fromStrN(sha), sha.length);
}
late final Pointer<git_oid> _oidPointer;

View file

@ -142,9 +142,8 @@ class Reference {
if (target.length == 40) {
oid = Oid.fromSHA(target);
} else {
final shortOid = Oid.fromSHAn(target);
final odb = Odb(repo_bindings.odb(owner));
oid = Oid(odb.existsPrefix(shortOid.pointer, target.length));
oid = Oid.fromShortSHA(target, odb);
odb.free();
}
} else {

View file

@ -122,9 +122,8 @@ class Repository {
if (target.length == 40) {
oid = Oid.fromSHA(target);
} else {
final shortOid = Oid.fromSHAn(target);
final odb = this.odb;
oid = Oid(odb.existsPrefix(shortOid.pointer, target.length));
oid = Oid.fromShortSHA(target, odb);
odb.free();
}
bindings.setHeadDetached(_repoPointer, oid.pointer);
@ -328,9 +327,8 @@ class Repository {
if (sha.length == 40) {
oid = Oid.fromSHA(sha);
} else {
final shortOid = Oid.fromSHAn(sha);
final odb = this.odb;
oid = Oid(odb.existsPrefix(shortOid.pointer, sha.length));
oid = Oid.fromShortSHA(sha, odb);
odb.free();
}
return oid;