android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Assume the manifest branch matches the branch name in Git

Browse Source 
Whatever branch name we checked the manifest out from is the name
we want to reflect throughout the rest of the projects, e.g. within
the special "m/" remote space.

This reduces the difference between different branches within the
manifest file.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2008-11-04 08:22:07 -08:00
parent f5c25a68d8
commit 2450a2987a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifest.py
View File

@ -18,7 +18,7 @@ import sys
import xml.dom.minidom import xml.dom.minidom
from git_config import GitConfig, IsId from git_config import GitConfig, IsId
from project import Project, MetaProject, R_TAGS from project import Project, MetaProject, R_HEADS
from remote import Remote from remote import Remote
from error import ManifestParseError from error import ManifestParseError
@ -97,6 +97,12 @@ class Manifest(object):
def _Load(self): def _Load(self):
if not self._loaded: if not self._loaded:
m = self.manifestProject
b = m.GetBranch(m.CurrentBranch).merge
if b.startswith(R_HEADS):
b = b[len(R_HEADS):]
self.branch = b
self._ParseManifest(True) self._ParseManifest(True)
local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME) local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME)
@ -123,11 +129,6 @@ class Manifest(object):
"no <manifest> in %s" % \ "no <manifest> in %s" % \
self.manifestFile self.manifestFile
if is_root_file:
self.branch = config.getAttribute('branch')
if not self.branch:
self.branch = 'default'
for node in config.childNodes: for node in config.childNodes:
if node.nodeName == 'remote': if node.nodeName == 'remote':
remote = self._ParseRemote(node) remote = self._ParseRemote(node)