From e73f1cea939f7cf9116db1137b742bfcb1a4a09f Mon Sep 17 00:00:00 2001
From: Sitaram Chamarty <sitaram@atc.tcs.com>
Date: Fri, 11 Mar 2011 13:40:14 +0530
Subject: [PATCH] 'hub' adc request-status subcommand can ask for details by
 request-number

---
 contrib/adc/hub     | 51 ++++++++++++++++++++++++++++++++++-----------
 contrib/adc/hub.mkd |  6 ++++++
 t/t67-hub           | 21 +++++++++++++++++++
 3 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/contrib/adc/hub b/contrib/adc/hub
index 43dea94..55831a8 100755
--- a/contrib/adc/hub
+++ b/contrib/adc/hub
@@ -22,7 +22,7 @@ See docs for concepts; this usage message is only a refresher!
 
 Requestor's commands (repo child):
         request-pull child b1 [parent]
-        request-status child [parent]
+        request-status child [parent] [request-number]
 Parent repo owner's commands (repo parent):
         list-requests parent
         view-request parent request-number
@@ -113,19 +113,43 @@ sub rp {
 }
 
 sub rs {
-    # request-status child [parent]
-    usage() unless @_ == 1 or @_ == 2;
+    # request-status child [parent] [request-number]
+    usage() unless @_ > 0 and @_ < 4;   # 1 or 2 or 3
     # same checks as in 'rp' above
     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);
 
-    cd2repo($repo);
-    my %hub_full = get_hub();
-    return unless $hub_full{$repo_from};
-    my %hub; $hub{$repo_from} = $hub_full{$repo_from};
+    my $rqno = 0;
+    $rqno = shift if ($_[0] and $_[0] =~ /^\d+$/);
 
-    list_hub('', %hub);
+    # there should not be any arguments left over
+    usage() if @_;
+
+    unless ($rqno) {
+        cd2repo($repo);
+        my %hub_full = get_hub();
+        return unless $hub_full{$repo_from};
+        my %hub; $hub{$repo_from} = $hub_full{$repo_from};
+
+        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
@@ -227,6 +251,7 @@ sub reject {
     # reject parent request-number
     usage() unless @_ == 2;
     my ($repo, $n) = @_;
+    writable_repo($repo);   # yeah we're throwing away the return values
     my ($child, $ref, %hub) = get_request_N($repo, $n);
 
     map { die "request status is already '$_'\n" if $_ ne 'pending' } $hub{$child}{$ref}{STATUS};
@@ -242,6 +267,7 @@ sub fetch {
     # fetch parent request-number
     usage() unless @_ == 2;
     my ($repo, $n) = @_;
+    writable_repo($repo);   # yeah we're throwing away the return values
     my ($child, $ref, %hub) = get_request_N($repo, $n);
 
     map { die "request status is already '$_'\n" if $_ ne 'pending' } $hub{$child}{$ref}{STATUS};
@@ -263,6 +289,7 @@ sub accept {
     # accept parent request-number
     usage() unless @_ == 2;
     my ($repo, $n) = @_;
+    writable_repo($repo);   # yeah we're throwing away the return values
     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};
@@ -310,8 +337,8 @@ sub get_hub {
 sub get_request_N {
     # 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
-    my ($repo, $creator) = writable_repo(shift);
+    # you can't look at pull requests for repos you don't have at least read access to
+    my ($repo, $creator) = readable_repo(shift);
     cd2repo($repo);
     my %hub = get_hub();
     die "you have no pending requests\n" unless %hub;
@@ -388,7 +415,7 @@ sub valid_ref {
 sub valid_repo {
     my $repo = shift;
     $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;
 }
 
diff --git a/contrib/adc/hub.mkd b/contrib/adc/hub.mkd
index bc29e4f..8957860 100644
--- a/contrib/adc/hub.mkd
+++ b/contrib/adc/hub.mkd
@@ -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
     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>
 
 #### Alice's "just looking" commands
diff --git a/t/t67-hub b/t/t67-hub
index b0fe97c..f3d19c0 100644
--- a/t/t67-hub
+++ b/t/t67-hub
@@ -169,5 +169,26 @@ do
     expect "2	child/u2/myr1	(u2)	b2	rejected 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"
 done