From 5f947bba69de81f58f1adef10225c04727fa0ed5 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Fri, 3 Jul 2009 17:24:17 -0700 Subject: init: add -o, --origin to name manifest remote The -o option permits the user to control the name of the manifest's remote, which normally is hardcoded to be 'origin', but can differ because we derive it at runtime from the configuration file. Signed-off-by: Shawn O. Pearce --- project.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'project.py') diff --git a/project.py b/project.py index 6188ca72..c79e8fb9 100644 --- a/project.py +++ b/project.py @@ -1442,10 +1442,12 @@ class MetaProject(Project): if self.Exists: cb = self.CurrentBranch if cb: - base = self.GetBranch(cb).merge - if base: - self.revisionExpr = base + cb = self.GetBranch(cb) + if cb.merge: + self.revisionExpr = cb.merge self.revisionId = None + if cb.remote and cb.remote.name: + self.remote.name = cb.remote.name @property def LastFetch(self): -- cgit v1.2.3-54-g00ecf