Configuring local colocated branches matches too broadly

[Aaron Bentley]

Configuration of local branches ignores the branch name, so branches with the right colocated location but wrong name will match a config that should not match. This problem does not occur with remote branches, so it is likely the same root cause as Bug #1015570: file:/// locations being converted to filesystem paths too early.

Given the following config section:

[file:///home/abentley/hacking/bzr,branch=dev]
public_branch = !!
[bzr+ssh://launchpad.net/bzr,branch=dev]
public_branch = !!

# Correct remote match
$ bzr config public_branch --scope=locations -d bzr+ssh://launchpad.net/bzr,branch=dev
!!
# Correct remote miss
$ bzr config public_branch --scope=locations -d bzr+ssh://launchpad.net/bzr
bzr: ERROR: The "public_branch" configuration option does not exist.
# Correct local match
$ bzr config public_branch --scope=locations -d file:///home/abentley/hacking/bzr,branch=dev
!!
# Incorrect local match
$ bzr config public_branch --scope=locations -d file:///home/abentley/hacking/bzr
!!