/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-08-23 18:54:47 UTC
  • mfrom: (3645.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20080823185447-4fimhc5kjnedx6t6
(James Westby) Give the user a bit more information about which saved
        location is being used.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
652
652
                display_url = urlutils.unescape_for_display(stored_loc,
653
653
                        self.outf.encoding)
654
654
                if not is_quiet():
655
 
                    self.outf.write("Using saved location: %s\n" % display_url)
 
655
                    self.outf.write("Using saved parent location: %s\n" % display_url)
656
656
                location = stored_loc
657
657
 
658
658
        if mergeable is not None:
801
801
            else:
802
802
                display_url = urlutils.unescape_for_display(stored_loc,
803
803
                        self.outf.encoding)
804
 
                self.outf.write("Using saved location: %s\n" % display_url)
 
804
                self.outf.write("Using saved push location: %s\n" % display_url)
805
805
                location = stored_loc
806
806
 
807
807
        _show_push_branch(br_from, revision_id, location, self.outf,
3070
3070
        Report if the remembered location was used.
3071
3071
        """
3072
3072
        stored_location = tree.branch.get_submit_branch()
 
3073
        stored_location_type = "submit"
3073
3074
        if stored_location is None:
3074
3075
            stored_location = tree.branch.get_parent()
 
3076
            stored_location_type = "parent"
3075
3077
        mutter("%s", stored_location)
3076
3078
        if stored_location is None:
3077
3079
            raise errors.BzrCommandError("No location specified or remembered")
3078
3080
        display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
3079
 
        note(u"%s remembered location %s", verb_string, display_url)
 
3081
        note(u"%s remembered %s location %s", verb_string,
 
3082
                stored_location_type, display_url)
3080
3083
        return stored_location
3081
3084
 
3082
3085
 
3341
3344
                                             " or specified.")
3342
3345
            display_url = urlutils.unescape_for_display(parent,
3343
3346
                                                        self.outf.encoding)
3344
 
            self.outf.write("Using last location: " + display_url + "\n")
 
3347
            self.outf.write("Using saved parent location: "
 
3348
                    + display_url + "\n")
3345
3349
 
3346
3350
        remote_branch = Branch.open(other_branch)
3347
3351
        if remote_branch.base == local_branch.base:
4190
4194
                raise errors.BzrCommandError(
4191
4195
                    '--remember requires a branch to be specified.')
4192
4196
            stored_submit_branch = branch.get_submit_branch()
4193
 
            remembered_submit_branch = False
 
4197
            remembered_submit_branch = None
4194
4198
            if submit_branch is None:
4195
4199
                submit_branch = stored_submit_branch
4196
 
                remembered_submit_branch = True
 
4200
                remembered_submit_branch = "submit"
4197
4201
            else:
4198
4202
                if stored_submit_branch is None or remember:
4199
4203
                    branch.set_submit_branch(submit_branch)
4200
4204
            if submit_branch is None:
4201
4205
                submit_branch = branch.get_parent()
4202
 
                remembered_submit_branch = True
 
4206
                remembered_submit_branch = "parent"
4203
4207
            if submit_branch is None:
4204
4208
                raise errors.BzrCommandError('No submit branch known or'
4205
4209
                                             ' specified')
4206
 
            if remembered_submit_branch:
4207
 
                note('Using saved location "%s" to determine what changes to submit.', submit_branch)
 
4210
            if remembered_submit_branch is not None:
 
4211
                note('Using saved %s location "%s" to determine what '
 
4212
                        'changes to submit.', remembered_submit_branch,
 
4213
                        submit_branch)
4208
4214
 
4209
4215
            if mail_to is None:
4210
4216
                submit_config = Branch.open(submit_branch).get_config()