← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

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
 
32
32
 
33
33
    def do(self, path, *args):
34
34
        """Execute a request for a branch at path.
35
 
    
 
35
 
36
36
        All Branch requests take a path to the branch as their first argument.
37
37
 
38
38
        If the branch is a branch reference, NotBranchError is raised.
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
 
74
74
 
75
75
 
76
76
class SmartServerBranchGetConfigFile(SmartServerBranchRequest):
77
 
    
 
77
 
78
78
    def do_with_branch(self, branch):
79
79
        """Return the content of branch.conf
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:
92
87
        return SuccessfulSmartServerResponse( ('ok', ), content)
93
88
 
94
89
 
 
90
class SmartServerBranchGetParent(SmartServerBranchRequest):
 
91
 
 
92
    def do_with_branch(self, branch):
 
93
        """Return the parent of branch."""
 
94
        parent = branch._get_parent_location() or ''
 
95
        return SuccessfulSmartServerResponse((parent,))
 
96
 
 
97
 
 
98
class SmartServerBranchGetTagsBytes(SmartServerBranchRequest):
 
99
 
 
100
    def do_with_branch(self, branch):
 
101
        """Return the _get_tags_bytes for a branch."""
 
102
        bytes = branch._get_tags_bytes()
 
103
        return SuccessfulSmartServerResponse((bytes,))
 
104
 
 
105
 
95
106
class SmartServerBranchRequestGetStackedOnURL(SmartServerBranchRequest):
96
107
 
97
108
    def do_with_branch(self, branch):
112
123
 
113
124
 
114
125
class SmartServerBranchRequestLastRevisionInfo(SmartServerBranchRequest):
115
 
    
 
126
 
116
127
    def do_with_branch(self, branch):
117
128
        """Return branch.last_revision_info().
118
 
        
 
129
 
119
130
        The revno is encoded in decimal, the revision_id is encoded as utf8.
120
131
        """
121
132
        revno, last_revision = branch.last_revision_info()
137
148
            return FailedSmartServerResponse(('TipChangeRejected', msg))
138
149
 
139
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
 
140
161
class SmartServerBranchRequestSetLastRevision(SmartServerSetTipRequest):
141
 
    
 
162
 
142
163
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
143
164
        if new_last_revision_id == 'null:':
144
165
            branch.set_revision_history([])
152
173
 
153
174
 
154
175
class SmartServerBranchRequestSetLastRevisionEx(SmartServerSetTipRequest):
155
 
    
 
176
 
156
177
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id,
157
178
            allow_divergence, allow_overwrite_descendant):
158
179
        """Set the last revision of the branch.
159
180
 
160
181
        New in 1.6.
161
 
        
 
182
 
162
183
        :param new_last_revision_id: the revision ID to set as the last
163
184
            revision of the branch.
164
185
        :param allow_divergence: A flag.  If non-zero, change the revision ID
205
226
 
206
227
    New in bzrlib 1.4.
207
228
    """
208
 
    
 
229
 
209
230
    def do_tip_change_with_locked_branch(self, branch, new_revno,
210
231
            new_last_revision_id):
211
232
        try:
217
238
 
218
239
 
219
240
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest):
220
 
    
 
241
 
221
242
    def do_with_branch(self, branch, branch_token='', repo_token=''):
222
243
        if branch_token == '':
223
244
            branch_token = None
263
284
        branch.dont_leave_lock_in_place()
264
285
        branch.unlock()
265
286
        return SuccessfulSmartServerResponse(('ok',))
266
 
        
 
287