Revert "Migrate git-repo to create private changes rather than drafts"

This reverts commit d88f53e2b9634b9645f80b2d8e653beac24711fe. I merged
it too hastily without paying enough attention to compatibility with
released Gerrit versions.

Change-Id: I4028d4737df1255f11e217da183a19a010597d5b

1 files changed, 4 insertions, 3 deletions

diff --git a/subcmds/upload.py b/subcmds/upload.py
index f40ac9df..61b18bc2 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -152,8 +152,8 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
                  dest='current_branch', action='store_true',
                  help='Upload current git branch.')
     p.add_option('-d', '--draft',
-                 action='store_true', dest='private', default=False,
-                 help='(Deprecated). If specified, upload as a private change.')
+                 action='store_true', dest='draft', default=False,
+                 help='If specified, upload as a draft.')
     p.add_option('-p', '--private',
                  action='store_true', dest='private', default=False,
                  help='If specified, upload as a private change.')
@@ -205,7 +205,7 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
 
       destination = opt.dest_branch or project.dest_branch or project.revisionExpr
       print('Upload project %s/ to remote branch %s%s:' %
-            (project.relpath, destination, ' (private)' if opt.private else ''))
+            (project.relpath, destination, ' (draft)' if opt.draft else ''))
       print('  branch %s (%2d commit%s, %s):' % (
                     name,
                     len(commit_list),
@@ -386,6 +386,7 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
 
         branch.UploadForReview(people,
                                auto_topic=opt.auto_topic,
+                               draft=opt.draft,
                                private=opt.private,
                                wip=opt.wip,
                                dest_branch=destination)