Merge "Always show --manifest-server-* options"
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 15f69f7..d638911 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -173,6 +173,12 @@
p.add_option('--no-clone-bundle',
dest='no_clone_bundle', action='store_true',
help='disable use of /clone.bundle on HTTP/HTTPS')
+ p.add_option('-u', '--manifest-server-username', action='store',
+ dest='manifest_server_username',
+ help='username to authenticate with the manifest server')
+ p.add_option('-p', '--manifest-server-password', action='store',
+ dest='manifest_server_password',
+ help='password to authenticate with the manifest server')
if show_smart:
p.add_option('-s', '--smart-sync',
dest='smart_sync', action='store_true',
@@ -180,12 +186,6 @@
p.add_option('-t', '--smart-tag',
dest='smart_tag', action='store',
help='smart sync using manifest from a known tag')
- p.add_option('-u', '--manifest-server-username', action='store',
- dest='manifest_server_username',
- help='username to authenticate with the manifest server')
- p.add_option('-p', '--manifest-server-password', action='store',
- dest='manifest_server_password',
- help='password to authenticate with the manifest server')
g = p.add_option_group('repo Version options')
g.add_option('--no-repo-verify',