X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fpatchwork%2Fbin%2Fpwclient;h=8d1f4766c0bfe7b594e1b118c7348ba4f06af9d5;hb=f0ad2c6a249c0ee3a4b356e10033ea0041ecbea4;hp=483330e5c876a29c65ac8ce30b992b0f9ddaeeb0;hpb=7e072a3308fb43fba06e94e9b30d8c9f1638a77b;p=patchwork

diff --git a/apps/patchwork/bin/pwclient b/apps/patchwork/bin/pwclient
index 483330e..8d1f476 100755
--- a/apps/patchwork/bin/pwclient
+++ b/apps/patchwork/bin/pwclient
@@ -269,11 +269,12 @@ def action_apply(rpc, patch_id, apply_cmd=None):
     if len(s) > 0:
         proc = subprocess.Popen(apply_cmd, stdin = subprocess.PIPE)
         proc.communicate(unicode(s).encode('utf-8'))
+        return proc.returncode
     else:
         sys.stderr.write("Error: No patch content found\n")
         sys.exit(1)
 
-def action_update_patch(rpc, patch_id, state = None, commit = None):
+def action_update_patch(rpc, patch_id, state = None, archived = None, commit = None):
     patch = rpc.patch_get(patch_id)
     if patch == {}:
         sys.stderr.write("Error getting information on patch ID %d\n" % \
@@ -292,6 +293,9 @@ def action_update_patch(rpc, patch_id, state = None, commit = None):
     if commit:
         params['commit_ref'] = commit
 
+    if archived:
+        params['archived'] = archived == 'yes'
+
     success = False
     try:
         success = rpc.patch_set(patch_id, params)
@@ -369,6 +373,10 @@ def main():
         '-s', metavar='STATE',
         help='''Filter by patch state (e.g., 'New', 'Accepted', etc.)'''
     )
+    filter_parser.add_argument(
+        '-a', choices=['yes','no'],
+        help='''Filter by patch archived state'''
+    )
     filter_parser.add_argument(
         '-p', metavar='PROJECT',
         help='''Filter by project name (see 'projects' for list)'''
@@ -485,6 +493,10 @@ def main():
         required=True,
         help='''Set patch state (e.g., 'Accepted', 'Superseded' etc.)'''
     )
+    update_parser.add_argument(
+        '-a', choices=['yes', 'no'],
+        help='''Set patch archived state'''
+    )
     update_parser.set_defaults(subcmd='update')
     list_parser = subparsers.add_parser("list",
         add_help=False,
@@ -524,6 +536,7 @@ def main():
     commit_str = None
     url = DEFAULT_URL
 
+    archived_str = args.get('a')
     state_str = args.get('s')
     project_str = args.get('p')
     submitter_str = args.get('w')
@@ -606,7 +619,6 @@ def main():
 
     url = config.get(project_str, 'url')
 
-    (username, password) = (None, None)
     transport = None
     if action in auth_actions:
         if config.has_option(project_str, 'username') and \
@@ -630,6 +642,9 @@ def main():
     if state_str:
         filt.add("state", state_str)
 
+    if archived_str:
+        filt.add("archived", archived_str == 'yes')
+
     if msgid_str:
         filt.add("msgid", msgid_str)
 
@@ -669,10 +684,25 @@ def main():
         action_states(rpc)
 
     elif action == 'view':
-        for patch_id in non_empty(h, patch_ids):
-            s = rpc.patch_get_mbox(patch_id)
-            if len(s) > 0:
-                print unicode(s).encode("utf-8")
+        pager = os.environ.get('PAGER')
+        if pager:
+            pager = subprocess.Popen(
+                pager.split(), stdin=subprocess.PIPE
+            )
+        if pager:
+            i = list()
+            for patch_id in non_empty(h, patch_ids):
+                s = rpc.patch_get_mbox(patch_id)
+                if len(s) > 0:
+                    i.append(unicode(s).encode("utf-8"))
+            if len(i) > 0:
+                pager.communicate(input="\n".join(i))
+            pager.stdin.close()
+        else:
+            for patch_id in non_empty(h, patch_ids):
+                s = rpc.patch_get_mbox(patch_id)
+                if len(s) > 0:
+                    print unicode(s).encode("utf-8")
 
     elif action == 'info':
         for patch_id in non_empty(h, patch_ids):
@@ -684,19 +714,25 @@ def main():
 
     elif action == 'apply':
         for patch_id in non_empty(h, patch_ids):
-            action_apply(rpc, patch_id)
+            ret = action_apply(rpc, patch_id)
+            if ret:
+                sys.stderr.write("Apply failed with exit status %d\n" % ret)
+                sys.exit(1)
 
     elif action == 'git_am':
         cmd = ['git', 'am']
         if do_signoff:
             cmd.append('-s')
         for patch_id in non_empty(h, patch_ids):
-            action_apply(rpc, patch_id, cmd)
+            ret = action_apply(rpc, patch_id, cmd)
+            if ret:
+                sys.stderr.write("'git am' failed with exit status %d\n" % ret)
+                sys.exit(1)
 
     elif action == 'update':
         for patch_id in non_empty(h, patch_ids):
             action_update_patch(rpc, patch_id, state = state_str,
-                commit = commit_str
+                archived = archived_str, commit = commit_str
             )
 
     else: