[MERGE][Bug 194716] Implement pull --local

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Gary van der Merwe wrote:
> On Thu, Feb 26, 2009 at 11:13 PM, Gary van der Merwe <garyvdm at gmail.com> wrote:
>> On Thu, Feb 26, 2009 at 11:12 PM, Gary van der Merwe <garyvdm at gmail.com> wrote:
>>> This patch adds --local option to bzr pull.
>>> This fixes https://bugs.launchpad.net/bzr/+bug/194716
>>
>> I forgot to attach the bundle :-(
> 
> 
> It seem I don't know how to use email either.
> 

+        if local and not bound_location:
+            raise errors.LocalRequiresBoundBranch()
         master_branch = None
         if bound_location and source.base != bound_location:
             # not pulling from master, so we need to update master.
             master_branch = self.get_master_branch(possible_transports)
             master_branch.lock_write()
         try:
- -            if master_branch:
+            if master_branch and not local:

^- I don't think you want to actually *connect* to the master_branch
when given 'local'.

So you probably want to check 'bound_location' but not 'master_branch'.

Perhaps you could change it to:

if not local and bound_location and source.base != bound_location:

That should prevent opening a connection to the master branch.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkmnC20ACgkQJdeBCYSNAAPg7ACdEQHOf7U/AZ6dSz0R1YQVv2K0
j0sAn3/NL0eHoiOuz4xjzIQNnFtJ3/OL
=8X0I
-----END PGP SIGNATURE-----