[meld] Minor niceties on the maint flow and command names

[Kai Willadsen <kaiw src gnome org>]

commit 59f73ad45931eac6ca4bf37c040a9f4cccc2e2af
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Wed Mar 28 08:24:53 2018 +1000

    Minor niceties on the maint flow and command names

 maint | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/maint b/maint
index d21d46e8..000e830e 100755
--- a/maint
+++ b/maint
@@ -428,8 +428,8 @@ def tag():
     call_with_output(cmd, echo_stdout=True)
 
 
-@cli.command()
-def release_tag():
+@cli.command('gitlab-release')
+def gitlab_release():
     last_release = get_last_release_tag()
     confirm = click.confirm(
         'Annotate {} as a Gitlab release?'.format(last_release), default=True)
@@ -451,7 +451,7 @@ def upload(path):
     call_with_output(cmd, timeout=120)
 
 
-@cli.command()
+@cli.command('version-bump')
 def version_bump():
     with open(meld.conf.__file__) as f:
         conf_data = f.read().splitlines()
@@ -479,7 +479,7 @@ def version_bump():
         f.write('\n'.join(conf_data) + '\n')
 
 
-@cli.command()
+@cli.command('release')
 @click.pass_context
 def make_release(ctx):
     pull()
@@ -488,8 +488,7 @@ def make_release(ctx):
     push()
     archive_path = ctx.forward(dist)
     ctx.forward(tag)
-    ctx.forward(release_tag)
-    ctx.forward(upload, path=archive_path)
+    ctx.forward(gitlab_release)
     file_prefix = '%s-%s' % (meld.conf.__package__, meld.conf.__version__)
     ctx.forward(email, filename=file_prefix + '-email')
     ctx.forward(markdown, filename=file_prefix + '.md')
@@ -497,6 +496,8 @@ def make_release(ctx):
     commit(message='Post-release version bump')
     push()
 
+    ctx.forward(upload, path=archive_path)
+
     # TODO: ssh in and run ftpadmin install
     click.echo('\nNow run:')
     click.echo('ssh %s' % UPLOAD_SERVER)