[git-llvm] Handle files ignored by svn correctly

[waltl]

Summary

Correctly handle files ignored by svn (such as .o files, which are ignored by default) by adding "--no-ignore" flag to "svn status" and "svn add".

[waltl]

Working version.

[jyknight]

I'd add "(such as .o files, which are ignored by default)" to the description, to make clear the point.

llvm/trunk/utils/git-svn/git-llvm

def get_revs_to_push(rev_range):
     return revs
 
 
 def clean_and_update_svn(svn_repo):
     svn(svn_repo, 'revert', '-R', '.')
 
     # Unfortunately it appears there's no svn equivalent for git clean, so we
     # have to do it ourselves.
-    for line in svn(svn_repo, 'status').split('\n'):
+    for line in svn(svn_repo, 'status', '--no-ignore').split('\n'):
         if not line.startswith('?'):
             continue
         filename = line[1:].strip()
         os.remove(os.path.join(svn_repo, filename))
 
     svn(svn_repo, 'update', *list(GIT_TO_SVN_DIR.values()))
 
 

 
 def svn_push_one_rev(svn_repo, rev, dry_run):
     files = git('diff-tree', '--no-commit-id', '--name-only', '-r',
                 rev).split('\n')
     subrepos = {first_dirname(f) for f in files}
     if not subrepos:
         raise RuntimeError('Empty diff for rev %s?' % rev)
 
-    status = svn(svn_repo, 'status')
+    status = svn(svn_repo, 'status', '--no-ignore')
     if status:
         die("Can't push git rev %s because svn status is not empty:\n%s" %
             (rev, status))
 
     for sr in subrepos:
         svn_sr_path = os.path.join(svn_repo, GIT_TO_SVN_DIR[sr])
         if os.name == 'nt':
             fix_eol_style_native(rev, sr, svn_sr_path)
         diff = git('show', '--binary', rev, '--', sr, strip=False)
         # git is the only thing that can handle its own patches...
         log_verbose('Apply patch: %s' % diff)
         try:
             shell(['git', 'apply', '-p2', '-'], cwd=svn_sr_path, stdin=diff,
                   die_on_failure=False)
         except RuntimeError as e:
             eprint("Patch doesn't apply: maybe you should try `git pull -r` "
                    "first?")
             sys.exit(2)
 
-    status_lines = svn(svn_repo, 'status').split('\n')
+    status_lines = svn(svn_repo, 'status', '--no-ignore').split('\n')
 
-    for l in (l for l in status_lines if l.startswith('?')):
-        svn(svn_repo, 'add', l[1:].strip())
+    for l in (l for l in status_lines if (l.startswith('?') or
+                                          l.startswith('I'))):
+        svn(svn_repo, 'add', '--no-ignore', l[1:].strip())
     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:
         log(svn(svn_repo, 'commit', '-m', commit_msg, '--force-interactive'))
         log('Committed %s to svn.' % rev)