summaryrefslogtreecommitdiffstats
path: root/scripts/qt/branch_qt.py
blob: 11100b389b9559d966f92e294cb1340e39d178a8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
#!/usr/bin/env python3

# Copyright (C) 2019 The Qt Company Ltd.
# Contact: https://www.qt.io/licensing/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE in qt/qtrepotools for details.
#

import argparse
import json
import logging
import os
import re
import requests
import subprocess
import sys
import typing

from configparser import ConfigParser
from enum import Enum
from textwrap import dedent

import git  # type: ignore


Mode = Enum('Mode', 'branch sync merge bump')

extra_repositories = (
    'qt/qtcoap',
    'qt/qtknx',
    'qt/qtmqtt',
    'qt/qtopcua',
)

skipped_submodules = ('qtqa', 'qtrepotools')

GERRIT_HOST = 'codereview.qt-project.org'
GERRIT_REST_URL = 'https://' + GERRIT_HOST


log_level = logging.INFO
log_format = "%(asctime)s %(filename)s:%(lineno)d %(levelname)s: %(message)s"
logging.basicConfig(format=log_format, level=log_level)
log = logging.getLogger('branch_qt')
log.setLevel(log_level)
try:
    import coloredlogs  # type: ignore
    coloredlogs.install(level=log_level, logger=log, fmt=log_format)
except:
    pass


example_config_file = dedent(f"""\
    [gerrit]
    username = my_username
    password = some_password""")

class Credentials:
    """ Reads ~/.config/branch_qt.ini for Gerrit username and password. """
    def __init__(self) -> None:
        config_path = os.path.expanduser("~/.config/branch_qt.ini")
        self.config = ConfigParser()
        if not self.config.read(config_path):
            log.warning(f"File '{config_path}' does not exist or could not be parsed. Example file: {example_config_file}")
            exit(1)

    @property
    def username(self) -> str:
        return self.config['gerrit']['username']

    @property
    def password(self) -> str:
        return self.config['gerrit']['password']


def is_major_minor(version: str) -> bool:
    """ Check if a version string is of the format x.y """
    parts = version.split('.')
    return len(parts) == 2 and all(x.isdigit() for x in parts)


def is_major_minor_patch(version: str) -> bool:
    """ Check if a version string is of the format x.y.z """
    parts = version.split('.')
    return len(parts) == 3 and all(x.isdigit() for x in parts)

def get_repo_name(repo: git.Repo) -> str:
    return os.path.basename(repo.working_dir)

