[llvm] r365917 - Allow the 'git-llvm' tool to push to svn from the split repositories
James Y Knight via llvm-commits
llvm-commits at lists.llvm.org
Fri Jul 12 10:59:53 PDT 2019
Can you check if this will work?
- git_remote_url = git('remote', 'get-url', 'origin')
+ git_remote_url = git('ls-remote', '--get-url', 'origin')
I _think_ that'll work back to old versions of git, but I'd prefer if you
could verify first. :)
On Fri, Jul 12, 2019 at 1:44 PM Craig Topper <craig.topper at gmail.com> wrote:
> It seems get-url is not supported by the 1.8.3.1 version of git on the
> server I have use at work.
>
> ~Craig
>
>
> On Fri, Jul 12, 2019 at 9:40 AM James Y Knight via llvm-commits <
> llvm-commits at lists.llvm.org> wrote:
>
>> Author: jyknight
>> Date: Fri Jul 12 09:40:46 2019
>> New Revision: 365917
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=365917&view=rev
>> Log:
>> Allow the 'git-llvm' tool to push to svn from the split repositories
>> for 'test-suite', 'lnt', 'zorg', and 'www'.
>>
>> This is done by looking at the pathname of the git remote named
>> 'origin', which is not 100% reliable, but should work in most cases.
>>
>> Modified:
>> llvm/trunk/utils/git-svn/git-llvm
>>
>> Modified: llvm/trunk/utils/git-svn/git-llvm
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/git-svn/git-llvm?rev=365917&r1=365916&r2=365917&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/utils/git-svn/git-llvm (original)
>> +++ llvm/trunk/utils/git-svn/git-llvm Fri Jul 12 09:40:46 2019
>> @@ -48,7 +48,7 @@ except ImportError:
>> from pipes import quote
>>
>> # It's *almost* a straightforward mapping from the monorepo to svn...
>> -GIT_TO_SVN_DIR = {
>> +LLVM_MONOREPO_SVN_MAPPING = {
>> d: (d + '/trunk')
>> for d in [
>> 'clang-tools-extra',
>> @@ -70,8 +70,11 @@ GIT_TO_SVN_DIR = {
>> 'pstl',
>> ]
>> }
>> -GIT_TO_SVN_DIR.update({'clang': 'cfe/trunk'})
>> -GIT_TO_SVN_DIR.update({'': 'monorepo-root/trunk'})
>> +LLVM_MONOREPO_SVN_MAPPING.update({'clang': 'cfe/trunk'})
>> +LLVM_MONOREPO_SVN_MAPPING.update({'': 'monorepo-root/trunk'})
>> +
>> +SPLIT_REPO_NAMES = {'llvm-' + d : d + '/trunk'
>> + for d in ['www', 'zorg', 'test-suite', 'lnt']}
>>
>> VERBOSE = False
>> QUIET = False
>> @@ -274,13 +277,13 @@ def fix_eol_style_native(rev, svn_sr_pat
>> # just the diff, and not a mass line ending change.
>> shell(['dos2unix'] + crlf_files, ignore_errors=True,
>> cwd=svn_sr_path)
>>
>> -def split_subrepo(f):
>> +def split_subrepo(f, git_to_svn_mapping):
>> # Given a path, splits it into (subproject, rest-of-path). If the
>> path is
>> # not in a subproject, returns ('', full-path).
>>
>> subproject, remainder = split_first_path_component(f)
>>
>> - if subproject in GIT_TO_SVN_DIR:
>> + if subproject in git_to_svn_mapping:
>> return subproject, remainder
>> else:
>> return '', f
>> @@ -293,7 +296,7 @@ def get_all_parent_dirs(name):
>> head, tail = os.path.split(head)
>> return parts
>>
>> -def svn_push_one_rev(svn_repo, rev, dry_run):
>> +def svn_push_one_rev(svn_repo, rev, git_to_svn_mapping, dry_run):
>> files = git('diff-tree', '--no-commit-id', '--name-only', '-r',
>> rev).split('\n')
>> if not files:
>> @@ -302,7 +305,7 @@ def svn_push_one_rev(svn_repo, rev, dry_
>> # Split files by subrepo
>> subrepo_files = collections.defaultdict(list)
>> for f in files:
>> - subrepo, remainder = split_subrepo(f)
>> + subrepo, remainder = split_subrepo(f, git_to_svn_mapping)
>> subrepo_files[subrepo].append(remainder)
>>
>> status = svn(svn_repo, 'status', '--no-ignore')
>> @@ -312,7 +315,7 @@ def svn_push_one_rev(svn_repo, rev, dry_
>>
>> svn_dirs_to_update = set()
>> for sr, files in iteritems(subrepo_files):
>> - svn_sr_path = GIT_TO_SVN_DIR[sr]
>> + svn_sr_path = git_to_svn_mapping[sr]
>> for f in files:
>> svn_dirs_to_update.add(
>> os.path.dirname(os.path.join(svn_sr_path, f)))
>> @@ -333,7 +336,7 @@ def svn_push_one_rev(svn_repo, rev, dry_
>> svn(svn_repo, 'update', '--depth=files', *sorted_dirs_to_update)
>>
>> for sr, files in iteritems(subrepo_files):
>> - svn_sr_path = os.path.join(svn_repo, GIT_TO_SVN_DIR[sr])
>> + svn_sr_path = os.path.join(svn_repo, git_to_svn_mapping[sr])
>> if os.name == 'nt':
>> fix_eol_style_native(rev, svn_sr_path, files)
>> # We use text=False (and pass '--binary') so that we can get an
>> exact
>> @@ -390,6 +393,17 @@ def cmd_push(args):
>> # Push from the root of the git repo
>> os.chdir(git_root)
>>
>> + # Get the remote URL, and check if it's one of the standalone repos.
>> + git_remote_url = git('remote', 'get-url', 'origin')
>> + git_remote_url = git_remote_url.rstrip('.git').rstrip('/')
>> + git_remote_repo_name = git_remote_url.rsplit('/', 1)[-1]
>> + split_repo_path = SPLIT_REPO_NAMES.get(git_remote_repo_name)
>> + if split_repo_path:
>> + git_to_svn_mapping = {'': split_repo_path}
>> + else:
>> + # Default to the monorepo mapping
>> + git_to_svn_mapping = LLVM_MONOREPO_SVN_MAPPING
>> +
>> # We need a staging area for SVN, let's hide it in the .git
>> directory.
>> dot_git_dir = git('rev-parse', '--git-common-dir')
>> # Not all versions of git support --git-common-dir and just print the
>> @@ -403,13 +417,15 @@ def cmd_push(args):
>> rev_range = args.rev_range
>> dry_run = args.dry_run
>> revs = get_revs_to_push(rev_range)
>> - log('Pushing %d commit%s:\n%s' %
>> - (len(revs), 's' if len(revs) != 1
>> - else '', '\n'.join(' ' + git('show', '--oneline', '--quiet', c)
>> - for c in revs)))
>> + log('Pushing %d %s commit%s:\n%s' %
>> + (len(revs),
>> + 'split-repo (%s)' % split_repo_path if split_repo_path else
>> 'monorepo',
>> + 's' if len(revs) != 1 else '',
>> + '\n'.join(' ' + git('show', '--oneline', '--quiet', c)
>> + for c in revs)))
>> for r in revs:
>> clean_svn(svn_root)
>> - svn_push_one_rev(svn_root, r, dry_run)
>> + svn_push_one_rev(svn_root, r, git_to_svn_mapping, dry_run)
>>
>>
>> def lookup_llvm_svn_id(git_commit_hash):
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org
>> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190712/a849a5d0/attachment.html>
More information about the llvm-commits
mailing list