commit cc6c79643e1cafad565424caabe581e7b548bf6f
author Shawn O. Pearce <sop@google.com> Fri Jul 03 15:29:02 2009 -0700
committer Shawn O. Pearce <sop@google.com> Fri Jul 03 20:03:38 2009 -0700
tree 29fe305852e0488f54548e1d2a9d3e39f8d39f85
parent 2095179beec754d2d5bfe175215e736b7ff838e9

Make refs/remotes/m management the manifest object's responsibility

I plan to have the new submodule manifest format use a different
layout for the m refs than the XML manifest format has used in
the past.  Thus we need to move the behavior management into the
manifest object, and out of the project, so we can change it.

Signed-off-by: Shawn O. Pearce <sop@google.com>

git_refs.py

diff --git a/git_refs.py b/git_refs.py
index ac8ed0c..b24a0b4 100644
--- a/git_refs.py
+++ b/git_refs.py
@@ -21,7 +21,6 @@
 R_HEADS = 'refs/heads/'
 R_TAGS  = 'refs/tags/'
 R_PUB   = 'refs/published/'
-R_M     = 'refs/remotes/m/'
 
 
 class GitRefs(object):

manifest.py

diff --git a/manifest.py b/manifest.py
index bf801df..0762098 100644
--- a/manifest.py
+++ b/manifest.py
@@ -35,3 +35,10 @@
   @property
   def IsMirror(self):
     return self.manifestProject.config.GetBoolean('repo.mirror')
+
+  @property
+  def projects(self):
+    return {}
+
+  def SetMRefs(self, project):
+    pass

manifest_xml.py

diff --git a/manifest_xml.py b/manifest_xml.py
index 97df75b..66cdf3e 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -29,6 +29,7 @@
 
 MANIFEST_FILE_NAME = 'manifest.xml'
 LOCAL_MANIFEST_NAME = 'local_manifest.xml'
+R_M = 'refs/remotes/m/'
 
 class _Default(object):
   """Project defaults within the manifest."""
@@ -168,6 +169,10 @@
     self._Load()
     return self._default
 
+  def SetMRefs(self, project):
+    if self.branch:
+      project._InitAnyMRef(R_M + self.branch)
+
   def _Unload(self):
     self._loaded = False
     self._projects = {}

project.py

diff --git a/project.py b/project.py
index bedc91e..6188ca7 100644
--- a/project.py
+++ b/project.py
@@ -27,7 +27,7 @@
 from error import GitError, ImportError, UploadError
 from error import ManifestInvalidRevisionError
 
-from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M
+from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB
 
 def _lwrite(path, content):
   lock = '%s.lock' % path
@@ -598,7 +598,7 @@
       return False
 
     if self.worktree:
-      self._InitMRef()
+      self.manifest.SetMRefs(self)
     else:
       self._InitMirrorHead()
       try:
@@ -1080,10 +1080,6 @@
         remote.ResetFetch(mirror=True)
       remote.Save()
 
-  def _InitMRef(self):
-    if self.manifest.branch:
-      self._InitAnyMRef(R_M + self.manifest.branch)
-
   def _InitMirrorHead(self):
     self._InitAnyMRef(HEAD)