class QtBranching:
    def __init__(self, mode: Mode, fromBranch: str, toBranch: str, pretend: bool, skip_hooks: bool) -> None:
        self.mode = mode
        self.fromBranch = fromBranch
        self.toBranch = toBranch
        self.pretend = pretend
        self.skip_hooks = skip_hooks
        log.info(f"{self.mode.name} from '{self.fromBranch}' to '{self.toBranch}'")

    def subprocess_or_pretend(self, *args: typing.Any, **kwargs: typing.Any) -> None:
        if self.pretend:
            log.info(f"PRETEND: {args}, {kwargs}")
        else:
            subprocess.run(*args, **kwargs)

    def is_phase_done(self, repo: git.Repo) -> bool:
        """Test if some part of the process has already been run for a repository.

           This script adds a config section where the state is tracked.
        """
        config = repo.config_reader()
        state = str(config.get_value(f'qtbranching "{self.toBranch}"', 'done'))
        return state == self.mode.name

    def write_done_phase(self, repo: git.Repo) -> None:
        """Set the current phase to done."""
        config = repo.config_writer()
        state = config.set_value(f'qtbranching "{self.toBranch}"', 'done', self.mode.name)

    def run(self) -> None:
        self.sanity_check()
        self.init_repository()

        repo = git.Repo('.')
        for submodule in repo.submodules:
            if submodule.name in skipped_submodules:
                continue
            # submodules that are ignored or in weird state need to be skipped
            if submodule.module_exists() and self.clean_submodule(submodule, self.fromBranch):
                repo = git.Repo(submodule.path)
                self.handle_module(repo)
            else:
                log.info(f"SKIPPING {submodule.name}")

        # Additional repositories that are not part of qt5.git:
        for repo_path in extra_repositories:
            log.info(f"Extra repository: '{repo_path}'")
            assert '/' in repo_path, f"Extra repository must be specified with namespace {repo_path}"
            repo = self.clone_extra_repo(path=repo_path, branch=self.fromBranch)
            if repo:
                self.handle_module(repo)
            else:
                log.warning(f"Could not handle '{repo_path}'.")

        if self.mode == Mode['branch']:
            log.info("Adjusting submodule branches in .gitmodules")
            self.subprocess_or_pretend(['git', 'commit', '-m', 'Adjust submodule branches', '.gitmodules'])
            # update the new and staging branch
            self.subprocess_or_pretend(['git', 'push', 'gerrit', f'HEAD:refs/heads/{self.toBranch}', f'HEAD:refs/staging/{self.toBranch}'])

    def handle_module(self, repo: git.Repo) -> None:
        oldpath = os.path.abspath(os.curdir)
        try:
            os.chdir(repo.working_dir)
            if self.mode == Mode['merge']:
                self.merge_repo(repo)
            elif self.mode == Mode['branch']:
                self.branch_repo(repo)
            elif self.mode == Mode['sync']:
                self.sync_repo(repo)
            elif self.mode == Mode['bump']:
                self.version_bump_repo(repo)
            else:
                assert False, "This mode is not yet implemented"
        except FileNotFoundError:
            log.warning(f"{repo.path} does not exist, SKIPPING")
        finally:
            os.chdir(oldpath)

    def sanity_check(self) -> None:
        assert os.path.exists('qt.pro'), "This script must be run in an existing qt5.git checkout."

        if self.mode == Mode['sync']:
            return

        if self.fromBranch == 'dev':
            assert is_major_minor(self.toBranch), "Branching from dev must be to a minor version (a.b)"
        elif is_major_minor_patch(self.fromBranch):
            assert False, "Cannot branch from release branch"
        elif is_major_minor(self.fromBranch):
            assert is_major_minor_patch(self.toBranch) and self.toBranch.startswith(self.fromBranch + '.'), \
                "Branching from x.y should result in x.y.z."
        else:
            assert False, f"Branching from {self.fromBranch} is not (yet) handled by this script."

        if self.mode == Mode['bump']:
            assert is_major_minor_patch(self.toBranch), "Bumping must happen to a new minor version!"

    def init_repository(self) -> None:
        log.info(f"Fetching super module...")
        repo = git.Repo('.')
        self.checkout_and_pull_branch(repo, self.fromBranch)

        log.info(f"Running init-repository...")
        # This makes sure we have all submodules, and only the ones we want.
        # It also updates the submodules, so we are on the right branches.
        # Note: don't use --branch here, as it breaks idempotence.
        self.subprocess_or_pretend('./init-repository -f --module-subset=all,-ignore'.split())

    def clean_submodule(self, submodule: git.Submodule, branch: str) -> bool:
        log.info(f"Cleaning repo: {submodule.path}")
        repo = git.Repo(submodule.path)
        try:
            self.checkout_and_pull_branch(repo, branch)
        except:
            return False
        return True

    @staticmethod
    def checkout_and_pull_branch(repo: git.Repo, branch: str) -> None:
        """Make sure the repository is on the given branch and up to date."""
        remote = repo.remotes['gerrit']
        remote.fetch()
        remote_branch = remote.refs[branch]
        # Now move to 'branch': either it already exists and we just check it out or we run git checkout -b
        if branch in repo.references:
            repo.head.reference = repo.branches[branch]
            repo.head.ref.set_commit(remote_branch)
        else:
            assert branch in remote.refs, f"Branch {branch} does not exist for {repo.working_dir}"
            repo.create_head(branch, remote_branch).set_tracking_branch(remote_branch).checkout()
        repo.head.ref.checkout(force=True)

    def clone_extra_repo(self, path: str, branch: str) -> git.Repo:
        # checkout target branch
        try:
            name = path.split('/')[-1]
            repo = git.Repo(name)
            self.checkout_and_pull_branch(repo, branch)
        except IndexError:
            log.error(f'Branch {branch} not found in {path}.')
            return None
        except git.exc.NoSuchPathError:
            log.info(f"Cloning '{path}' into '{name}'")
            try:
                remote_url = f"ssh://{GERRIT_HOST}/{path}"
                repo = git.Repo.clone_from(remote_url, to_path=name, branch=branch)
                git.remote.Remote.add(repo, 'gerrit', remote_url)
            except git.exc.GitCommandError:
                log.warning(f"SKIPPING {path} (does branch '{branch}' exist?)")
                return None
        assert repo.head.commit == repo.commit(branch), f"Repository {repo} should be on branch '{branch}'"
        return repo

    def branch_repo(self, repo: git.Repo) -> None:
        repo_name = get_repo_name(repo)
        if repo_name in skipped_submodules:
            log.info(f"Skipping {repo_name} (not branched)")
            return

        log.info(f"Module: {repo_name} ({repo.working_dir}) - creating branch '{self.toBranch}' from '{self.fromBranch}'")
        if not self.pretend:
            repo.remotes['gerrit'].fetch()
        self.subprocess_or_pretend(f"git push -q gerrit gerrit/{self.fromBranch}:refs/heads/{self.toBranch}".split())

        # We do not want to add the extra repos in .gitmodules
        if not repo_name in (extra_repo.split('/')[-1] for extra_repo in extra_repositories):
            self.subprocess_or_pretend(f"git config -f ../.gitmodules submodule.{repo_name}.branch {self.toBranch}".split())

    def merge_repo(self, repo: git.Repo) -> None:
        repo_name = get_repo_name(repo)
        log.info(f"Merge: {repo_name} ({self.fromBranch} -> {self.toBranch})")

        self.checkout_and_pull_branch(repo, self.toBranch)
        try:
            subprocess.run(f'git merge --ff-only --quiet gerrit/{self.fromBranch}'.split(), check=True, stderr=subprocess.PIPE)
            self.push(repo_name, self.toBranch)
        except subprocess.CalledProcessError:
            # The merge was not fast forward, try again
            try:
                log.info(f"  Attempting non ff merge for {repo_name}")
                subprocess.run(['git', 'merge', f'gerrit/{self.fromBranch}', '--quiet', '-m', f'Merge {self.fromBranch} into {self.toBranch}'], check=True)
                self.push(repo_name, self.toBranch)
            except subprocess.CalledProcessError:
                log.warning(f"  Merge had conflicts. {repo_name} needs to be merged manually!")

    def sync_repo(self, repo: git.Repo) -> None:
        repo_name = get_repo_name(repo)
        log.info(f"Sync: {repo_name} ({self.fromBranch} -> {self.toBranch})")
        self.checkout_and_pull_branch(repo, self.toBranch)
        try:
            subprocess.run(f'git merge --ff-only --quiet gerrit/{self.fromBranch}'.split(), check=True, stderr=subprocess.PIPE)
            self.push(repo_name, self.toBranch)
        except Exception as e:
            log.exception(f"Could not sync repository: {repo_name}")

    def version_bump_repo(self, repo: git.Repo) -> None:
        qmake_conf_file_name = '.qmake.conf'
        with open(qmake_conf_file_name, mode='r', encoding='utf-8') as qmake_conf:
            qmake_conf_content = qmake_conf.read()
        match = re.search(r'^MODULE_VERSION *= *([0-9\.]+)\b.*', qmake_conf_content, flags=re.MULTILINE)
        repo_name = get_repo_name(repo)
        if not match:
            log.warning(f"could not read version in {repo_name}")
            return
        version = match.group(1)
        qmake_conf_content = re.sub(
            r'^MODULE_VERSION *= *[0-9\.]+.*$',
            f'MODULE_VERSION = {self.toBranch}',
            qmake_conf_content, flags=re.MULTILINE)
        with open(qmake_conf_file_name, mode='w', encoding='utf-8') as qmake_conf:
            qmake_conf.write(qmake_conf_content)

        log.info(f"bump {repo_name} from {version} to {self.toBranch}")

        files = [qmake_conf_file_name]

        if repo_name == 'qtbase':
            files.extend(self.bump_qtbase_datastream())

        repo.git.add(files)
        if not repo.is_dirty():
            log.warning(f"nothing to do for {repo_name}, is the version bump already done?")
            return
        repo.index.commit("Bump version", skip_hooks=self.skip_hooks)
        self.push(repo_name, self.fromBranch)

    def push(self, project: str, branch: str) -> None:
        # TODO: make this work for projects that don't have 'qt' as namespace
        query = {'q': f'project:qt/{project} branch:{branch} (status:staging OR status:staged OR status:integrating)'}
        response = requests.get(f'{GERRIT_REST_URL}/changes/', params=query)
        response.raise_for_status()
        assert response.text.startswith(')]}')
        query_result = json.loads(response.text[4:])
        if len(query_result):
            log.warning(f"{project}, {branch} is busy (staged or integrating changes), SKIPPING!")
            return
        self.subprocess_or_pretend(['git', 'push', 'gerrit', f'HEAD:refs/heads/{branch}', f'HEAD:refs/staging/{branch}'])

    def bump_qtbase_datastream(self) -> typing.Iterable[str]:
        if self.fromBranch.split('.')[1] == self.toBranch.split('.')[1]:
            return []
        # For minor version changes we need to change qdatastream,
        # it has a version enum that must correspond to the Qt minor version:
        log.info("Adjusting src/corelib/serialization/qdatastream.[h/cpp]")
        datastream_h = 'src/corelib/serialization/qdatastream.h'
        datastream_cpp = 'src/corelib/serialization/qdatastream.cpp'

        # datastream.h
        datastream_h_content = open(datastream_h, mode='r', encoding='utf-8').read()
        split_target = self.toBranch.split('.')
        nextver = f'{split_target[0]}_{split_target[1]}'
        ver = f'{split_target[0]}_{str(int(split_target[1]) - 1)}'
        next_version_hex = f'{int(split_target[0]):02x}{int(split_target[1]):02x}00'
        next_next_version_hex = f'{int(split_target[0]):02x}{int(split_target[1])+1:02x}00'

        # Add new version to enum and bump up the hex version in #ifdef
        search = f'^(#if QT_VERSION >= 0x){next_version_hex}\\n(#error [^\\n]+\\n#endif\\n( +)Qt_DefaultCompiledVersion = Qt_)[0-9_]+$'
        replacement = f'\\g<3>Qt_{nextver} = Qt_{ver},\\n\\g<1>{next_next_version_hex}\\n\\g<2>{nextver}'
        datastream_h_content = re.sub(search, replacement, datastream_h_content, flags=re.MULTILINE)
        open(datastream_h, mode='w', encoding='utf-8').write(datastream_h_content)

        # datastream.cpp
        datastream_cpp_content = open(datastream_cpp, mode='r', encoding='utf-8').read()

        # Add Documentation (a line like '\value Qt_5_12 Same as Qt_5_11')
        search = f'^( +)(\\\\value Qt_{ver} Version[^\n]+\n)( +\\\\omitvalue Qt_DefaultCompiledVersion)$'
        replacement = f'\\1\\2\\1\\\\value Qt_{nextver} Same as Qt_{ver}\n\\3'
        datastream_cpp_content = re.sub(search, replacement, datastream_cpp_content, flags=re.MULTILINE)

        open(datastream_cpp, mode='w', encoding='utf-8').write(datastream_cpp_content)
        return datastream_h, datastream_cpp

