chrome/common/extensions/docs/server2/patch_servlet.py - Issue 26538009: Docserver: make file_system a property of Create

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/patch_servlet.py

Issue 26538009: Docserver: make file_system a property of Create (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: niggles Created 7 years, 2 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

« no previous file with comments | « chrome/common/extensions/docs/server2/new_github_file_system.py ('k') | chrome/common/extensions/docs/server2/patch_servlet_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6bef0d8df46fc3dbcbb59d9e46b70ed80728fd44..2fd673d3c9bdf3eb69e3caed12c2c4b2defa7739 100644

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

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

@@ -34,13 +34,8 @@ class _PatchServletDelegate(RenderServlet.Delegate):

# example is to add documentation for an existing API).

object_store_creator = ObjectStoreCreator(start_empty=False)

- unpatched_host_file_system_provider = (

- self._delegate.CreateHostFileSystemProvider(object_store_creator))

- unpatched_trunk_host_file_system = (

- unpatched_host_file_system_provider.GetTrunk())

- unpatched_compiled_fs_factory = CompiledFileSystem.Factory(

- unpatched_trunk_host_file_system,

- object_store_creator)

+ unpatched_file_system = self._delegate.CreateHostFileSystemProvider(

+ object_store_creator).GetTrunk()

rietveld_patcher = CachingRietveldPatcher(

RietveldPatcher(svn_constants.EXTENSIONS_PATH,

@@ -48,8 +43,9 @@ class _PatchServletDelegate(RenderServlet.Delegate):

AppEngineUrlFetcher(url_constants.CODEREVIEW_SERVER)),

object_store_creator)

- patched_file_system = PatchedFileSystem(unpatched_trunk_host_file_system,

+ patched_file_system = PatchedFileSystem(unpatched_file_system,

rietveld_patcher)

patched_host_file_system_provider = (

self._delegate.CreateHostFileSystemProvider(

object_store_creator,

@@ -58,13 +54,9 @@ class _PatchServletDelegate(RenderServlet.Delegate):

offline=False,

# The trunk file system for this creator should be the patched one.

default_trunk_instance=patched_file_system))

- patched_compiled_fs_factory = CompiledFileSystem.Factory(

- patched_file_system,

- object_store_creator)

combined_compiled_fs_factory = ChainedCompiledFileSystem.Factory(

- [(patched_compiled_fs_factory, patched_file_system),

- (unpatched_compiled_fs_factory, unpatched_trunk_host_file_system)])

+ [unpatched_file_system], object_store_creator)

branch_utility = self._delegate.CreateBranchUtility(object_store_creator)