diff options
author | Shawn O. Pearce <sop@google.com> | 2009-07-03 18:05:23 -0700 |
---|---|---|
committer | Shawn O. Pearce <sop@google.com> | 2009-07-03 20:50:52 -0700 |
commit | 0125ae2fda18deee89dc94b32a2daa1b37a8a361 (patch) | |
tree | db0d0af58d10cb0cdb709fc604732f2454f0ab78 /subcmds/manifest.py | |
parent | a7ce096047a7707edc572de375b700d161b9520b (diff) | |
download | git-repo-0125ae2fda18deee89dc94b32a2daa1b37a8a361.tar.gz |
Introduce manifest format using git submodules
If a manifest top level directory contains '.gitmodules' we now
assume this is a git module format manifest and switch to using
that code, rather than the legacy XML based manifest.
At the same time, we move the bare repository for a project from
$TOP/.repo/projects/$REPO_PATH.git to be $REPO_NAME.git instead.
This makes it easier for us to later support a repo init from an
existing work tree, as we can more accurately predict the path of
the project's repository in the workspace. It also means that the
$TOP/.repo/projects/ directory is layed out like a mirror would be.
Signed-off-by: Shawn O. Pearce <sop@google.com>
Diffstat (limited to 'subcmds/manifest.py')
-rw-r--r-- | subcmds/manifest.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/subcmds/manifest.py b/subcmds/manifest.py index 551b13bd..7a8b2ee8 100644 --- a/subcmds/manifest.py +++ b/subcmds/manifest.py | |||
@@ -22,7 +22,7 @@ from manifest_xml import XmlManifest | |||
22 | def _doc(name): | 22 | def _doc(name): |
23 | r = os.path.dirname(__file__) | 23 | r = os.path.dirname(__file__) |
24 | r = os.path.dirname(r) | 24 | r = os.path.dirname(r) |
25 | fd = open(os.path.join(r, 'docs', 'manifest_xml.txt')) | 25 | fd = open(os.path.join(r, 'docs', name)) |
26 | try: | 26 | try: |
27 | return fd.read() | 27 | return fd.read() |
28 | finally: | 28 | finally: |
@@ -48,6 +48,8 @@ in a Git repository for use during future 'repo init' invocations. | |||
48 | help = '' | 48 | help = '' |
49 | if isinstance(self.manifest, XmlManifest): | 49 | if isinstance(self.manifest, XmlManifest): |
50 | help += self._xmlHelp + '\n' + _doc('manifest_xml.txt') | 50 | help += self._xmlHelp + '\n' + _doc('manifest_xml.txt') |
51 | if isinstance(self.manifest, SubmoduleManifest): | ||
52 | help += _doc('manifest_submodule.txt') | ||
51 | return help | 53 | return help |
52 | 54 | ||
53 | def _Options(self, p): | 55 | def _Options(self, p): |