185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan#!/usr/bin/env python 285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# 385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# Copyright 2007 Google Inc. 485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# 585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# Licensed under the Apache License, Version 2.0 (the "License"); 685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# you may not use this file except in compliance with the License. 785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# You may obtain a copy of the License at 885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# 985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# http://www.apache.org/licenses/LICENSE-2.0 1085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# 1185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# Unless required by applicable law or agreed to in writing, software 1285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# distributed under the License is distributed on an "AS IS" BASIS, 1385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 1485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# See the License for the specific language governing permissions and 1585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# limitations under the License. 1685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 1785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan"""Tool for uploading diffs from a version control system to the codereview app. 1885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 1985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanUsage summary: upload.py [options] [-- diff_options] 2085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 2185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanDiff options are passed to the diff command of the underlying system. 2285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 2385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanSupported version control systems: 2485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Git 2585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Mercurial 2685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Subversion 2785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 2885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanIt is important for Git/Mercurial users to specify a tree/node/branch to diff 2985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanagainst by using the '--rev' option. 3085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan""" 3185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# This code is derived from appcfg.py in the App Engine SDK (open source), 3285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# and from ASPN recipe #146306. 3385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 3485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport cookielib 3585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport getpass 3685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport logging 3785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport md5 3885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport mimetypes 3985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport optparse 4085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport os 4185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport re 4285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport socket 4385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport subprocess 4485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport sys 4585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport urllib 4685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport urllib2 4785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanimport urlparse 4885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 4985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wantry: 5085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan import readline 5185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanexcept ImportError: 5285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan pass 5385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 5485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# The logging verbosity: 5585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# 0: Errors only. 5685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# 1: Status messages. 5785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# 2: Info logs. 5885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# 3: Debug logs. 5985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanverbosity = 1 6085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 6185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# Max size of patch or base file. 6285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanMAX_UPLOAD_SIZE = 900 * 1024 6385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 6485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 6585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef GetEmail(prompt): 6685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Prompts the user for their email address and returns it. 6785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 6885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan The last used email address is saved to a file and offered up as a suggestion 6985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan to the user. If the user presses enter without typing in anything the last 7085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan used email address is used. If the user enters a new address, it is saved 7185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for next time we prompt. 7285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 7385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 7485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan last_email_file_name = os.path.expanduser("~/.last_codereview_email_address") 7585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan last_email = "" 7685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if os.path.exists(last_email_file_name): 7785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 7885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan last_email_file = open(last_email_file_name, "r") 7985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan last_email = last_email_file.readline().strip("\n") 8085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan last_email_file.close() 8185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan prompt += " [%s]" % last_email 8285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan except IOError, e: 8385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan pass 8485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan email = raw_input(prompt + ": ").strip() 8585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if email: 8685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 8785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan last_email_file = open(last_email_file_name, "w") 8885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan last_email_file.write(email) 8985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan last_email_file.close() 9085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan except IOError, e: 9185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan pass 9285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 9385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan email = last_email 9485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return email 9585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 9685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 9785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef StatusUpdate(msg): 9885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Print a status message to stdout. 9985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 10085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan If 'verbosity' is greater than 0, print the message. 10185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 10285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 10385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan msg: The string to print. 10485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 10585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if verbosity > 0: 10685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print msg 10785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 10885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 10985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef ErrorExit(msg): 11085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Print an error message to stderr and exit.""" 11185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print >>sys.stderr, msg 11285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan sys.exit(1) 11385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 11485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 11585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanclass ClientLoginError(urllib2.HTTPError): 11685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Raised to indicate there was an error authenticating with ClientLogin.""" 11785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 11885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def __init__(self, url, code, msg, headers, args): 11985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan urllib2.HTTPError.__init__(self, url, code, msg, headers, None) 12085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.args = args 12185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.reason = args["Error"] 12285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 12385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 12485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanclass AbstractRpcServer(object): 12585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Provides a common interface for a simple RPC server.""" 12685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 12785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def __init__(self, host, auth_function, host_override=None, extra_headers={}, 12885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan save_cookies=False): 12985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Creates a new HttpRpcServer. 13085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 13185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 13285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan host: The host to send requests to. 13385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan auth_function: A function that takes no arguments and returns an 13485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan (email, password) tuple when called. Will be called if authentication 13585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan is required. 13685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan host_override: The host header to send to the server (defaults to host). 13785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan extra_headers: A dict of extra headers to append to every request. 13885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan save_cookies: If True, save the authentication cookies to local disk. 13985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan If False, use an in-memory cookiejar instead. Subclasses must 14085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan implement this functionality. Defaults to False. 14185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 14285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.host = host 14385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.host_override = host_override 14485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.auth_function = auth_function 14585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.authenticated = False 14685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.extra_headers = extra_headers 14785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.save_cookies = save_cookies 14885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.opener = self._GetOpener() 14985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.host_override: 15085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info("Server: %s; Host: %s", self.host, self.host_override) 15185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 15285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info("Server: %s", self.host) 15385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 15485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def _GetOpener(self): 15585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Returns an OpenerDirector for making HTTP requests. 15685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 15785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 15885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan A urllib2.OpenerDirector object. 15985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 16085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise NotImplementedError() 16185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 16285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def _CreateRequest(self, url, data=None): 16385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Creates a new urllib request.""" 16485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.debug("Creating request for: '%s' with payload:\n%s", url, data) 16585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan req = urllib2.Request(url, data=data) 16685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.host_override: 16785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan req.add_header("Host", self.host_override) 16885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for key, value in self.extra_headers.iteritems(): 16985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan req.add_header(key, value) 17085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return req 17185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 17285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def _GetAuthToken(self, email, password): 17385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Uses ClientLogin to authenticate the user, returning an auth token. 17485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 17585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 17685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan email: The user's email address 17785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan password: The user's password 17885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 17985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Raises: 18085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ClientLoginError: If there was an error authenticating with ClientLogin. 18185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan HTTPError: If there was some other form of HTTP error. 18285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 18385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 18485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan The authentication token returned by ClientLogin. 18585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 18685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan account_type = "GOOGLE" 18785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.host.endswith(".google.com"): 18885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Needed for use inside Google. 18985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan account_type = "HOSTED" 19085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan req = self._CreateRequest( 19185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url="https://www.google.com/accounts/ClientLogin", 19285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan data=urllib.urlencode({ 19385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "Email": email, 19485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "Passwd": password, 19585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "service": "ah", 19685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "source": "rietveld-codereview-upload", 19785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "accountType": account_type, 19885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan }), 19985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ) 20085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 20185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response = self.opener.open(req) 20285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response_body = response.read() 20385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response_dict = dict(x.split("=") 20485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for x in response_body.split("\n") if x) 20585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return response_dict["Auth"] 20685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan except urllib2.HTTPError, e: 20785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if e.code == 403: 20885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan body = e.read() 20985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response_dict = dict(x.split("=", 1) for x in body.split("\n") if x) 21085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise ClientLoginError(req.get_full_url(), e.code, e.msg, 21185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan e.headers, response_dict) 21285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 21385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise 21485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 21585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def _GetAuthCookie(self, auth_token): 21685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Fetches authentication cookies for an authentication token. 21785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 21885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 21985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan auth_token: The authentication token returned by ClientLogin. 22085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 22185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Raises: 22285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan HTTPError: If there was an error fetching the authentication cookies. 22385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 22485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # This is a dummy value to allow us to identify when we're successful. 22585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan continue_location = "http://localhost/" 22685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan args = {"continue": continue_location, "auth": auth_token} 22785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan req = self._CreateRequest("http://%s/_ah/login?%s" % 22885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan (self.host, urllib.urlencode(args))) 22985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 23085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response = self.opener.open(req) 23185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan except urllib2.HTTPError, e: 23285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response = e 23385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if (response.code != 302 or 23485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response.info()["location"] != continue_location): 23585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise urllib2.HTTPError(req.get_full_url(), response.code, response.msg, 23685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response.headers, response.fp) 23785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.authenticated = True 23885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 23985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def _Authenticate(self): 24085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Authenticates the user. 24185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 24285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan The authentication process works as follows: 24385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 1) We get a username and password from the user 24485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 2) We use ClientLogin to obtain an AUTH token for the user 24585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan (see http://code.google.com/apis/accounts/AuthForInstalledApps.html). 24685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 3) We pass the auth token to /_ah/login on the server to obtain an 24785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan authentication cookie. If login was successful, it tries to redirect 24885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan us to the URL we provided. 24985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 25085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan If we attempt to access the upload API without first obtaining an 25185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan authentication cookie, it returns a 401 response and directs us to 25285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan authenticate ourselves with ClientLogin. 25385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 25485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for i in range(3): 25585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan credentials = self.auth_function() 25685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 25785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan auth_token = self._GetAuthToken(credentials[0], credentials[1]) 25885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan except ClientLoginError, e: 25985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if e.reason == "BadAuthentication": 26085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print >>sys.stderr, "Invalid username or password." 26185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan continue 26285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if e.reason == "CaptchaRequired": 26385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print >>sys.stderr, ( 26485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "Please go to\n" 26585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "https://www.google.com/accounts/DisplayUnlockCaptcha\n" 26685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "and verify you are a human. Then try again.") 26785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan break 26885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if e.reason == "NotVerified": 26985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print >>sys.stderr, "Account not verified." 27085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan break 27185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if e.reason == "TermsNotAgreed": 27285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print >>sys.stderr, "User has not agreed to TOS." 27385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan break 27485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if e.reason == "AccountDeleted": 27585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print >>sys.stderr, "The user account has been deleted." 27685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan break 27785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if e.reason == "AccountDisabled": 27885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print >>sys.stderr, "The user account has been disabled." 27985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan break 28085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if e.reason == "ServiceDisabled": 28185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print >>sys.stderr, ("The user's access to the service has been " 28285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "disabled.") 28385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan break 28485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if e.reason == "ServiceUnavailable": 28585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print >>sys.stderr, "The service is not available; try again later." 28685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan break 28785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise 28885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self._GetAuthCookie(auth_token) 28985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return 29085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 29185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def Send(self, request_path, payload=None, 29285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan content_type="application/octet-stream", 29385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan timeout=None, 29485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan **kwargs): 29585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Sends an RPC and returns the response. 29685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 29785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 29885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan request_path: The path to send the request to, eg /api/appversion/create. 29985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan payload: The body of the request, or None to send an empty request. 30085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan content_type: The Content-Type header to use. 30185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan timeout: timeout in seconds; default None i.e. no timeout. 30285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan (Note: for large requests on OS X, the timeout doesn't work right.) 30385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan kwargs: Any keyword arguments are converted into query string parameters. 30485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 30585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 30685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan The response body, as a string. 30785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 30885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # TODO: Don't require authentication. Let the server say 30985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # whether it is necessary. 31085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not self.authenticated: 31185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self._Authenticate() 31285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 31385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan old_timeout = socket.getdefaulttimeout() 31485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan socket.setdefaulttimeout(timeout) 31585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 31685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan tries = 0 31785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan while True: 31885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan tries += 1 31985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan args = dict(kwargs) 32085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url = "http://%s%s" % (self.host, request_path) 32185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if args: 32285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url += "?" + urllib.urlencode(args) 32385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan req = self._CreateRequest(url=url, data=payload) 32485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan req.add_header("Content-Type", content_type) 32585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 32685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan f = self.opener.open(req) 32785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response = f.read() 32885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan f.close() 32985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return response 33085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan except urllib2.HTTPError, e: 33185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if tries > 3: 33285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise 33385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan elif e.code == 401: 33485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self._Authenticate() 33585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan## elif e.code >= 500 and e.code < 600: 33685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan## # Server Error - try again. 33785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan## continue 33885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 33985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise 34085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan finally: 34185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan socket.setdefaulttimeout(old_timeout) 34285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 34385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 34485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanclass HttpRpcServer(AbstractRpcServer): 34585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Provides a simplified RPC-style interface for HTTP requests.""" 34685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 34785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def _Authenticate(self): 34885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Save the cookie jar after authentication.""" 34985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan super(HttpRpcServer, self)._Authenticate() 35085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.save_cookies: 35185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan StatusUpdate("Saving authentication cookies to %s" % self.cookie_file) 35285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.cookie_jar.save() 35385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 35485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def _GetOpener(self): 35585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Returns an OpenerDirector that supports cookies and ignores redirects. 35685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 35785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 35885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan A urllib2.OpenerDirector object. 35985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 36085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan opener = urllib2.OpenerDirector() 36185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan opener.add_handler(urllib2.ProxyHandler()) 36285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan opener.add_handler(urllib2.UnknownHandler()) 36385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan opener.add_handler(urllib2.HTTPHandler()) 36485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan opener.add_handler(urllib2.HTTPDefaultErrorHandler()) 36585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan opener.add_handler(urllib2.HTTPSHandler()) 36685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan opener.add_handler(urllib2.HTTPErrorProcessor()) 36785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.save_cookies: 36885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.cookie_file = os.path.expanduser("~/.codereview_upload_cookies") 36985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.cookie_jar = cookielib.MozillaCookieJar(self.cookie_file) 37085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if os.path.exists(self.cookie_file): 37185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 37285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.cookie_jar.load() 37385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.authenticated = True 37485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan StatusUpdate("Loaded authentication cookies from %s" % 37585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.cookie_file) 37685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan except (cookielib.LoadError, IOError): 37785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Failed to load cookies - just ignore them. 37885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan pass 37985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 38085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Create an empty cookie file with mode 600 38185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan fd = os.open(self.cookie_file, os.O_CREAT, 0600) 38285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan os.close(fd) 38385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Always chmod the cookie file 38485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan os.chmod(self.cookie_file, 0600) 38585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 38685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Don't save cookies across runs of update.py. 38785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.cookie_jar = cookielib.CookieJar() 38885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan opener.add_handler(urllib2.HTTPCookieProcessor(self.cookie_jar)) 38985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return opener 39085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 39185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 39285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanparser = optparse.OptionParser(usage="%prog [options] [-- diff_options]") 39385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanparser.add_option("-y", "--assume_yes", action="store_true", 39485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan dest="assume_yes", default=False, 39585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Assume that the answer to yes/no questions is 'yes'.") 39685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# Logging 39785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup = parser.add_option_group("Logging options") 39885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("-q", "--quiet", action="store_const", const=0, 39985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan dest="verbose", help="Print errors only.") 40085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("-v", "--verbose", action="store_const", const=2, 40185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan dest="verbose", default=1, 40285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Print info level logs (default).") 40385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("--noisy", action="store_const", const=3, 40485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan dest="verbose", help="Print all logs.") 40585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# Review server 40685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup = parser.add_option_group("Review server options") 40785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("-s", "--server", action="store", dest="server", 40885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan default="codereview.appspot.com", 40985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan metavar="SERVER", 41085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help=("The server to upload to. The format is host[:port]. " 41185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "Defaults to 'codereview.appspot.com'.")) 41285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("-e", "--email", action="store", dest="email", 41385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan metavar="EMAIL", default=None, 41485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="The username to use. Will prompt if omitted.") 41585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("-H", "--host", action="store", dest="host", 41685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan metavar="HOST", default=None, 41785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Overrides the Host header sent with all RPCs.") 41885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("--no_cookies", action="store_false", 41985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan dest="save_cookies", default=True, 42085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Do not save authentication cookies to local disk.") 42185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# Issue 42285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup = parser.add_option_group("Issue options") 42385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("-d", "--description", action="store", dest="description", 42485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan metavar="DESCRIPTION", default=None, 42585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Optional description when creating an issue.") 42685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("-f", "--description_file", action="store", 42785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan dest="description_file", metavar="DESCRIPTION_FILE", 42885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan default=None, 42985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Optional path of a file that contains " 43085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "the description when creating an issue.") 43185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("-r", "--reviewers", action="store", dest="reviewers", 43285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan metavar="REVIEWERS", default=None, 43385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Add reviewers (comma separated email addresses).") 43485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("--cc", action="store", dest="cc", 43585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan metavar="CC", default=None, 43685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Add CC (comma separated email addresses).") 43785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# Upload options 43885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup = parser.add_option_group("Patch options") 43985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("-m", "--message", action="store", dest="message", 44085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan metavar="MESSAGE", default=None, 44185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="A message to identify the patch. " 44285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "Will prompt if omitted.") 44385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("-i", "--issue", type="int", action="store", 44485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan metavar="ISSUE", default=None, 44585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Issue number to which to add. Defaults to new issue.") 44685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("--download_base", action="store_true", 44785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan dest="download_base", default=False, 44885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Base files will be downloaded by the server " 44985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "(side-by-side diffs may not work on files with CRs).") 45085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("--rev", action="store", dest="revision", 45185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan metavar="REV", default=None, 45285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Branch/tree/revision to diff against (used by DVCS).") 45385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wangroup.add_option("--send_mail", action="store_true", 45485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan dest="send_mail", default=False, 45585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan help="Send notification email to reviewers.") 45685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 45785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 45885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef GetRpcServer(options): 45985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Returns an instance of an AbstractRpcServer. 46085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 46185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 46285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan A new AbstractRpcServer, on which RPC calls can be made. 46385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 46485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 46585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan rpc_server_class = HttpRpcServer 46685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 46785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GetUserCredentials(): 46885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Prompts the user for a username and password.""" 46985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan email = options.email 47085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if email is None: 47185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan email = GetEmail("Email (login for uploading to %s)" % options.server) 47285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan password = getpass.getpass("Password for %s: " % email) 47385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return (email, password) 47485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 47585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # If this is the dev_appserver, use fake authentication. 47685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan host = (options.host or options.server).lower() 47785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if host == "localhost" or host.startswith("localhost:"): 47885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan email = options.email 47985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if email is None: 48085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan email = "test@example.com" 48185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info("Using debug user %s. Override with --email" % email) 48285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan server = rpc_server_class( 48385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan options.server, 48485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lambda: (email, "password"), 48585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan host_override=options.host, 48685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan extra_headers={"Cookie": 48785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 'dev_appserver_login="%s:False"' % email}, 48885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan save_cookies=options.save_cookies) 48985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Don't try to talk to ClientLogin. 49085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan server.authenticated = True 49185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return server 49285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 49385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return rpc_server_class(options.server, GetUserCredentials, 49485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan host_override=options.host, 49585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan save_cookies=options.save_cookies) 49685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 49785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 49885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef EncodeMultipartFormData(fields, files): 49985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Encode form fields for multipart/form-data. 50085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 50185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 50285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan fields: A sequence of (name, value) elements for regular form fields. 50385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan files: A sequence of (name, filename, value) elements for data to be 50485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan uploaded as files. 50585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 50685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan (content_type, body) ready for httplib.HTTP instance. 50785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 50885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Source: 50985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/146306 51085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 51185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan BOUNDARY = '-M-A-G-I-C---B-O-U-N-D-A-R-Y-' 51285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan CRLF = '\r\n' 51385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines = [] 51485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for (key, value) in fields: 51585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines.append('--' + BOUNDARY) 51685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines.append('Content-Disposition: form-data; name="%s"' % key) 51785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines.append('') 51885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines.append(value) 51985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for (key, filename, value) in files: 52085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines.append('--' + BOUNDARY) 52185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines.append('Content-Disposition: form-data; name="%s"; filename="%s"' % 52285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan (key, filename)) 52385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines.append('Content-Type: %s' % GetContentType(filename)) 52485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines.append('') 52585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines.append(value) 52685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines.append('--' + BOUNDARY + '--') 52785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines.append('') 52885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan body = CRLF.join(lines) 52985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan content_type = 'multipart/form-data; boundary=%s' % BOUNDARY 53085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return content_type, body 53185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 53285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 53385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef GetContentType(filename): 53485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Helper to guess the content-type from the filename.""" 53585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return mimetypes.guess_type(filename)[0] or 'application/octet-stream' 53685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 53785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 53885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# Use a shell for subcommands on Windows to get a PATH search. 53985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanuse_shell = sys.platform.startswith("win") 54085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 54185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef RunShellWithReturnCode(command, print_output=False, 54285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan universal_newlines=True): 54385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Executes a command and returns the output from stdout and the return code. 54485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 54585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 54685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan command: Command to execute. 54785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print_output: If True, the output is printed to stdout. 54885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan If False, both stdout and stderr are ignored. 54985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan universal_newlines: Use universal_newlines flag (default: True). 55085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 55185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 55285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Tuple (output, return code) 55385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 55485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info("Running %s", command) 55585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, 55685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan shell=use_shell, universal_newlines=universal_newlines) 55785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if print_output: 55885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan output_array = [] 55985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan while True: 56085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan line = p.stdout.readline() 56185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not line: 56285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan break 56385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print line.strip("\n") 56485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan output_array.append(line) 56585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan output = "".join(output_array) 56685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 56785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan output = p.stdout.read() 56885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan p.wait() 56985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan errout = p.stderr.read() 57085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if print_output and errout: 57185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print >>sys.stderr, errout 57285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan p.stdout.close() 57385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan p.stderr.close() 57485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return output, p.returncode 57585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 57685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 57785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef RunShell(command, silent_ok=False, universal_newlines=True, 57885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print_output=False): 57985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan data, retcode = RunShellWithReturnCode(command, print_output, 58085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan universal_newlines) 58185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if retcode: 58285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("Got error status from %s:\n%s" % (command, data)) 58385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not silent_ok and not data: 58485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("No output from %s" % command) 58585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return data 58685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 58785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 58885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanclass VersionControlSystem(object): 58985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Abstract base class providing an interface to the VCS.""" 59085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 59185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def __init__(self, options): 59285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Constructor. 59385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 59485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 59585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan options: Command line options. 59685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 59785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.options = options 59885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 59985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GenerateDiff(self, args): 60085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Return the current diff as a string. 60185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 60285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 60385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan args: Extra arguments to pass to the diff command. 60485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 60585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise NotImplementedError( 60685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "abstract method -- subclass %s must override" % self.__class__) 60785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 60885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GetUnknownFiles(self): 60985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Return a list of files unknown to the VCS.""" 61085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise NotImplementedError( 61185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "abstract method -- subclass %s must override" % self.__class__) 61285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 61385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def CheckForUnknownFiles(self): 61485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Show an "are you sure?" prompt if there are unknown files.""" 61585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan unknown_files = self.GetUnknownFiles() 61685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if unknown_files: 61785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print "The following files are not added to version control:" 61885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for line in unknown_files: 61985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print line 62085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan prompt = "Are you sure to continue?(y/N) " 62185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan answer = raw_input(prompt).strip() 62285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if answer != "y": 62385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("User aborted") 62485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 62585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GetBaseFile(self, filename): 62685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Get the content of the upstream version of a file. 62785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 62885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 62985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan A tuple (base_content, new_content, is_binary, status) 63085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content: The contents of the base file. 63185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_content: For text files, this is empty. For binary files, this is 63285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan the contents of the new file, since the diff output won't contain 63385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan information to reconstruct the current file. 63485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan is_binary: True iff the file is binary. 63585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status: The status of the file. 63685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 63785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 63885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise NotImplementedError( 63985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "abstract method -- subclass %s must override" % self.__class__) 64085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 64185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 64285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GetBaseFiles(self, diff): 64385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Helper that calls GetBase file for each file in the patch. 64485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 64585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 64685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan A dictionary that maps from filename to GetBaseFile's tuple. Filenames 64785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan are retrieved based on lines that start with "Index:" or 64885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "Property changes on:". 64985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 65085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan files = {} 65185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for line in diff.splitlines(True): 65285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if line.startswith('Index:') or line.startswith('Property changes on:'): 65385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan unused, filename = line.split(':', 1) 65485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # On Windows if a file has property changes its filename uses '\' 65585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # instead of '/'. 65685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan filename = filename.strip().replace('\\', '/') 65785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan files[filename] = self.GetBaseFile(filename) 65885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return files 65985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 66085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 66185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def UploadBaseFiles(self, issue, rpc_server, patch_list, patchset, options, 66285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan files): 66385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Uploads the base files (and if necessary, the current ones as well).""" 66485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 66585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def UploadFile(filename, file_id, content, is_binary, status, is_base): 66685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Uploads a file to the server.""" 66785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan file_too_large = False 66885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if is_base: 66985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan type = "base" 67085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 67185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan type = "current" 67285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if len(content) > MAX_UPLOAD_SIZE: 67385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print ("Not uploading the %s file for %s because it's too large." % 67485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan (type, filename)) 67585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan file_too_large = True 67685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan content = "" 67785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan checksum = md5.new(content).hexdigest() 67885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if options.verbose > 0 and not file_too_large: 67985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print "Uploading %s file for %s" % (type, filename) 68085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url = "/%d/upload_content/%d/%d" % (int(issue), int(patchset), file_id) 68185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields = [("filename", filename), 68285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ("status", status), 68385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ("checksum", checksum), 68485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ("is_binary", str(is_binary)), 68585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ("is_current", str(not is_base)), 68685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ] 68785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if file_too_large: 68885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("file_too_large", "1")) 68985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if options.email: 69085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("user", options.email)) 69185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ctype, body = EncodeMultipartFormData(form_fields, 69285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan [("data", filename, content)]) 69385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response_body = rpc_server.Send(url, body, 69485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan content_type=ctype) 69585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not response_body.startswith("OK"): 69685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan StatusUpdate(" --> %s" % response_body) 69785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan sys.exit(1) 69885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 69985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan patches = dict() 70085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan [patches.setdefault(v, k) for k, v in patch_list] 70185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for filename in patches.keys(): 70285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content, new_content, is_binary, status = files[filename] 70385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan file_id_str = patches.get(filename) 70485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if file_id_str.find("nobase") != -1: 70585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = None 70685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan file_id_str = file_id_str[file_id_str.rfind("_") + 1:] 70785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan file_id = int(file_id_str) 70885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if base_content != None: 70985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan UploadFile(filename, file_id, base_content, is_binary, status, True) 71085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if new_content != None: 71185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan UploadFile(filename, file_id, new_content, is_binary, status, False) 71285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 71385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def IsImage(self, filename): 71485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Returns true if the filename has an image extension.""" 71585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan mimetype = mimetypes.guess_type(filename)[0] 71685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not mimetype: 71785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return False 71885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return mimetype.startswith("image/") 71985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 72085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 72185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanclass SubversionVCS(VersionControlSystem): 72285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Implementation of the VersionControlSystem interface for Subversion.""" 72385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 72485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def __init__(self, options): 72585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan super(SubversionVCS, self).__init__(options) 72685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.options.revision: 72785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan match = re.match(r"(\d+)(:(\d+))?", self.options.revision) 72885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not match: 72985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("Invalid Subversion revision %s." % self.options.revision) 73085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.rev_start = match.group(1) 73185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.rev_end = match.group(3) 73285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 73385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.rev_start = self.rev_end = None 73485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Cache output from "svn list -r REVNO dirname". 73585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Keys: dirname, Values: 2-tuple (ouput for start rev and end rev). 73685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.svnls_cache = {} 73785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # SVN base URL is required to fetch files deleted in an older revision. 73885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Result is cached to not guess it over and over again in GetBaseFile(). 73985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan required = self.options.download_base or self.options.revision is not None 74085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.svn_base = self._GuessBase(required) 74185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 74285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GuessBase(self, required): 74385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Wrapper for _GuessBase.""" 74485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return self.svn_base 74585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 74685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def _GuessBase(self, required): 74785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Returns the SVN base URL. 74885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 74985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 75085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan required: If true, exits if the url can't be guessed, otherwise None is 75185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan returned. 75285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 75385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan info = RunShell(["svn", "info"]) 75485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for line in info.splitlines(): 75585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan words = line.split() 75685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if len(words) == 2 and words[0] == "URL:": 75785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url = words[1] 75885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan scheme, netloc, path, params, query, fragment = urlparse.urlparse(url) 75985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan username, netloc = urllib.splituser(netloc) 76085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if username: 76185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info("Removed username from base URL") 76285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if netloc.endswith("svn.python.org"): 76385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if netloc == "svn.python.org": 76485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if path.startswith("/projects/"): 76585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan path = path[9:] 76685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan elif netloc != "pythondev@svn.python.org": 76785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("Unrecognized Python URL: %s" % url) 76885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base = "http://svn.python.org/view/*checkout*%s/" % path 76985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info("Guessed Python base = %s", base) 77085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan elif netloc.endswith("svn.collab.net"): 77185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if path.startswith("/repos/"): 77285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan path = path[6:] 77385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base = "http://svn.collab.net/viewvc/*checkout*%s/" % path 77485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info("Guessed CollabNet base = %s", base) 77585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan elif netloc.endswith(".googlecode.com"): 77685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan path = path + "/" 77785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base = urlparse.urlunparse(("http", netloc, path, params, 77885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan query, fragment)) 77985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info("Guessed Google Code base = %s", base) 78085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 78185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan path = path + "/" 78285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base = urlparse.urlunparse((scheme, netloc, path, params, 78385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan query, fragment)) 78485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info("Guessed base = %s", base) 78585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return base 78685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if required: 78785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("Can't find URL in output from svn info") 78885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return None 78985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 79085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GenerateDiff(self, args): 79185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan cmd = ["svn", "diff"] 79285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.options.revision: 79385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan cmd += ["-r", self.options.revision] 79485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan cmd.extend(args) 79585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan data = RunShell(cmd) 79685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan count = 0 79785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for line in data.splitlines(): 79885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if line.startswith("Index:") or line.startswith("Property changes on:"): 79985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan count += 1 80085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info(line) 80185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not count: 80285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("No valid patches found in output from svn diff") 80385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return data 80485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 80585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def _CollapseKeywords(self, content, keyword_str): 80685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Collapses SVN keywords.""" 80785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # svn cat translates keywords but svn diff doesn't. As a result of this 80885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # behavior patching.PatchChunks() fails with a chunk mismatch error. 80985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # This part was originally written by the Review Board development team 81085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # who had the same problem (http://reviews.review-board.org/r/276/). 81185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Mapping of keywords to known aliases 81285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan svn_keywords = { 81385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Standard keywords 81485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 'Date': ['Date', 'LastChangedDate'], 81585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 'Revision': ['Revision', 'LastChangedRevision', 'Rev'], 81685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 'Author': ['Author', 'LastChangedBy'], 81785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 'HeadURL': ['HeadURL', 'URL'], 81885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 'Id': ['Id'], 81985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 82085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Aliases 82185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 'LastChangedDate': ['LastChangedDate', 'Date'], 82285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 'LastChangedRevision': ['LastChangedRevision', 'Rev', 'Revision'], 82385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 'LastChangedBy': ['LastChangedBy', 'Author'], 82485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 'URL': ['URL', 'HeadURL'], 82585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan } 82685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 82785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def repl(m): 82885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if m.group(2): 82985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return "$%s::%s$" % (m.group(1), " " * len(m.group(3))) 83085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return "$%s$" % m.group(1) 83185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan keywords = [keyword 83285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for name in keyword_str.split(" ") 83385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for keyword in svn_keywords.get(name, [])] 83485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return re.sub(r"\$(%s):(:?)([^\$]+)\$" % '|'.join(keywords), repl, content) 83585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 83685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GetUnknownFiles(self): 83785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = RunShell(["svn", "status", "--ignore-externals"], silent_ok=True) 83885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan unknown_files = [] 83985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for line in status.split("\n"): 84085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if line and line[0] == "?": 84185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan unknown_files.append(line) 84285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return unknown_files 84385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 84485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def ReadFile(self, filename): 84585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Returns the contents of a file.""" 84685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan file = open(filename, 'rb') 84785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan result = "" 84885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 84985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan result = file.read() 85085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan finally: 85185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan file.close() 85285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return result 85385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 85485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GetStatus(self, filename): 85585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Returns the status of a file.""" 85685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not self.options.revision: 85785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = RunShell(["svn", "status", "--ignore-externals", filename]) 85885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not status: 85985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("svn status returned no output for %s" % filename) 86085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status_lines = status.splitlines() 86185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # If file is in a cl, the output will begin with 86285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # "\n--- Changelist 'cl_name':\n". See 86385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # http://svn.collab.net/repos/svn/trunk/notes/changelist-design.txt 86485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if (len(status_lines) == 3 and 86585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan not status_lines[0] and 86685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status_lines[1].startswith("--- Changelist")): 86785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = status_lines[2] 86885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 86985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = status_lines[0] 87085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # If we have a revision to diff against we need to run "svn list" 87185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # for the old and the new revision and compare the results to get 87285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # the correct status for a file. 87385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 87485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan dirname, relfilename = os.path.split(filename) 87585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if dirname not in self.svnls_cache: 87685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan cmd = ["svn", "list", "-r", self.rev_start, dirname or "."] 87785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan out, returncode = RunShellWithReturnCode(cmd) 87885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if returncode: 87985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("Failed to get status for %s." % filename) 88085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan old_files = out.splitlines() 88185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan args = ["svn", "list"] 88285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.rev_end: 88385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan args += ["-r", self.rev_end] 88485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan cmd = args + [dirname or "."] 88585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan out, returncode = RunShellWithReturnCode(cmd) 88685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if returncode: 88785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("Failed to run command %s" % cmd) 88885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.svnls_cache[dirname] = (old_files, out.splitlines()) 88985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan old_files, new_files = self.svnls_cache[dirname] 89085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if relfilename in old_files and relfilename not in new_files: 89185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = "D " 89285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan elif relfilename in old_files and relfilename in new_files: 89385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = "M " 89485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 89585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = "A " 89685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return status 89785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 89885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GetBaseFile(self, filename): 89985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = self.GetStatus(filename) 90085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = None 90185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_content = None 90285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 90385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # If a file is copied its status will be "A +", which signifies 90485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # "addition-with-history". See "svn st" for more information. We need to 90585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # upload the original file or else diff parsing will fail if the file was 90685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # edited. 90785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if status[0] == "A" and status[3] != "+": 90885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # We'll need to upload the new content if we're adding a binary file 90985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # since diff's output won't contain it. 91085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan mimetype = RunShell(["svn", "propget", "svn:mime-type", filename], 91185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan silent_ok=True) 91285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = "" 91385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan is_binary = mimetype and not mimetype.startswith("text/") 91485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if is_binary and self.IsImage(filename): 91585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_content = self.ReadFile(filename) 91685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan elif (status[0] in ("M", "D", "R") or 91785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan (status[0] == "A" and status[3] == "+") or # Copied file. 91885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan (status[0] == " " and status[1] == "M")): # Property change. 91985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan args = [] 92085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.options.revision: 92185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start) 92285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 92385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Don't change filename, it's needed later. 92485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url = filename 92585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan args += ["-r", "BASE"] 92685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan cmd = ["svn"] + args + ["propget", "svn:mime-type", url] 92785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan mimetype, returncode = RunShellWithReturnCode(cmd) 92885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if returncode: 92985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # File does not exist in the requested revision. 93085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Reset mimetype, it contains an error message. 93185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan mimetype = "" 93285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan get_base = False 93385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan is_binary = mimetype and not mimetype.startswith("text/") 93485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if status[0] == " ": 93585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Empty base content just to force an upload. 93685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = "" 93785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan elif is_binary: 93885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.IsImage(filename): 93985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan get_base = True 94085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if status[0] == "M": 94185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not self.rev_end: 94285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_content = self.ReadFile(filename) 94385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 94485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url = "%s/%s@%s" % (self.svn_base, filename, self.rev_end) 94585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_content = RunShell(["svn", "cat", url], 94685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan universal_newlines=True, silent_ok=True) 94785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 94885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = "" 94985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 95085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan get_base = True 95185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 95285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if get_base: 95385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if is_binary: 95485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan universal_newlines = False 95585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 95685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan universal_newlines = True 95785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.rev_start: 95885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # "svn cat -r REV delete_file.txt" doesn't work. cat requires 95985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # the full URL with "@REV" appended instead of using "-r" option. 96085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start) 96185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = RunShell(["svn", "cat", url], 96285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan universal_newlines=universal_newlines, 96385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan silent_ok=True) 96485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 96585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = RunShell(["svn", "cat", filename], 96685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan universal_newlines=universal_newlines, 96785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan silent_ok=True) 96885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not is_binary: 96985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan args = [] 97085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.rev_start: 97185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start) 97285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 97385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url = filename 97485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan args += ["-r", "BASE"] 97585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan cmd = ["svn"] + args + ["propget", "svn:keywords", url] 97685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan keywords, returncode = RunShellWithReturnCode(cmd) 97785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if keywords and not returncode: 97885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = self._CollapseKeywords(base_content, keywords) 97985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 98085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan StatusUpdate("svn status returned unexpected output: %s" % status) 98185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan sys.exit(1) 98285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return base_content, new_content, is_binary, status[0:5] 98385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 98485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 98585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanclass GitVCS(VersionControlSystem): 98685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Implementation of the VersionControlSystem interface for Git.""" 98785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 98885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def __init__(self, options): 98985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan super(GitVCS, self).__init__(options) 99085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Map of filename -> hash of base file. 99185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.base_hashes = {} 99285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 99385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GenerateDiff(self, extra_args): 99485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # This is more complicated than svn's GenerateDiff because we must convert 99585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # the diff output to include an svn-style "Index:" line as well as record 99685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # the hashes of the base files, so we can upload them along with our diff. 99785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.options.revision: 99885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan extra_args = [self.options.revision] + extra_args 99985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan gitdiff = RunShell(["git", "diff", "--full-index"] + extra_args) 100085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan svndiff = [] 100185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan filecount = 0 100285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan filename = None 100385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for line in gitdiff.splitlines(): 100485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan match = re.match(r"diff --git a/(.*) b/.*$", line) 100585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if match: 100685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan filecount += 1 100785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan filename = match.group(1) 100885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan svndiff.append("Index: %s\n" % filename) 100985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 101085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # The "index" line in a git diff looks like this (long hashes elided): 101185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # index 82c0d44..b2cee3f 100755 101285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # We want to save the left hash, as that identifies the base file. 101385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan match = re.match(r"index (\w+)\.\.", line) 101485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if match: 101585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.base_hashes[filename] = match.group(1) 101685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan svndiff.append(line + "\n") 101785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not filecount: 101885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("No valid patches found in output from git diff") 101985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return "".join(svndiff) 102085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 102185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GetUnknownFiles(self): 102285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = RunShell(["git", "ls-files", "--exclude-standard", "--others"], 102385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan silent_ok=True) 102485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return status.splitlines() 102585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 102685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GetBaseFile(self, filename): 102785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan hash = self.base_hashes[filename] 102885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = None 102985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_content = None 103085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan is_binary = False 103185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if hash == "0" * 40: # All-zero hash indicates no base file. 103285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = "A" 103385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = "" 103485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 103585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = "M" 103685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content, returncode = RunShellWithReturnCode(["git", "show", hash]) 103785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if returncode: 103885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("Got error status from 'git show %s'" % hash) 103985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return (base_content, new_content, is_binary, status) 104085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 104185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 104285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanclass MercurialVCS(VersionControlSystem): 104385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Implementation of the VersionControlSystem interface for Mercurial.""" 104485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 104585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def __init__(self, options, repo_dir): 104685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan super(MercurialVCS, self).__init__(options) 104785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Absolute path to repository (we can be in a subdir) 104885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.repo_dir = os.path.normpath(repo_dir) 104985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Compute the subdir 105085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan cwd = os.path.normpath(os.getcwd()) 105185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan assert cwd.startswith(self.repo_dir) 105285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.subdir = cwd[len(self.repo_dir):].lstrip(r"\/") 105385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if self.options.revision: 105485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.base_rev = self.options.revision 105585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 105685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan self.base_rev = RunShell(["hg", "parent", "-q"]).split(':')[1].strip() 105785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 105885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def _GetRelPath(self, filename): 105985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Get relative path of a file according to the current directory, 106085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan given its logical path in the repo.""" 106185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan assert filename.startswith(self.subdir), filename 106285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return filename[len(self.subdir):].lstrip(r"\/") 106385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 106485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GenerateDiff(self, extra_args): 106585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # If no file specified, restrict to the current subdir 106685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan extra_args = extra_args or ["."] 106785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan cmd = ["hg", "diff", "--git", "-r", self.base_rev] + extra_args 106885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan data = RunShell(cmd, silent_ok=True) 106985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan svndiff = [] 107085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan filecount = 0 107185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for line in data.splitlines(): 107285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan m = re.match("diff --git a/(\S+) b/(\S+)", line) 107385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if m: 107485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Modify line to make it look like as it comes from svn diff. 107585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # With this modification no changes on the server side are required 107685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # to make upload.py work with Mercurial repos. 107785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # NOTE: for proper handling of moved/copied files, we have to use 107885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # the second filename. 107985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan filename = m.group(2) 108085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan svndiff.append("Index: %s" % filename) 108185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan svndiff.append("=" * 67) 108285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan filecount += 1 108385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info(line) 108485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 108585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan svndiff.append(line) 108685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not filecount: 108785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("No valid patches found in output from hg diff") 108885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return "\n".join(svndiff) + "\n" 108985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 109085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GetUnknownFiles(self): 109185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Return a list of files unknown to the VCS.""" 109285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan args = [] 109385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = RunShell(["hg", "status", "--rev", self.base_rev, "-u", "."], 109485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan silent_ok=True) 109585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan unknown_files = [] 109685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for line in status.splitlines(): 109785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan st, fn = line.split(" ", 1) 109885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if st == "?": 109985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan unknown_files.append(fn) 110085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return unknown_files 110185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 110285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan def GetBaseFile(self, filename): 110385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # "hg status" and "hg cat" both take a path relative to the current subdir 110485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # rather than to the repo root, but "hg diff" has given us the full path 110585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # to the repo root. 110685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = "" 110785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_content = None 110885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan is_binary = False 110985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan oldrelpath = relpath = self._GetRelPath(filename) 111085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # "hg status -C" returns two lines for moved/copied files, one otherwise 111185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan out = RunShell(["hg", "status", "-C", "--rev", self.base_rev, relpath]) 111285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan out = out.splitlines() 111385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # HACK: strip error message about missing file/directory if it isn't in 111485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # the working copy 111585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if out[0].startswith('%s: ' % relpath): 111685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan out = out[1:] 111785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if len(out) > 1: 111885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Moved/copied => considered as modified, use old filename to 111985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # retrieve base contents 112085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan oldrelpath = out[1].strip() 112185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status = "M" 112285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 112385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan status, _ = out[0].split(' ', 1) 112485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if status != "A": 112585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = RunShell(["hg", "cat", "-r", self.base_rev, oldrelpath], 112685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan silent_ok=True) 112785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan is_binary = "\0" in base_content # Mercurial's heuristic 112885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if status != "R": 112985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_content = open(relpath, "rb").read() 113085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan is_binary = is_binary or "\0" in new_content 113185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if is_binary and base_content: 113285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Fetch again without converting newlines 113385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_content = RunShell(["hg", "cat", "-r", self.base_rev, oldrelpath], 113485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan silent_ok=True, universal_newlines=False) 113585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not is_binary or not self.IsImage(relpath): 113685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_content = None 113785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return base_content, new_content, is_binary, status 113885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 113985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 114085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan# NOTE: The SplitPatch function is duplicated in engine.py, keep them in sync. 114185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef SplitPatch(data): 114285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Splits a patch into separate pieces for each file. 114385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 114485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 114585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan data: A string containing the output of svn diff. 114685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 114785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 114885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan A list of 2-tuple (filename, text) where text is the svn diff output 114985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan pertaining to filename. 115085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 115185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan patches = [] 115285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan filename = None 115385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan diff = [] 115485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for line in data.splitlines(True): 115585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_filename = None 115685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if line.startswith('Index:'): 115785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan unused, new_filename = line.split(':', 1) 115885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_filename = new_filename.strip() 115985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan elif line.startswith('Property changes on:'): 116085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan unused, temp_filename = line.split(':', 1) 116185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # When a file is modified, paths use '/' between directories, however 116285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # when a property is modified '\' is used on Windows. Make them the same 116385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # otherwise the file shows up twice. 116485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan temp_filename = temp_filename.strip().replace('\\', '/') 116585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if temp_filename != filename: 116685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # File has property changes but no modifications, create a new diff. 116785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan new_filename = temp_filename 116885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if new_filename: 116985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if filename and diff: 117085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan patches.append((filename, ''.join(diff))) 117185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan filename = new_filename 117285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan diff = [line] 117385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan continue 117485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if diff is not None: 117585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan diff.append(line) 117685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if filename and diff: 117785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan patches.append((filename, ''.join(diff))) 117885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return patches 117985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 118085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 118185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef UploadSeparatePatches(issue, rpc_server, patchset, data, options): 118285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Uploads a separate patch for each file in the diff output. 118385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 118485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns a list of [patch_key, filename] for each file. 118585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 118685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan patches = SplitPatch(data) 118785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan rv = [] 118885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for patch in patches: 118985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if len(patch[1]) > MAX_UPLOAD_SIZE: 119085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print ("Not uploading the patch for " + patch[0] + 119185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan " because the file is too large.") 119285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan continue 119385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields = [("filename", patch[0])] 119485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not options.download_base: 119585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("content_upload", "1")) 119685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan files = [("data", "data.diff", patch[1])] 119785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ctype, body = EncodeMultipartFormData(form_fields, files) 119885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan url = "/%d/upload_patch/%d" % (int(issue), int(patchset)) 119985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print "Uploading patch for " + patch[0] 120085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response_body = rpc_server.Send(url, body, content_type=ctype) 120185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines = response_body.splitlines() 120285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not lines or lines[0] != "OK": 120385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan StatusUpdate(" --> %s" % response_body) 120485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan sys.exit(1) 120585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan rv.append([lines[1], patch[0]]) 120685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return rv 120785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 120885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 120985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef GuessVCS(options): 121085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """Helper to guess the version control system. 121185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 121285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan This examines the current directory, guesses which VersionControlSystem 121385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan we're using, and returns an instance of the appropriate class. Exit with an 121485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan error if we can't figure it out. 121585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 121685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 121785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan A VersionControlSystem instance. Exits if the VCS can't be guessed. 121885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 121985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Mercurial has a command to get the base directory of a repository 122085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Try running it, but don't die if we don't have hg installed. 122185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # NOTE: we try Mercurial first as it can sit on top of an SVN working copy. 122285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 122385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan out, returncode = RunShellWithReturnCode(["hg", "root"]) 122485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if returncode == 0: 122585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return MercurialVCS(options, out.strip()) 122685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan except OSError, (errno, message): 122785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if errno != 2: # ENOENT -- they don't have hg installed. 122885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise 122985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 123085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Subversion has a .svn in all working directories. 123185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if os.path.isdir('.svn'): 123285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info("Guessed VCS = Subversion") 123385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return SubversionVCS(options) 123485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 123585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Git has a command to test if you're in a git tree. 123685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Try running it, but don't die if we don't have git installed. 123785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 123885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan out, returncode = RunShellWithReturnCode(["git", "rev-parse", 123985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "--is-inside-work-tree"]) 124085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if returncode == 0: 124185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return GitVCS(options) 124285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan except OSError, (errno, message): 124385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if errno != 2: # ENOENT -- they don't have git installed. 124485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan raise 124585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 124685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit(("Could not guess version control system. " 124785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "Are you in a working copy directory?")) 124885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 124985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 125085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef RealMain(argv, data=None): 125185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """The real main function. 125285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 125385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Args: 125485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan argv: Command line arguments. 125585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan data: Diff contents. If None (default) the diff is generated by 125685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan the VersionControlSystem implementation returned by GuessVCS(). 125785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 125885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan Returns: 125985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan A 2-tuple (issue id, patchset id). 126085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan The patchset id is None if the base files are not uploaded by this 126185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan script (applies only to SVN checkouts). 126285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan """ 126385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.basicConfig(format=("%(asctime).19s %(levelname)s %(filename)s:" 126485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan "%(lineno)s %(message)s ")) 126585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan os.environ['LC_ALL'] = 'C' 126685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan options, args = parser.parse_args(argv[1:]) 126785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan global verbosity 126885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan verbosity = options.verbose 126985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if verbosity >= 3: 127085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.getLogger().setLevel(logging.DEBUG) 127185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan elif verbosity >= 2: 127285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.getLogger().setLevel(logging.INFO) 127385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan vcs = GuessVCS(options) 127485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if isinstance(vcs, SubversionVCS): 127585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # base field is only allowed for Subversion. 127685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Note: Fetching base files may become deprecated in future releases. 127785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base = vcs.GuessBase(options.download_base) 127885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 127985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base = None 128085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not base and options.download_base: 128185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan options.download_base = True 128285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan logging.info("Enabled upload of base file") 128385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not options.assume_yes: 128485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan vcs.CheckForUnknownFiles() 128585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if data is None: 128685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan data = vcs.GenerateDiff(args) 128785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan files = vcs.GetBaseFiles(data) 128885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if verbosity >= 1: 128985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print "Upload server:", options.server, "(change with -s/--server)" 129085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if options.issue: 129185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan prompt = "Message describing this patch set: " 129285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 129385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan prompt = "New issue subject: " 129485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan message = options.message or raw_input(prompt).strip() 129585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not message: 129685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("A non-empty message is required") 129785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan rpc_server = GetRpcServer(options) 129885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields = [("subject", message)] 129985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if base: 130085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("base", base)) 130185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if options.issue: 130285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("issue", str(options.issue))) 130385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if options.email: 130485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("user", options.email)) 130585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if options.reviewers: 130685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for reviewer in options.reviewers.split(','): 130785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if "@" in reviewer and not reviewer.split("@")[1].count(".") == 1: 130885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("Invalid email address: %s" % reviewer) 130985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("reviewers", options.reviewers)) 131085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if options.cc: 131185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for cc in options.cc.split(','): 131285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if "@" in cc and not cc.split("@")[1].count(".") == 1: 131385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("Invalid email address: %s" % cc) 131485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("cc", options.cc)) 131585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan description = options.description 131685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if options.description_file: 131785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if options.description: 131885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ErrorExit("Can't specify description and description_file") 131985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan file = open(options.description_file, 'r') 132085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan description = file.read() 132185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan file.close() 132285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if description: 132385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("description", description)) 132485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # Send a hash of all the base file so the server can determine if a copy 132585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # already exists in an earlier patchset. 132685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_hashes = "" 132785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan for file, info in files.iteritems(): 132885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not info[0] is None: 132985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan checksum = md5.new(info[0]).hexdigest() 133085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if base_hashes: 133185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_hashes += "|" 133285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan base_hashes += checksum + ":" + file 133385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("base_hashes", base_hashes)) 133485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # If we're uploading base files, don't send the email before the uploads, so 133585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan # that it contains the file status. 133685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if options.send_mail and options.download_base: 133785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("send_mail", "1")) 133885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not options.download_base: 133985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("content_upload", "1")) 134085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if len(data) > MAX_UPLOAD_SIZE: 134185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print "Patch is large, so uploading file patches separately." 134285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan uploaded_diff_file = [] 134385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan form_fields.append(("separate_patches", "1")) 134485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 134585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan uploaded_diff_file = [("data", "data.diff", data)] 134685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan ctype, body = EncodeMultipartFormData(form_fields, uploaded_diff_file) 134785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan response_body = rpc_server.Send("/upload", body, content_type=ctype) 134885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan patchset = None 134985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not options.download_base or not uploaded_diff_file: 135085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan lines = response_body.splitlines() 135185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if len(lines) >= 2: 135285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan msg = lines[0] 135385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan patchset = lines[1].strip() 135485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan patches = [x.split(" ", 1) for x in lines[2:]] 135585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 135685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan msg = response_body 135785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan else: 135885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan msg = response_body 135985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan StatusUpdate(msg) 136085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not response_body.startswith("Issue created.") and \ 136185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan not response_body.startswith("Issue updated."): 136285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan sys.exit(0) 136385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan issue = msg[msg.rfind("/")+1:] 136485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 136585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not uploaded_diff_file: 136685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan result = UploadSeparatePatches(issue, rpc_server, patchset, data, options) 136785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not options.download_base: 136885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan patches = result 136985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 137085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if not options.download_base: 137185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan vcs.UploadBaseFiles(issue, rpc_server, patches, patchset, options, files) 137285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan if options.send_mail: 137385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan rpc_server.Send("/" + issue + "/mail", payload="") 137485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan return issue, patchset 137585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 137685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 137785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wandef main(): 137885e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan try: 137985e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan RealMain(sys.argv) 138085e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan except KeyboardInterrupt: 138185e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan print 138285e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan StatusUpdate("Interrupted.") 138385e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan sys.exit(1) 138485e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 138585e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan 138685e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wanif __name__ == "__main__": 138785e2abe9c5c58a76688af1a73d317b58ba39fd38zhanyong.wan main() 1388