Remove --base_url from git cl and upload.py

third_party/upload.py

 #!/usr/bin/env python
 # coding: utf-8
 #
 # Copyright 2007 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
@@ skipping 614 matching lines @@
                  metavar="CC", default=None,
                  help="Add CC (comma separated email addresses).")
 group.add_option("--private", action="store_true", dest="private",
                  default=False,
                  help="Make the issue restricted to reviewers and those CCed")
 # Upload options
 group = parser.add_option_group("Patch options")
 group.add_option("-i", "--issue", type="int", action="store",
                  metavar="ISSUE", default=None,
                  help="Issue number to which to add. Defaults to new issue.")
-group.add_option("--base_url", action="store", dest="base_url", default=None,
-                 help="Base URL path for files (listed as \"Base URL\" when "
-                 "viewing issue).  If omitted, will be guessed automatically "
-                 "for SVN repos and left blank for others.")
 group.add_option("--target_ref", action="store", dest="target_ref",
                  default=None,
                  help="The target ref that is transitively tracked by the "
                  "local branch this patch comes from.")
 parser.add_option("--cq_dry_run", action="store_true",
                   help="Send the patchset to do a CQ dry run right after "
                        "upload.")
 parser.add_option("--depends_on_patchset", action="store",
                   dest="depends_on_patchset",
                   help="The uploaded patchset this patchset depends on. The "
@@ skipping 1717 matching lines @@
 
   global verbosity
   verbosity = options.verbose
   if verbosity >= 3:
     LOGGER.setLevel(logging.DEBUG)
   elif verbosity >= 2:
     LOGGER.setLevel(logging.INFO)
 
   vcs = GuessVCS(options)
 
-  base = options.base_url
-  if isinstance(vcs, SubversionVCS):
-    # Guessing the base field is only supported for Subversion.
-    # Note: Fetching base files may become deprecated in future releases.
-    guessed_base = vcs.GuessBase(options.download_base)
-    if base:
-      if guessed_base and base != guessed_base:
-        print("Using base URL \"%s\" from --base_url instead of \"%s\"" %
-              (base, guessed_base))
-    else:
-      base = guessed_base
-
-  if not base and options.download_base:
+  if options.download_base:
     options.download_base = True
     LOGGER.info("Enabled upload of base file")
   if not options.assume_yes:
     vcs.CheckForUnknownFiles()
   if data is None:
     data = vcs.GenerateDiff(args)
   data = vcs.PostProcessDiff(data)
   if options.print_diffs:
     print("Rietveld diff start:*****")
     print(data)
     print("Rietveld diff end:*****")
   files = vcs.GetBaseFiles(data)
   if verbosity >= 1:
     print("Upload server:", options.server, "(change with -s/--server)")
 
   auth_config = auth.extract_auth_config_from_options(options)
   rpc_server = GetRpcServer(options.server, auth_config, options.email)
   form_fields = []
 
   repo_guid = vcs.GetGUID()
   if repo_guid:
     form_fields.append(("repo_guid", repo_guid))
-  if base:
-    b = urlparse.urlparse(base)
-    username, netloc = urllib.splituser(b.netloc)
-    if username:
-      LOGGER.info("Removed username from base URL")
-      base = urlparse.urlunparse((b.scheme, netloc, b.path, b.params,
-                                  b.query, b.fragment))
-    form_fields.append(("base", base))
   if options.issue:
     form_fields.append(("issue", str(options.issue)))
   if options.email:
     form_fields.append(("user", options.email))
   if options.reviewers:
     for reviewer in options.reviewers.split(','):
       CheckReviewer(reviewer)
     form_fields.append(("reviewers", options.reviewers))
   if options.cc:
     for cc in options.cc.split(','):
@@ skipping 123 matching lines @@
     print
     StatusUpdate("Interrupted.")
     sys.exit(1)
   except auth.AuthenticationError as e:
     print(e, file=sys.stderr)
     sys.exit(1)
 
 
 if __name__ == "__main__":
   main()