'hub' adc request-status subcommand can ask for details by request-number

This commit is contained in:
Sitaram Chamarty 2011-03-11 13:40:14 +05:30
parent 719edd007c
commit e73f1cea93
3 changed files with 66 additions and 12 deletions

View file

@ -22,7 +22,7 @@ See docs for concepts; this usage message is only a refresher!
Requestor's commands (repo child): Requestor's commands (repo child):
request-pull child b1 [parent] request-pull child b1 [parent]
request-status child [parent] request-status child [parent] [request-number]
Parent repo owner's commands (repo parent): Parent repo owner's commands (repo parent):
list-requests parent list-requests parent
view-request parent request-number view-request parent request-number
@ -113,19 +113,43 @@ sub rp {
} }
sub rs { sub rs {
# request-status child [parent] # request-status child [parent] [request-number]
usage() unless @_ == 1 or @_ == 2; usage() unless @_ > 0 and @_ < 4; # 1 or 2 or 3
# same checks as in 'rp' above # same checks as in 'rp' above
my ($repo_from, $creator) = readable_repo(shift); my ($repo_from, $creator) = readable_repo(shift);
my $repo = shift || parent_repo($repo_from);
my $repo;
if ($_[0] and $_[0] !~ /^\d+$/) {
# next arg is not a number, so it should be 'parent'
$repo = shift;
} else {
$repo = parent_repo($repo_from);
}
$repo = valid_repo($repo); $repo = valid_repo($repo);
my $rqno = 0;
$rqno = shift if ($_[0] and $_[0] =~ /^\d+$/);
# there should not be any arguments left over
usage() if @_;
unless ($rqno) {
cd2repo($repo); cd2repo($repo);
my %hub_full = get_hub(); my %hub_full = get_hub();
return unless $hub_full{$repo_from}; return unless $hub_full{$repo_from};
my %hub; $hub{$repo_from} = $hub_full{$repo_from}; my %hub; $hub{$repo_from} = $hub_full{$repo_from};
list_hub('', %hub); list_hub('', %hub);
return;
}
my ($child, $ref, %hub) = get_request_N($repo, $rqno);
# this also does a chdir to $repo, by the way
my %hub1; $hub1{$child}{$ref} = $hub{$child}{$ref};
list_hub('', %hub1);
print "\nMessage:\n$hub1{$child}{$ref}{COVER}\n";
} }
# -------------------- alice's commands # -------------------- alice's commands
@ -227,6 +251,7 @@ sub reject {
# reject parent request-number # reject parent request-number
usage() unless @_ == 2; usage() unless @_ == 2;
my ($repo, $n) = @_; my ($repo, $n) = @_;
writable_repo($repo); # yeah we're throwing away the return values
my ($child, $ref, %hub) = get_request_N($repo, $n); my ($child, $ref, %hub) = get_request_N($repo, $n);
map { die "request status is already '$_'\n" if $_ ne 'pending' } $hub{$child}{$ref}{STATUS}; map { die "request status is already '$_'\n" if $_ ne 'pending' } $hub{$child}{$ref}{STATUS};
@ -242,6 +267,7 @@ sub fetch {
# fetch parent request-number # fetch parent request-number
usage() unless @_ == 2; usage() unless @_ == 2;
my ($repo, $n) = @_; my ($repo, $n) = @_;
writable_repo($repo); # yeah we're throwing away the return values
my ($child, $ref, %hub) = get_request_N($repo, $n); my ($child, $ref, %hub) = get_request_N($repo, $n);
map { die "request status is already '$_'\n" if $_ ne 'pending' } $hub{$child}{$ref}{STATUS}; map { die "request status is already '$_'\n" if $_ ne 'pending' } $hub{$child}{$ref}{STATUS};
@ -263,6 +289,7 @@ sub accept {
# accept parent request-number # accept parent request-number
usage() unless @_ == 2; usage() unless @_ == 2;
my ($repo, $n) = @_; my ($repo, $n) = @_;
writable_repo($repo); # yeah we're throwing away the return values
my ($child, $ref, %hub) = get_request_N($repo, $n); my ($child, $ref, %hub) = get_request_N($repo, $n);
map { die "request status is '$_'; must be 'fetched'\n" if $_ !~ /^fetched by / } $hub{$child}{$ref}{STATUS}; map { die "request status is '$_'; must be 'fetched'\n" if $_ !~ /^fetched by / } $hub{$child}{$ref}{STATUS};
@ -310,8 +337,8 @@ sub get_hub {
sub get_request_N { sub get_request_N {
# given a repo and an N, return "child", "ref", and %hub (or die trying!) # given a repo and an N, return "child", "ref", and %hub (or die trying!)
# you can't look at pull requests for repos you don't have write access to # you can't look at pull requests for repos you don't have at least read access to
my ($repo, $creator) = writable_repo(shift); my ($repo, $creator) = readable_repo(shift);
cd2repo($repo); cd2repo($repo);
my %hub = get_hub(); my %hub = get_hub();
die "you have no pending requests\n" unless %hub; die "you have no pending requests\n" unless %hub;
@ -388,7 +415,7 @@ sub valid_ref {
sub valid_repo { sub valid_repo {
my $repo = shift; my $repo = shift;
$repo =~ s/\.git$//; $repo =~ s/\.git$//;
die "no read permissions on $repo\n" unless -d "$ENV{GL_REPO_BASE_ABS}/$repo.git"; die "$repo does not exist or you have no read access\n" unless -d "$ENV{GL_REPO_BASE_ABS}/$repo.git";
return $repo; return $repo;
} }

View file

@ -86,6 +86,12 @@ The following commands do not cause a fetch, and should be quite fast:
The second argument is optional the same way as the 3rd argument in the The second argument is optional the same way as the 3rd argument in the
previous command. previous command.
Requests that have been accepted or rejected will usually have some
additional text, supplied by the user who did the reject/accept. Bob can
ask for those details by request number:
ssh git@server hub request-status child [parent] request-number
<a name="_Alice_s_just_looking_commands"></a> <a name="_Alice_s_just_looking_commands"></a>
#### Alice's "just looking" commands #### Alice's "just looking" commands

View file

@ -169,5 +169,26 @@ do
expect "2 child/u2/myr1 (u2) b2 rejected by u1" expect "2 child/u2/myr1 (u2) b2 rejected by u1"
expect "3 child/u2/myr1 (u2) b3 accepted by u1" expect "3 child/u2/myr1 (u2) b3 accepted by u1"
name "bob checks the request-status on each request"
runlocal ssh u2 hub request-status child/u2/myr1 1
expect "1 child/u2/myr1 (u2) b1 pending"
expect "^Message:"
expect "^hello"
expect "^there"
runlocal ssh u2 hub request-status child/u2/myr1 2
expect "1 child/u2/myr1 (u2) b2 rejected by u1"
expect "^Message:"
expect "^hi"
expect "^there"
expect "Rejected. Message to requestor:"
expect "captain was sober today"
runlocal ssh u2 hub request-status child/u2/myr1 3
expect "1 child/u2/myr1 (u2) b3 accepted by u1"
expect "^Message:"
expect "^hello"
expect "^again"
expect "Accepted. Message to requestor:"
expect "the rain in spain"
name "INTERNAL" name "INTERNAL"
done done