loggerhead

Merge lp://staging/~mnordhoff/loggerhead/readonly_local_path_from_url into lp://staging/loggerhead

readonly_local_path_from_url
Merge into trunk-rich

Proposed by Matt Nordhoff on 2010-03-25

Status:	Merged
Approved by:	Martin Albisetti on 2010-03-25
Approved revision:	402
Merged at revision:	not available
Proposed branch:	lp://staging/~mnordhoff/loggerhead/readonly_local_path_from_url
Merge into:	lp://staging/loggerhead
Diff against target:	91 lines (+19/-6) 4 files modified NEWS (+3/-0) loggerhead/apps/branch.py (+4/-2) loggerhead/apps/transport.py (+2/-4) loggerhead/util.py (+10/-0)
To merge this branch:	bzr merge lp://staging/~mnordhoff/loggerhead/readonly_local_path_from_url
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Michael Hudson-Doyle		Approve on 2010-03-29
Martin Albisetti	2010-03-25	Approve on 2010-03-25
Review via email: mp+22150@code.staging.launchpad.net

Commit message

Ignore readonly+ prefix when checking if a branch URL is local. (Matt Nordhoff)

Description of the change

This adds a loggerhead.util.local_path_from_url() function, that simple strips off the 'readonly+' prefix and thunks over to bzrlib.urlutils.local_path_from_url().

We did strip off 'readonly+' in the one place we used local_path_from_url(), but we did base.startswith('file://') in another location without taking it into account, breaking the "To get this branch" bit unless you pass --allow-writes (or set public_branch, of course).

I grepped around, and these should be the only locations affected.

(Darn, just thought of a better commit message...)

Revision history for this message