depot_tools: Send the remote tracked ref to Rietveld via 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 632 matching lines @@
                  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",

[agable, 2014/12/09 20:42:56]

Make sure that this change gets landed in Rietveld's upload.py (in infra.git)
first, and then gets downstreamed to here.

[rmistry, 2014/12/09 20:54:43]

I am glad you brought this up.
Could you explain how this works? is this a copy of
https://chromium.googlesource.com/infra/infra/+/master/appengine/chromium_rie...
or is it brought here by some DEPS (which I could not find).

Do I need to make a change to
https://chromium.googlesource.com/infra/infra/+/master/appengine/chromium_rie...
and to depot_tools/third_party/upload.py ?

[agable, 2014/12/09 23:36:33]

It is a copy of the one in chromium_rietveld. The procedure is
1) Figure out the change you want to land in depot_tools
2) Land it in infra.git
3) Land it in depot_tools

It used to be more important, when Rietveld lived in its own repo and we didn't
100% control it. We had to land changes there first and then downstream them to
us. Now, I think the order matters less. But we do have to make sure the same
changes land in both.

+                 default=None,
+                 help="The target ref that is transitively tracked by the "
+                 "local branch this patch comes from.")
 group.add_option("--download_base", action="store_true",
                  dest="download_base", default=False,
                  help="Base files will be downloaded by the server "
                  "(side-by-side diffs may not work on files with CRs).")
 group.add_option("--rev", action="store", dest="revision",
                  metavar="REV", default=None,
                  help="Base revision/branch/tree to diff against. Use "
                       "rev1:rev2 range to review already committed changeset.")
 group.add_option("--send_mail", action="store_true",
                  dest="send_mail", default=False,
@@ skipping 1935 matching lines @@
   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(','):
       CheckReviewer(cc)
     form_fields.append(("cc", options.cc))
   if options.project:
     form_fields.append(("project", options.project))
+  if options.target_ref:
+    form_fields.append(("target_ref", options.target_ref))
 
   # Process --message, --title and --file.
   message = options.message or ""
   title = options.title or ""
   if options.file:
     if options.message:
       ErrorExit("Can't specify both message and message file options")
     file = open(options.file, 'r')
     message = file.read()
     file.close()
@@ skipping 91 matching lines @@
     os.environ['LC_ALL'] = 'C'
     RealMain(sys.argv)
   except KeyboardInterrupt:
     print
     StatusUpdate("Interrupted.")
     sys.exit(1)
 
 
 if __name__ == "__main__":
   main()