Indicate values loaded from git-config

Signed-off-by: Stephen Finucane <stephen@that.guru>

Author: stephenfin

git_pw/shell.py

@@ -17,15 +17,20 @@
 @click.option('--debug', default=False, is_flag=True,
               help="Output more information about what's going on.")
 @click.option('--token', metavar='TOKEN', envvar='PW_TOKEN',
-              help='Authentication token.')
+              help="Authentication token. Defaults to the value of "
+              "'git config pw.token'.")
 @click.option('--username', metavar='USERNAME', envvar='PW_USERNAME',
-              help='Authentication username.')
+              help="Authentication username. Defaults to the value of "
+              "'git config pw.username'.")
 @click.option('--password', metavar='PASSWORD', envvar='PW_PASSWORD',
-              help='Authentication password.')
+              help="Authentication password. Defaults to the value of "
+              "'git config pw.password'.")
 @click.option('--server', metavar='SERVER', envvar='PW_SERVER',
-              help='Patchwork server address/hostname.')
+              help="Patchwork server address/hostname. Defaults to the value "
+              "of 'git config pw.server'.")
 @click.option('--project', metavar='PROJECT', envvar='PW_PROJECT',
-              help='Patchwork project.')
+              help="Patchwork project. Defaults the value of "
+              "'git config pw.project'.")
 @click.version_option()
 def cli(debug, token, username, password, server, project):
     """git-pw is a tool for integrating Git with Patchwork.

git_pw/utils.py

@@ -174,7 +174,8 @@ def _format_options(f):
         f = click.option('--format', '-f', 'fmt', envvar='PW_FORMAT',
                          default=None,
                          type=click.Choice(['simple', 'table', 'csv']),
-                         help='Output format. Defaults to table.')(f)
+                         help="Output format. Defaults to the value of "
+                         "'git config pw.server' else 'table'.")(f)
 
         if headers:
             f = click.option('--column', '-c', 'headers', metavar='COLUMN',