third_party/sqlite/scripts/sqlite_cherry_picker.py
def _cherry_pick_git_commit(self, commit_id):
        """Cherry-pick a given Git commit into the current branch."""
        cmd = ['git', 'cherry-pick', '-x', commit_id]
        if self._print_cmds:
            _print_command(' '.join(cmd))
        returncode = subprocess.call(cmd)
        # The manifest and manifest.uuid contain Fossil hashes. Restore to
        # HEAD version and update only when all conflicts have been resolved.
        comments = None
        self._take_head_version('manifest')
        self._take_head_version('manifest.uuid')
        for unmerged_file in Git.get_unmerged_changes():
            if CherryPicker._is_binary_file(unmerged_file):
                print('{} is a binary file, keeping branch version.'.format(
                    unmerged_file))
                self._take_head_version(unmerged_file)
                if not comments:
                    comments = [
                        'Cherry-pick notes', '=============================='
                    ]
                comments.append(
                    '{} is binary file (with conflict). Keeping branch version'
                    .format(unmerged_file))
        if comments:
            CherryPicker._append_cherry_pick_comments(comments)
        self.continue_cherry_pick()
Cherry-pick a given Git commit into the current branch.
Cherry-pick a given Git commit into the current branch.
Cherry - pick a given Git commit into the current branch .
def _cherry_pick_git_commit(self, commit_id):
        cmd = ['git', 'cherry-pick', '-x', commit_id]
        if self._print_cmds:
            _print_command(' '.join(cmd))
        returncode = subprocess.call(cmd)
        comments = None
        self._take_head_version('manifest')
        self._take_head_version('manifest.uuid')
        for unmerged_file in Git.get_unmerged_changes():
            if CherryPicker._is_binary_file(unmerged_file):
                print('{} is a binary file, keeping branch version.'.format(
                    unmerged_file))
                self._take_head_version(unmerged_file)
                if not comments:
                    comments = [
                        'Cherry-pick notes', '=============================='
                    ]
                comments.append(
                    '{} is binary file (with conflict). Keeping branch version'
                    .format(unmerged_file))
        if comments:
            CherryPicker._append_cherry_pick_comments(comments)
        self.continue_cherry_pick()
def _cherry_pick_git_commit ( self , commit_id ) : cmd = [ 'git' , 'cherry-pick' , '-x' , commit_id ] if self . _print_cmds : _print_command ( ' ' . join ( cmd ) ) returncode = subprocess . call ( cmd ) comments = None self . _take_head_version ( 'manifest' ) self . _take_head_version ( 'manifest.uuid' ) for unmerged_file in Git . get_unmerged_changes ( ) : if CherryPicker . _is_binary_file ( unmerged_file ) : print ( '{} is a binary file, keeping branch version.' . format ( unmerged_file ) ) self . _take_head_version ( unmerged_file ) if not comments : comments = [ 'Cherry-pick notes' , '==============================' ] comments . append ( '{} is binary file (with conflict). Keeping branch version' . format ( unmerged_file ) ) if comments : CherryPicker . _append_cherry_pick_comments ( comments ) self . continue_cherry_pick ( )
Cherry-pick a given Git commit into the current branch.
Cherry - pick a given Git commit into the current branch .
"""Cherry-pick a given Git commit into the current branch.""" # The manifest and manifest.uuid contain Fossil hashes. Restore to # HEAD version and update only when all conflicts have been resolved.
self
commit_id