[git-svn] Add a username option for push command

[ztamas]

Summary

Useful when svn username differs from the local username.

[ztamas]

Fixed commit message

[bogner]

Should we (either instead or as well) make the default username try git config llvm.username before falling back to the local user? That way people can set it with git config llvm.username xyz or, if they work with a lot of llvm checkouts, git config --global llvm.username xyz instead of having to specify it every time.

[ztamas]

In D60664#1465917, @bogner wrote:

Should we (either instead or as well) make the default username try git config llvm.username before falling back to the local user? That way people can set it with git config llvm.username xyz or, if they work with a lot of llvm checkouts, git config --global llvm.username xyz instead of having to specify it every time.

Ok, I hope somebody will implement what you suggest.

llvm/utils/git-svn/git-llvm

 def get_all_parent_dirs(name):
     parts = []
     head, tail = os.path.split(name)
     while head:
         parts.append(head)
         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, dry_run, user_name):
     files = git('diff-tree', '--no-commit-id', '--name-only', '-r',
                 rev).split('\n')
     if not files:
         raise RuntimeError('Empty diff for rev %s?' % rev)
 
     # Split files by subrepo
     subrepo_files = collections.defaultdict(list)
     for f in files:
for l in (l for l in status_lines if l.startswith('!')):
         svn(svn_repo, 'remove', l[1:].strip())
 
     # Now we're ready to commit.
     commit_msg = git('show', '--pretty=%B', '--quiet', rev)
     if not dry_run:
         commit_args = ['commit', '-m', commit_msg]
         if '--force-interactive' in svn(svn_repo, 'commit', '--help'):
             commit_args.append('--force-interactive')
+        if user_name:
+            commit_args.append('--username')
+            commit_args.append(user_name)
         log(svn(svn_repo, *commit_args))
         log('Committed %s to svn.' % rev)
     else:
         log("Would have committed %s to svn, if this weren't a dry run." % rev)
 
 
 def cmd_push(args):
     '''Push changes back to SVN: this is extracted from Justin Lebar's script
def cmd_push(args):
 
     # We need a staging area for SVN, let's hide it in the .git directory.
     dot_git_dir = git('rev-parse', '--git-common-dir')
     svn_root = os.path.join(dot_git_dir, 'llvm-upstream-svn')
     svn_init(svn_root)
 
     rev_range = args.rev_range
     dry_run = args.dry_run
+    user_name = args.user_name
     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)))
     for r in revs:
         clean_svn(svn_root)
-        svn_push_one_rev(svn_root, r, dry_run)
+        svn_push_one_rev(svn_root, r, dry_run, user_name)
 
 
 def lookup_llvm_svn_id(git_commit_hash):
     commit_msg = git('log', '-1', git_commit_hash, ignore_errors=True)
     if len(commit_msg) == 0:
       die("Can't find git commit " + git_commit_hash)
     svn_match = re.search('llvm-svn: (\d{5,7})$', commit_msg)
     if svn_match:
if __name__ == '__main__':
     parser_push.add_argument(
         'rev_range',
         metavar='GIT_REVS',
         type=str,
         nargs='?',
         help="revs to push (default: everything not in the branch's "
         'upstream, or not in origin/master if the branch lacks '
         'an explicit upstream)')
+    parser_push.add_argument(
+        '--username',
+        type=str,
+        dest='user_name',
+        help='User can specify the user name explicitly if it\'s different '
+        'from the local user name.')
     parser_push.set_defaults(func=cmd_push)
 
     parser_revert = subcommands.add_parser(
         'revert', description=cmd_revert.__doc__,
         help='Revert a commit locally.')
     parser_revert.add_argument(
         'revision',
         help='Revision to revert. Can either be an SVN revision number '