← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Martin Pool
  • Date: 2011-03-28 01:28:09 UTC
  • mto: (5425.4.19 220464-stale-locks)
  • mto: This revision was merged to the branch mainline in revision 5970.
  • Revision ID: mbp@canonical.com-20110328012809-frw003r09tcrxkiz
Represent lock held info as an object, not just a dict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
63
63
            submit_branch = stored_submit_branch
64
64
            remembered_submit_branch = "submit"
65
65
        else:
66
 
            # Remembers if asked explicitly or no previous location is set
67
 
            if remember or (remember is None and stored_submit_branch is None):
 
66
            if stored_submit_branch is None or remember:
68
67
                branch.set_submit_branch(submit_branch)
69
68
        if submit_branch is None:
70
69
            submit_branch = branch.get_parent()
96
95
        stored_public_branch = branch.get_public_branch()
97
96
        if public_branch is None:
98
97
            public_branch = stored_public_branch
99
 
        # Remembers if asked explicitly or no previous location is set
100
 
        elif (remember
101
 
              or (remember is None and stored_public_branch is None)):
 
98
        elif stored_public_branch is None or remember:
102
99
            branch.set_public_branch(public_branch)
103
100
        if no_bundle and public_branch is None:
104
101
            raise errors.BzrCommandError('No public branch specified or'