def full_target_name(repository, target):
tag = shell.capture(["git", "tag", "-l", target], echo=True).strip()
if tag == target:
return tag
branch = shell.capture(["git", "branch", "--list", target],
echo=True).strip().replace("* ", "")
if branch == target:
name = "%s/%s" % (repository, target)
return name
raise RuntimeError('Cannot determine if %s is a branch or a tag' % target)
def full_target_name(repository, target):
tag = shell.capture(["git", "tag", "-l", target], echo=True).strip()
if tag == target:
return tag
branch = shell.capture(["git", "branch", "--list", target],
echo=True).strip().replace("* ", "")
if branch == target:
name = "%s/%s" % (repository, target)
return name
raise RuntimeError('Cannot determine if %s is a branch or a tag' % target)
def find_rev_by_timestamp(timestamp, repo_name, refspec):
base_args = ["git", "log", "-1", "--format=%H", '--before=' + timestamp]
# Prefer the most-recent change _made by swift-ci_ before the timestamp,
# falling back to most-recent in general if there is none by swift-ci.
rev = shell.capture(base_args + ['--author', 'swift-ci', refspec]).strip()
if rev:
return rev
rev = shell.capture(base_args + [refspec]).strip()
if rev:
return rev
else:
raise RuntimeError('No rev in %s before timestamp %s' %
(repo_name, timestamp))
def find_rev_by_timestamp(timestamp, repo_name, refspec):
base_args = ["git", "log", "-1", "--format=%H",
'--before=' + timestamp]
# Prefer the most-recent change _made by swift-ci_ before the timestamp,
# falling back to most-recent in general if there is none by swift-ci.
rev = shell.capture(base_args + ['--author', 'swift-ci', refspec]).strip()
if rev:
return rev
rev = shell.capture(base_args + [refspec]).strip()
if rev:
return rev
else:
raise RuntimeError('No rev in %s before timestamp %s' %
(repo_name, timestamp))
def get_timestamp_to_match(args):
if not args.match_timestamp:
return None
with shell.pushd(os.path.join(args.source_root, "swift"),
dry_run=False, echo=False):
return shell.capture(["git", "log", "-1", "--format=%cI"],
echo=False).strip()
def get_timestamp_to_match(args):
if not args.match_timestamp:
return None
with shell.pushd(os.path.join(SWIFT_SOURCE_ROOT, "swift"),
dry_run=False, echo=False):
return shell.capture(["git", "log", "-1", "--format=%cI"],
echo=False).strip()
def dump_repo_hashes(config):
"""
Dumps the current state of the repo into a new config file that contains a
master branch scheme with the relevant branches set to the appropriate
hashes.
"""
branch_scheme_name = 'repro'
new_config = {}
config_copy_keys = ['ssh-clone-pattern', 'https-clone-pattern', 'repos']
for config_copy_key in config_copy_keys:
new_config[config_copy_key] = config[config_copy_key]
repos = {}
branch_scheme = {'aliases': [branch_scheme_name], 'repos': repos}
new_config['branch-schemes'] = {branch_scheme_name: branch_scheme}
for repo_name, repo_info in sorted(config['repos'].items(),
key=lambda x: x[0]):
path = os.path.join(SWIFT_SOURCE_ROOT, repo_name)
if os.path.isdir(path):
with shell.pushd(path, dry_run=False, echo=False):
h = shell.capture(["git", "rev-parse", "HEAD"],
echo=False).strip()
repos[repo_name] = str(h)
if not os.path.isdir(path):
repos[repo_name] = "dir not exist"
json.dump(new_config, sys.stdout, indent=4)
def confirm_tag_in_repo(tag, repo_name):
tag_exists = shell.capture(['git', 'ls-remote', '--tags',
'origin', tag], echo=False)
if not tag_exists:
print("Tag '" + tag + "' does not exist for '" +
repo_name + "', just updating regularly")
tag = None
return tag
def find_rev_by_timestamp(timestamp, repo_name, refspec):
base_args = ["git", "log", "-1", "--format=%H", '--before=' + timestamp]
# On repos with regular batch-automerges from swift-ci -- namely clang,
# llvm and lldb -- prefer the most-recent change _made by swift-ci_
# before the timestamp, falling back to most-recent in general if there
# is none by swift-ci.
if repo_name in ["llvm", "clang", "lldb"]:
rev = shell.capture(base_args +
['--author', 'swift-ci', refspec]).strip()
if rev:
return rev
rev = shell.capture(base_args + [refspec]).strip()
if rev:
return rev
else:
raise RuntimeError('No rev in %s before timestamp %s' %
(repo_name, timestamp))
def confirm_tag_in_repo(tag, repo_name):
tag_exists = shell.capture(['git', 'ls-remote', '--tags',
'origin', tag], echo=False)
if not tag_exists:
print("Tag '" + tag + "' does not exist for '" +
repo_name + "', just updating regularly")
tag = None
return tag
def find_rev_by_timestamp(timestamp, repo_name, refspec):
args = ["git", "log", "-1", "--format=%H", "--first-parent",
'--before=' + timestamp, refspec]
rev = shell.capture(args).strip()
if rev:
return rev
else:
raise RuntimeError('No rev in %s before timestamp %s' %
(repo_name, timestamp))
def find_rev_by_timestamp(timestamp, repo_name, refspec):
base_args = ["git", "log", "-1", "--format=%H",
'--before=' + timestamp]
# On repos with regular batch-automerges from swift-ci -- namely clang,
# llvm and lldb -- prefer the most-recent change _made by swift-ci_
# before the timestamp, falling back to most-recent in general if there
# is none by swift-ci.
if repo_name in ["llvm", "clang", "lldb"]:
rev = shell.capture(base_args +
['--author', 'swift-ci', refspec]).strip()
if rev:
return rev
rev = shell.capture(base_args + [refspec]).strip()
if rev:
return rev
else:
raise RuntimeError('No rev in %s before timestamp %s' %
(repo_name, timestamp))
def get_branch_for_repo(config, repo_name, scheme_name, scheme_map,
cross_repos_pr):
cross_repo = False
repo_branch = scheme_name
if scheme_map:
scheme_branch = scheme_map[repo_name]
repo_branch = scheme_branch
remote_repo_id = config['repos'][repo_name]['remote']['id']
if remote_repo_id in cross_repos_pr:
cross_repo = True
pr_id = cross_repos_pr[remote_repo_id]
repo_branch = "ci_pr_{0}".format(pr_id)
shell.run(["git", "checkout", scheme_branch],
echo=True)
shell.capture(["git", "branch", "-D", repo_branch],
echo=True, allow_non_zero_exit=True)
shell.run(["git", "fetch", "origin",
"pull/{0}/merge:{1}"
.format(pr_id, repo_branch)], echo=True)
return repo_branch, cross_repo
def get_branch_for_repo(config, repo_name, scheme_name, scheme_map,
cross_repos_pr):
cross_repo = False
repo_branch = scheme_name
if scheme_map:
scheme_branch = scheme_map[repo_name]
repo_branch = scheme_branch
remote_repo_id = config['repos'][repo_name]['remote']['id']
if remote_repo_id in cross_repos_pr:
cross_repo = True
pr_id = cross_repos_pr[remote_repo_id]
repo_branch = "ci_pr_{0}".format(pr_id)
shell.run(["git", "checkout", scheme_branch],
echo=True)
shell.capture(["git", "branch", "-D", repo_branch],
echo=True, allow_non_zero_exit=True)
shell.run(["git", "fetch", "origin",
"pull/{0}/merge:{1}"
.format(pr_id, repo_branch), "--tags"], echo=True)
return repo_branch, cross_repo
def dump_repo_hashes(config):
max_len = reduce(lambda acc, x: max(acc, len(x)), config['repos'].keys(),
0)
fmt = "{:<%r}{}" % (max_len + 5)
for repo_name, repo_info in sorted(config['repos'].items(),
key=lambda x: x[0]):
with shell.pushd(os.path.join(SWIFT_SOURCE_ROOT, repo_name),
dry_run=False,
echo=False):
h = shell.capture(["git", "log", "--oneline", "-n", "1"],
echo=False).strip()
print(fmt.format(repo_name, h))
def dump_repo_hashes(config):
max_len = reduce(lambda acc, x: max(acc, len(x)),
config['repos'].keys(), 0)
fmt = "{:<%r}{}" % (max_len + 5)
for repo_name, repo_info in sorted(config['repos'].items(),
key=lambda x: x[0]):
with shell.pushd(os.path.join(SWIFT_SOURCE_ROOT, repo_name),
dry_run=False,
echo=False):
h = shell.capture(["git", "log", "--oneline", "-n", "1"],
echo=False).strip()
print(fmt.format(repo_name, h))
def repo_hashes(args, config):
repos = {}
for repo_name, repo_info in sorted(config['repos'].items(),
key=lambda x: x[0]):
repo_path = os.path.join(args.source_root, repo_name)
if os.path.exists(repo_path):
with shell.pushd(repo_path, dry_run=False, echo=False):
h = shell.capture(["git", "rev-parse", "HEAD"],
echo=False).strip()
else:
h = 'skip'
repos[repo_name] = str(h)
return repos
def dump_hashes_config(args, config):
branch_scheme_name = args.dump_hashes_config
new_config = {}
config_copy_keys = ['ssh-clone-pattern', 'https-clone-pattern', 'repos']
for config_copy_key in config_copy_keys:
new_config[config_copy_key] = config[config_copy_key]
repos = {}
branch_scheme = {'aliases': [branch_scheme_name], 'repos': repos}
new_config['branch-schemes'] = {args.dump_hashes_config: branch_scheme}
for repo_name, repo_info in sorted(config['repos'].items(),
key=lambda x: x[0]):
with shell.pushd(os.path.join(SWIFT_SOURCE_ROOT, repo_name),
dry_run=False,
echo=False):
h = shell.capture(["git", "rev-parse", "HEAD"], echo=False).strip()
repos[repo_name] = str(h)
print(json.dumps(new_config, indent=4))
def dump_hashes_config(args, config):
branch_scheme_name = args.dump_hashes_config
new_config = {}
config_copy_keys = ['ssh-clone-pattern', 'https-clone-pattern', 'repos']
for config_copy_key in config_copy_keys:
new_config[config_copy_key] = config[config_copy_key]
repos = {}
branch_scheme = {'aliases': [branch_scheme_name], 'repos': repos}
new_config['branch-schemes'] = {args.dump_hashes_config: branch_scheme}
for repo_name, repo_info in sorted(config['repos'].items(),
key=lambda x: x[0]):
with shell.pushd(os.path.join(SWIFT_SOURCE_ROOT, repo_name),
dry_run=False,
echo=False):
h = shell.capture(["git", "rev-parse", "HEAD"],
echo=False).strip()
repos[repo_name] = str(h)
print(json.dumps(new_config, indent=4))
def dump_repo_hashes(config):
"""
Dumps the current state of the repo into a new config file that contains a
master branch scheme with the relevant branches set to the appropriate
hashes.
"""
branch_scheme_name = 'repro'
new_config = {}
config_copy_keys = ['ssh-clone-pattern', 'https-clone-pattern', 'repos']
for config_copy_key in config_copy_keys:
new_config[config_copy_key] = config[config_copy_key]
repos = {}
branch_scheme = {'aliases': [branch_scheme_name], 'repos': repos}
new_config['branch-schemes'] = {branch_scheme_name: branch_scheme}
for repo_name, repo_info in sorted(config['repos'].items(),
key=lambda x: x[0]):
with shell.pushd(os.path.join(SWIFT_SOURCE_ROOT, repo_name),
dry_run=False,
echo=False):
h = shell.capture(["git", "rev-parse", "HEAD"],
echo=False).strip()
repos[repo_name] = str(h)
json.dump(new_config, sys.stdout, indent=4)
