/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/smart/branch.py

  • Committer: Robert Collins
  • Date: 2009-05-23 20:57:12 UTC
  • mfrom: (4371 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4441.
  • Revision ID: robertc@robertcollins.net-20090523205712-lcwbfqk6vwavinuv
Merge .dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Server-side branch related request implmentations."""
18
18
 
45
45
        bzrdir = BzrDir.open_from_transport(transport)
46
46
        if bzrdir.get_branch_reference() is not None:
47
47
            raise errors.NotBranchError(transport.base)
48
 
        branch = bzrdir.open_branch()
 
48
        branch = bzrdir.open_branch(ignore_fallbacks=True)
49
49
        return self.do_with_branch(branch, *args)
50
50
 
51
51
 
80
80
 
81
81
        The body is not utf8 decoded - its the literal bytestream from disk.
82
82
        """
83
 
        # This was at one time called by RemoteBranchLockableFiles
84
 
        # intercepting access to this file; as of 1.5 it is not called by the
85
 
        # client but retained for compatibility.  It may be called again to
86
 
        # allow the client to get the configuration without needing vfs
87
 
        # access.
88
83
        try:
89
84
            content = branch._transport.get_bytes('branch.conf')
90
85
        except errors.NoSuchFile:
153
148
            return FailedSmartServerResponse(('TipChangeRejected', msg))
154
149
 
155
150
 
 
151
class SmartServerBranchRequestSetConfigOption(SmartServerLockedBranchRequest):
 
152
    """Set an option in the branch configuration."""
 
153
 
 
154
    def do_with_locked_branch(self, branch, value, name, section):
 
155
        if not section:
 
156
            section = None
 
157
        branch._get_config().set_option(value.decode('utf8'), name, section)
 
158
        return SuccessfulSmartServerResponse(())
 
159
 
 
160
 
156
161
class SmartServerBranchRequestSetLastRevision(SmartServerSetTipRequest):
157
162
 
158
163
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
232
237
        return SuccessfulSmartServerResponse(('ok',))
233
238
 
234
239
 
 
240
class SmartServerBranchRequestSetParentLocation(SmartServerLockedBranchRequest):
 
241
    """Set the parent location for a branch.
 
242
    
 
243
    Takes a location to set, which must be utf8 encoded.
 
244
    """
 
245
 
 
246
    def do_with_locked_branch(self, branch, location):
 
247
        branch._set_parent_location(location)
 
248
        return SuccessfulSmartServerResponse(())
 
249
 
 
250
 
235
251
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest):
236
252
 
237
253
    def do_with_branch(self, branch, branch_token='', repo_token=''):