push: add option --pull

Add a new option `--pull` to `pkgdev push` to pull all changes before
starting the scan & push. This is very useful for most normal usage for
developers.

This can be also set in config, but adding the line:

    push.pull =

Resolves: #102
Signed-off-by: Arthur Zamarin <[email protected]>

Author: arthurzam

data/share/bash-completion/completions/pkgdev

@@ -134,6 +134,7 @@ _pkgdev() {
             subcmd_options="
                 -A --ask
                 -n --dry-run
+                --pull
             "
 
             COMPREPLY+=($(compgen -W "${subcmd_options}" -- "${cur}"))

data/share/zsh/site-functions/_pkgdev

@@ -77,6 +77,7 @@ case $state in
           $base_options \
           {'(--ask)-A','(-A)--ask'}'[confirm pushing commits with QA errors]' \
           {'(--dry-run)-n','(-n)--dry-run'}'[pretend to push commits]' \
+          '--pull[run git pull --rebase before scanning]' \
           && ret=0
         ;;
       (showkw)

src/pkgdev/scripts/pkgdev_push.py

@@ -32,6 +32,9 @@ def parse_known_args(self, args=None, namespace=None):
 push_opts.add_argument(
     '-n', '--dry-run', action='store_true',
     help='pretend to push the commits')
+push_opts.add_argument(
+    '--pull', action='store_true',
+    help='run `git pull --rebase` before scanning')
 
 
 @push.bind_final_check
@@ -45,6 +48,9 @@ def _commit_validate(parser, namespace):
 
 @push.bind_main_func
 def _push(options, out, err):
+    if options.pull:
+        git.run('pull', '--rebase', cwd=options.repo.location)
+
     # scan commits for QA issues
     pipe = scan(options.scan_args)
     with reporters.FancyReporter(out) as reporter: