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

Abstract manifest branch creation from init to the manifest object

Browse Source 
This permits the XML style manifest to use 'default', while other
types can use their own creation strategy for the current branch.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2009-07-03 16:24:57 -07:00
parent abb7a3dfec
commit 75b87c8a51
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifest.py
View File

@ -40,5 +40,8 @@ class Manifest(object):
def projects(self): def projects(self):
return {} return {}
def InitBranch(self):
pass
def SetMRefs(self, project): def SetMRefs(self, project):
pass pass

6
manifest_xml.py
View File

@ -169,6 +169,12 @@ class XmlManifest(Manifest):
self._Load() self._Load()
return self._default return self._default
def InitBranch(self):
m = self.manifestProject
if m.CurrentBranch is None:
return m.StartBranch('default')
return True
def SetMRefs(self, project): def SetMRefs(self, project):
if self.branch: if self.branch:
project._InitAnyMRef(R_M + self.branch) project._InitAnyMRef(R_M + self.branch)

7
subcmds/init.py
View File

@ -130,10 +130,9 @@ to update the working directory files.
m.Sync_LocalHalf(syncbuf) m.Sync_LocalHalf(syncbuf)
syncbuf.Finish() syncbuf.Finish()
if is_new or m.CurrentBranch is None: if not self.manifest.InitBranch():
if not m.StartBranch('default'): print >>sys.stderr, 'fatal: cannot create branch in manifest'
print >>sys.stderr, 'fatal: cannot create default in manifest' sys.exit(1)
sys.exit(1)
def _LinkManifest(self, name): def _LinkManifest(self, name):
if not name: if not name: