← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: Andrew Bennetts
  • Date: 2008-10-01 05:40:45 UTC
  • mfrom: (3753 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20081001054045-z50qc0d3p9qsc5im
Merge from bzr.dev; resolve osutils.py conflict by reverting my sha import hackery.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
92
92
        return SuccessfulSmartServerResponse( ('ok', ), content)
93
93
 
94
94
 
 
95
class SmartServerBranchRequestGetStackedOnURL(SmartServerBranchRequest):
 
96
 
 
97
    def do_with_branch(self, branch):
 
98
        stacked_on_url = branch.get_stacked_on_url()
 
99
        return SuccessfulSmartServerResponse(('ok', stacked_on_url))
 
100
 
 
101
 
95
102
class SmartServerRequestRevisionHistory(SmartServerBranchRequest):
96
103
 
97
104
    def do_with_branch(self, branch):