Changes GetSVNBranch to prefer origin/HEAD over all others.

scm.py

 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """SCM-specific utility classes."""
 
 import glob
 import os
 import re
 import shutil
@@ skipping 154 matching lines @@
     git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
 
     # Get the refname and svn url for all refs/remotes/*.
     remotes = GIT.Capture(
         ['for-each-ref', '--format=%(refname)', 'refs/remotes'],
         cwd)[0].splitlines()
     svn_refs = {}
     for ref in remotes:
       match = git_svn_re.search(
           GIT.Capture(['cat-file', '-p', ref], cwd)[0])
-      if match and match.group(1) not in svn_refs:
-        # To prefer local refs over remote ones we only set the first occurence.
-        # The assumption being local refs are usually first.
+      # Prefer origin/HEAD over all others.
+      if match and (match.group(1) not in svn_refs or
+                    ref == "refs/remotes/origin/HEAD"):
         svn_refs[match.group(1)] = ref
 
     svn_branch = ''
     if len(svn_refs) == 1:
       # Only one svn branch exists -- seems like a good candidate.
       svn_branch = svn_refs.values()[0]
     elif len(svn_refs) > 1:
       # We have more than one remote branch available.  We don't
       # want to go through all of history, so read a line from the
       # pipe at a time.
@@ skipping 590 matching lines @@
     if not SVN.current_version:
       SVN.current_version = SVN.Capture(['--version']).split()[2]
     current_version_list = map(only_int, SVN.current_version.split('.'))
     for min_ver in map(int, min_version.split('.')):
       ver = current_version_list.pop(0)
       if ver < min_ver:
         return (False, SVN.current_version)
       elif ver > min_ver:
         return (True, SVN.current_version)
     return (True, SVN.current_version)