From 7965f9fed083f07255d62f2a4a49fb54424356e4 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 29 Oct 2008 15:20:02 -0700 Subject: [PATCH] Move the Editor configuration out of Manifest's constructor This way we can build more than one Manifest instance in memory and not muck around with the Editor configuration each time we build a new instance. Signed-off-by: Shawn O. Pearce --- main.py | 2 ++ manifest.py | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 85c29417..0901c845 100755 --- a/main.py +++ b/main.py @@ -28,6 +28,7 @@ import re import sys from command import InteractiveCommand, PagedCommand +from editor import Editor from error import NoSuchProjectError from error import RepoChangedException from manifest import Manifest @@ -77,6 +78,7 @@ class _Repo(object): cmd.repodir = self.repodir cmd.manifest = Manifest(cmd.repodir) + Editor.globalConfig = cmd.manifest.globalConfig if not gopts.no_pager and not isinstance(cmd, InteractiveCommand): config = cmd.manifest.globalConfig diff --git a/manifest.py b/manifest.py index 89dd5bed..8c5a8d6d 100644 --- a/manifest.py +++ b/manifest.py @@ -17,7 +17,6 @@ import os import sys import xml.dom.minidom -from editor import Editor from git_config import GitConfig, IsId from import_tar import ImportTar from import_zip import ImportZip @@ -42,9 +41,7 @@ class Manifest(object): self.repodir = os.path.abspath(repodir) self.topdir = os.path.dirname(self.repodir) self.manifestFile = os.path.join(self.repodir, MANIFEST_FILE_NAME) - self.globalConfig = GitConfig.ForUser() - Editor.globalConfig = self.globalConfig self.repoProject = MetaProject(self, 'repo', gitdir = os.path.join(repodir, 'repo/.git'),