# Copyright (c) 2009, 2010, 2011 Google Inc. All rights reserved. # Copyright (c) 2009 Apple Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: # # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above # copyright notice, this list of conditions and the following disclaimer # in the documentation and/or other materials provided with the # distribution. # * Neither the name of Google Inc. nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import datetime import logging import os import re # This import isn't used, but it's needed for the # path_to_module('webkitpy.common.config') call in create_patch. import webkitpy.common.config from webkitpy.common.checkout.scm.scm import SCM from webkitpy.common.memoized import memoized from webkitpy.common.system.executive import Executive, ScriptError _log = logging.getLogger(__name__) class AmbiguousCommitError(Exception): def __init__(self, num_local_commits, has_working_directory_changes): Exception.__init__(self, "Found %s local commits and the working directory is %s" % ( num_local_commits, ["clean", "not clean"][has_working_directory_changes])) self.num_local_commits = num_local_commits self.has_working_directory_changes = has_working_directory_changes class Git(SCM): # Git doesn't appear to document error codes, but seems to return # 1 or 128, mostly. ERROR_FILE_IS_MISSING = 128 executable_name = 'git' def __init__(self, cwd, **kwargs): SCM.__init__(self, cwd, **kwargs) def _run_git(self, command_args, **kwargs): full_command_args = [self.executable_name] + command_args full_kwargs = kwargs if not 'cwd' in full_kwargs: full_kwargs['cwd'] = self.checkout_root return self._run(full_command_args, **full_kwargs) @classmethod def in_working_directory(cls, path, executive=None): try: executive = executive or Executive() return executive.run_command([cls.executable_name, 'rev-parse', '--is-inside-work-tree'], cwd=path, error_handler=Executive.ignore_error).rstrip() == "true" except OSError, e: # The Windows bots seem to through a WindowsError when git isn't installed. return False def find_checkout_root(self, path): # "git rev-parse --show-cdup" would be another way to get to the root checkout_root = self._run_git(['rev-parse', '--show-toplevel'], cwd=(path or "./")).strip() if not self._filesystem.isabs(checkout_root): # Sometimes git returns relative paths checkout_root = self._filesystem.join(path, checkout_root) return checkout_root @classmethod def read_git_config(cls, key, cwd=None, executive=None): # FIXME: This should probably use cwd=self.checkout_root. # Pass --get-all for cases where the config has multiple values # Pass the cwd if provided so that we can handle the case of running webkit-patch outside of the working directory. # FIXME: This should use an Executive. executive = executive or Executive() return executive.run_command([cls.executable_name, "config", "--get-all", key], error_handler=Executive.ignore_error, cwd=cwd).rstrip('\n') def _discard_local_commits(self): self._run_git(['reset', '--hard', self._remote_branch_ref()]) def _local_commits(self, ref='HEAD'): return self._run_git(['log', '--pretty=oneline', ref + '...' + self._remote_branch_ref()]).splitlines() def _rebase_in_progress(self): return self._filesystem.exists(self.absolute_path(self._filesystem.join('.git', 'rebase-apply'))) def has_working_directory_changes(self): return self._run_git(['diff', 'HEAD', '--no-renames', '--name-only']) != "" def _discard_working_directory_changes(self): # Could run git clean here too, but that wouldn't match subversion self._run_git(['reset', 'HEAD', '--hard']) # Aborting rebase even though this does not match subversion if self._rebase_in_progress(): self._run_git(['rebase', '--abort']) def status_command(self): # git status returns non-zero when there are changes, so we use git diff name --name-status HEAD instead. # No file contents printed, thus utf-8 autodecoding in self.run is fine. return [self.executable_name, "diff", "--name-status", "--no-renames", "HEAD"] def _status_regexp(self, expected_types): return '^(?P[%s])\t(?P.+)$' % expected_types def add_list(self, paths, return_exit_code=False, recurse=True): return self._run_git(["add"] + paths, return_exit_code=return_exit_code) def delete_list(self, paths): return self._run_git(["rm", "-f"] + paths) def move(self, origin, destination): return self._run_git(["mv", "-f", origin, destination]) def exists(self, path): return_code = self._run_git(["show", "HEAD:%s" % path], return_exit_code=True, decode_output=False) return return_code != self.ERROR_FILE_IS_MISSING def _branch_from_ref(self, ref): return ref.replace('refs/heads/', '') def current_branch(self): return self._branch_from_ref(self._run_git(['symbolic-ref', '-q', 'HEAD']).strip()) def _upstream_branch(self): current_branch = self.current_branch() # If the remote is pointing to something other than "." than the upstream branch isn't a local branch. if self.read_git_config('branch.%s.remote' % current_branch, cwd=self.checkout_root, executive=self._executive) != ".": return None return self._branch_from_ref(self.read_git_config('branch.%s.merge' % current_branch, cwd=self.checkout_root, executive=self._executive).strip()) def _merge_base(self, git_commit=None): if git_commit: # Rewrite UPSTREAM to the upstream branch if 'UPSTREAM' in git_commit: upstream = self._upstream_branch() if not upstream: raise ScriptError(message='No upstream/tracking branch set.') git_commit = git_commit.replace('UPSTREAM', upstream) # Special-case .. to include working copy changes, e.g., 'HEAD....' shows only the diffs from HEAD. if git_commit.endswith('....'): return git_commit[:-4] if '..' not in git_commit: git_commit = git_commit + "^.." + git_commit return git_commit upstream = self._upstream_branch() if upstream: return upstream return self._remote_merge_base() def changed_files(self, git_commit=None): # FIXME: --diff-filter could be used to avoid the "extract_filenames" step. status_command = [self.executable_name, 'diff', '-r', '--name-status', "--no-renames", "--no-ext-diff", "--full-index", self._merge_base(git_commit)] # FIXME: I'm not sure we're returning the same set of files that SVN.changed_files is. # Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R) return self._run_status_and_extract_filenames(status_command, self._status_regexp("ADM")) def _added_files(self): return self._run_status_and_extract_filenames(self.status_command(), self._status_regexp("A")) def _deleted_files(self): return self._run_status_and_extract_filenames(self.status_command(), self._status_regexp("D")) @staticmethod def supports_local_commits(): return True def display_name(self): return "git" def _most_recent_log_matching(self, grep_str, path): # We use '--grep=' + foo rather than '--grep', foo because # git 1.7.0.4 (and earlier) didn't support the separate arg. return self._run_git(['log', '-1', '--grep=' + grep_str, '--date=iso', self.find_checkout_root(path)]) def svn_revision(self, path): git_log = self._most_recent_log_matching('git-svn-id:', path) match = re.search("^\s*git-svn-id:.*@(?P\d+)\ ", git_log, re.MULTILINE) if not match: return "" return str(match.group('svn_revision')) def timestamp_of_revision(self, path, revision): git_log = self._most_recent_log_matching('git-svn-id:.*@%s' % revision, path) match = re.search("^Date:\s*(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2}) ([+-])(\d{2})(\d{2})$", git_log, re.MULTILINE) if not match: return "" # Manually modify the timezone since Git doesn't have an option to show it in UTC. # Git also truncates milliseconds but we're going to ignore that for now. time_with_timezone = datetime.datetime(int(match.group(1)), int(match.group(2)), int(match.group(3)), int(match.group(4)), int(match.group(5)), int(match.group(6)), 0) sign = 1 if match.group(7) == '+' else -1 time_without_timezone = time_with_timezone - datetime.timedelta(hours=sign * int(match.group(8)), minutes=int(match.group(9))) return time_without_timezone.strftime('%Y-%m-%dT%H:%M:%SZ') def _prepend_svn_revision(self, diff): revision = self._head_svn_revision() if not revision: return diff return "Subversion Revision: " + revision + '\n' + diff def create_patch(self, git_commit=None, changed_files=None): """Returns a byte array (str()) representing the patch file. Patch files are effectively binary since they may contain files of multiple different encodings.""" # Put code changes at the top of the patch and layout tests # at the bottom, this makes for easier reviewing. config_path = self._filesystem.dirname(self._filesystem.path_to_module('webkitpy.common.config')) order_file = self._filesystem.join(config_path, 'orderfile') order = "" if self._filesystem.exists(order_file): order = "-O%s" % order_file command = [self.executable_name, 'diff', '--binary', '--no-color', "--no-ext-diff", "--full-index", "--no-renames", order, self._merge_base(git_commit), "--"] if changed_files: command += changed_files return self._prepend_svn_revision(self._run(command, decode_output=False, cwd=self.checkout_root)) @memoized def svn_revision_from_git_commit(self, git_commit): # git svn find-rev always exits 0, even when the revision or commit is not found. try: return int(self._run_git(['svn', 'find-rev', git_commit]).rstrip()) except ValueError, e: return None def checkout_branch(self, name): self._run_git(['checkout', '-q', name]) def create_clean_branch(self, name): self._run_git(['checkout', '-q', '-b', name, self._remote_branch_ref()]) def blame(self, path): return self._run_git(['blame', path]) # Git-specific methods: def _branch_ref_exists(self, branch_ref): return self._run_git(['show-ref', '--quiet', '--verify', branch_ref], return_exit_code=True) == 0 def delete_branch(self, branch_name): if self._branch_ref_exists('refs/heads/' + branch_name): self._run_git(['branch', '-D', branch_name]) def _remote_merge_base(self): return self._run_git(['merge-base', self._remote_branch_ref(), 'HEAD']).strip() def _remote_branch_ref(self): # Use references so that we can avoid collisions, e.g. we don't want to operate on refs/heads/trunk if it exists. remote_branch_refs = self.read_git_config('svn-remote.svn.fetch', cwd=self.checkout_root, executive=self._executive) if not remote_branch_refs: remote_master_ref = 'refs/remotes/origin/master' if not self._branch_ref_exists(remote_master_ref): raise ScriptError(message="Can't find a branch to diff against. svn-remote.svn.fetch is not in the git config and %s does not exist" % remote_master_ref) return remote_master_ref # FIXME: What's the right behavior when there are multiple svn-remotes listed? # For now, just use the first one. first_remote_branch_ref = remote_branch_refs.split('\n')[0] return first_remote_branch_ref.split(':')[1] def commit_locally_with_message(self, message, commit_all_working_directory_changes=True): command = ['commit', '-F', '-'] if commit_all_working_directory_changes: command.insert(1, '--all') self._run_git(command, input=message) # These methods are git specific and are meant to provide support for the Git oriented workflow # that Blink is moving towards, hence there are no equivalent methods in the SVN class. def pull(self): self._run_git(['pull']) def latest_git_commit(self): return self._run_git(['log', '-1', '--format=%H']).strip() def git_commits_since(self, commit): return self._run_git(['log', commit + '..master', '--format=%H', '--reverse']).split() def git_commit_detail(self, commit, format=None): args = ['log', '-1', commit] if format: args.append('--format=' + format) return self._run_git(args) def _branch_tracking_remote_master(self): origin_info = self._run_git(['remote', 'show', 'origin', '-n']) match = re.search("^\s*(?P\S+)\s+merges with remote master$", origin_info, re.MULTILINE) if not match: raise ScriptError(message="Unable to find local branch tracking origin/master.") branch = str(match.group("branch_name")) return self._branch_from_ref(self._run_git(['rev-parse', '--symbolic-full-name', branch]).strip()) def is_cleanly_tracking_remote_master(self): if self.has_working_directory_changes(): return False if self.current_branch() != self._branch_tracking_remote_master(): return False if len(self._local_commits(self._branch_tracking_remote_master())) > 0: return False return True def ensure_cleanly_tracking_remote_master(self): self._discard_working_directory_changes() self._run_git(['checkout', '-q', self._branch_tracking_remote_master()]) self._discard_local_commits()