← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Wouter van Heyst
  • Date: 2006-06-06 22:37:30 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: larstiq@larstiq.dyndns.org-20060606223730-a308c5429fc6c617
change branch.{get,set}_parent to store a relative path but return full urls

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
443
443
        if branch_to.get_parent() is None or remember:
444
444
            branch_to.set_parent(branch_from.base)
445
445
 
446
 
 
447
446
        if revision is None:
448
447
            rev_id = None
449
448
        elif len(revision) == 1:
2074
2073
 
2075
2074
        branch = self._get_remembered_parent(tree, branch, 'Merging from')
2076
2075
 
2077
 
        if tree.branch.get_parent() is None or remember:
2078
 
            tree.branch.set_parent(branch)
2079
 
 
2080
2076
        if revision is None or len(revision) < 1:
2081
2077
            base = [None, None]
2082
2078
            other = [branch, -1]
2136
2132
        if supplied_location is not None:
2137
2133
            return supplied_location
2138
2134
        stored_location = tree.branch.get_parent()
 
2135
        mutter("%s", stored_location)
2139
2136
        if stored_location is None:
2140
2137
            raise BzrCommandError("No location specified or remembered")
2141
2138
        display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)