def parse_args() -> argparse.Namespace:
    parser = argparse.ArgumentParser(prog="merge_qt",
                                     formatter_class=argparse.RawTextHelpFormatter,
                                     description="Do various merge operations on Qt repositories")
    parser.add_argument("--mode", "-m",
                        type=str,
                        choices=["branch", "sync", "merge", "bump"],
                        required=True,
                        help=dedent("""\
                                    branch - start soft branching: create the "to" branch based on the "from" branch
                                        branch_qt.py -m branch --from 5.12 --to 5.12.4
                                            Now 5.12.4 will exist, based on 5.12.
                                    sync - intermediate sync, to update a branch during soft-branching
                                        branch_qt.py -m sync --from 5.12 --to 5.12.4
                                            Move the new branch fast-forward, assuming only 5.12 has new commits.
                                    merge - down-merge
                                        branch_qt.py -m merge --from 5.12 --to 5.12.4
                                            Merges 5.12 into 5.12.4.
                                    bump - version bump, to move from 5.12.3 to 5.12.4:
                                        branch_qt.py -m bump --from 5.12 --to 5.12.4"""))
    parser.add_argument("--from", "-f", required=True,
                        type=str, dest="fromBranch")
    parser.add_argument("--to", "-t", required=True,
                        type=str, dest="toBranch")
    parser.add_argument("--pretend", action="store_true",
                        help="Make the changes to the repositories, but do not push to Gerrit.")
    parser.add_argument("--skip-hooks", action="store_true",
                        help="Do not run git commit hooks.")
    return parser.parse_args(sys.argv[1:])


def gerrit_add_pushmaster() -> None:
    config = Credentials()
    auth = requests.auth.HTTPBasicAuth(config.username, config.password)
    r = requests.put(f'{GERRIT_REST_URL}/a/groups/Push Masters/members/{config.username}', auth=auth)
    r.raise_for_status()

def gerrit_remove_pushmaster() -> None:
    config = Credentials()
    auth = requests.auth.HTTPBasicAuth(config.username, config.password)
    r = requests.delete(f'{GERRIT_REST_URL}/a/groups/Push Masters/members/{config.username}', auth=auth)
    r.raise_for_status()

if __name__ == "__main__":
    args = parse_args()
    try:
        if not args.pretend:
            gerrit_add_pushmaster()

        branching = QtBranching(mode=Mode[args.mode], fromBranch=args.fromBranch, toBranch=args.toBranch, pretend=args.pretend, skip_hooks=args.skip_hooks)
        branching.run()
    finally:
        if not args.pretend:
            gerrit_remove_pushmaster()