chrome/common/extensions/docs/server2/server_instance.py - Issue 491653002: Docserver: Use GitilesFileSystem instead of SubversionFileSystem

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/docs/server2/server_instance.py

Issue 491653002: Docserver: Use GitilesFileSystem instead of SubversionFileSystem (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/common/extensions/docs/server2/app_yaml_helper_test.py ('K') | « chrome/common/extensions/docs/server2/render_servlet_test.py ('k') | chrome/common/extensions/docs/server2/sidenav_data_source.py » ('j') | chrome/common/extensions/docs/templates/private/warning_master.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/docs/server2/server_instance.py

diff --git a/chrome/common/extensions/docs/server2/server_instance.py b/chrome/common/extensions/docs/server2/server_instance.py

index a7908214816e846da9b408c124d3af2bd2f385c3..c61d875b566d5d00f954580c208a68a69eafda26 100644

--- a/chrome/common/extensions/docs/server2/server_instance.py

+++ b/chrome/common/extensions/docs/server2/server_instance.py

@@ -56,7 +56,7 @@ class ServerInstance(object):

self.compiled_fs_factory = compiled_fs_factory

self.host_file_system_provider = host_file_system_provider

- host_fs_at_trunk = host_file_system_provider.GetTrunk()

+ host_fs_at_master = host_file_system_provider.GetMaster()

self.github_file_system_provider = github_file_system_provider

self.gcs_file_system_provider = gcs_file_system_provider

@@ -71,7 +71,7 @@ class ServerInstance(object):

self.platform_bundle = PlatformBundle(

branch_utility,

self.compiled_fs_factory,

- host_fs_at_trunk,

+ host_fs_at_master,

self.host_file_system_iterator,

self.object_store_creator,

self.base_path)

@@ -79,7 +79,7 @@ class ServerInstance(object):

self.content_providers = ContentProviders(

object_store_creator,

self.compiled_fs_factory,

- host_fs_at_trunk,

+ host_fs_at_master,

self.github_file_system_provider,

self.gcs_file_system_provider)

@@ -92,7 +92,7 @@ class ServerInstance(object):

# TemplateDataSource itself rather than depending on template_renderer, but

# for that the above todo should be addressed.

self.document_renderer = DocumentRenderer(

- TableOfContentsRenderer(host_fs_at_trunk,

+ TableOfContentsRenderer(host_fs_at_master,

compiled_fs_factory,

self.template_renderer),

self.platform_bundle)