chrome/common/extensions/docs/server2/branch_utility.py - Issue 10831269: Extensions Docs Server: BranchUtility not fetching branch numbers correctly (fixed)

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

Issue 10831269: Extensions Docs Server: BranchUtility not fetching branch numbers correctly (fixed) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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

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

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

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

index b1470c2e38c43593282adf2962ec20a2ead361af..f4159fe10cc8989e342bb9591c9aee1a922c349a 100644

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

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

@@ -26,8 +26,8 @@ class BranchUtility(object):

return (self._default_branch, path)

def GetBranchNumberForChannelName(self, channel_name):

- """Returns an empty string if the branch number cannot be found.

- Throws exception on network errors.

+ """Returns the branch number for a channel name. If the |channel_name| is

+ 'trunk' or 'local', then |channel_name| will be returned unchanged.

not at google - send to devlin 2012/08/13 00:53:00 "... because..."

cduvall 2012/08/13 21:45:04 Done.

"""

if channel_name in ['trunk', 'local']:

return channel_name

@@ -59,6 +59,6 @@ class BranchUtility(object):

self._memcache.Set(channel_name + '.' + self._base_path,

sorted_branches[0][0],

memcache.MEMCACHE_BRANCH_UTILITY,

- 86400)

+ time=86400)

return sorted_branches[0][0]