* [PATCH 4/5] solvergit: allow shorter-than-necessary OIDs from user
2019-01-31 4:27 5% [PATCH 0/5] a few more solver fixups and improvements Eric Wong
@ 2019-01-31 4:27 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-01-31 4:27 UTC (permalink / raw)
To: meta
We can rely on git to disambiguate, here; because sometimes
shorter OIDs can be unambiguous even if we only resolved the
longer one.
---
lib/PublicInbox/SolverGit.pm | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 97da795..a13ae9e 100644
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -302,6 +302,26 @@ sub extract_old_mode ($) {
'100644';
}
+sub do_finish ($$) {
+ my ($self, $user_cb) = @_;
+ my $found = $self->{found};
+ my $oid_want = $self->{oid_want};
+ if (my $exists = $found->{$oid_want}) {
+ return $user_cb->($exists);
+ }
+
+ # let git disambiguate if oid_want was too short,
+ # but long enough to be unambiguous:
+ my $tmp_git = $self->{tmp_git};
+ if (my @res = $tmp_git->check($oid_want)) {
+ return $user_cb->($found->{$res[0]});
+ }
+ if (my $err = $tmp_git->last_check_err) {
+ dbg($self, $err);
+ }
+ $user_cb->(undef);
+}
+
sub do_step ($) {
my ($self) = @_;
eval {
@@ -323,8 +343,8 @@ sub do_step ($) {
# our result: (which may be undef)
# Other steps may call user_cb to terminate prematurely
# on error
- } elsif (my $ucb = delete($self->{user_cb})) {
- $ucb->($self->{found}->{$self->{oid_want}});
+ } elsif (my $user_cb = delete($self->{user_cb})) {
+ do_finish($self, $user_cb);
} else {
die 'about to call user_cb twice'; # Oops :x
}
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 0/5] a few more solver fixups and improvements
@ 2019-01-31 4:27 5% Eric Wong
2019-01-31 4:27 7% ` [PATCH 4/5] solvergit: allow shorter-than-necessary OIDs from user Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-01-31 4:27 UTC (permalink / raw)
To: meta
All going into master and seems to run OK on the main
public-inbox.org server without problems.
Eric Wong (5):
t/config.t: test PublicInbox::Git sharing between inboxes
inbox: perform cleanup of Git objects for coderepos
solvergit: allow searching on longer-than-needed OIDs
solvergit: allow shorter-than-necessary OIDs from user
viewvcs: support streaming large blobs
lib/PublicInbox/Git.pm | 18 ++++++++++++----
lib/PublicInbox/Inbox.pm | 17 +++++++++++++--
lib/PublicInbox/SolverGit.pm | 41 +++++++++++++++++++++++++++++++++---
lib/PublicInbox/ViewVCS.pm | 37 ++++++++++++++++++++++++++++----
t/config.t | 19 +++++++++++++++++
t/git.t | 4 ++++
t/solver_git.t | 9 ++++++++
7 files changed, 132 insertions(+), 13 deletions(-)
--
EW
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-01-31 4:27 5% [PATCH 0/5] a few more solver fixups and improvements Eric Wong
2019-01-31 4:27 7% ` [PATCH 4/5] solvergit: allow shorter-than-necessary OIDs from user Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).