mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
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 <sop@google.com>
This commit is contained in:
parent
de646819b8
commit
7965f9fed0
2
main.py
2
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
|
||||
|
@ -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'),
|
||||
|
Loading…
Reference in New Issue
Block a user