/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 breezy/reconfigure.py

Merge test-run support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/reconfigure.py
118
118
        # it may be a path relative to the cwd or a url; the branch wants
119
119
        # a path relative to itself...
120
120
        on_url = urlutils.relative_url(branch.base,
121
 
                                       urlutils.normalize_url(stacked_on_url))
122
 
        with branch.lock_write():
 
121
            urlutils.normalize_url(stacked_on_url))
 
122
        branch.lock_write()
 
123
        try:
123
124
            branch.set_stacked_on_url(on_url)
124
125
            if not trace.is_quiet():
125
126
                ui.ui_factory.note(gettext(
126
127
                    "{0} is now stacked on {1}\n").format(
127
 
                    branch.base, branch.get_stacked_on_url()))
 
128
                      branch.base, branch.get_stacked_on_url()))
 
129
        finally:
 
130
            branch.unlock()
128
131
 
129
132
 
130
133
class ReconfigureUnstacked(object):
131
134
 
132
135
    def apply(self, controldir):
133
136
        branch = controldir.open_branch()
134
 
        with branch.lock_write():
 
137
        branch.lock_write()
 
138
        try:
135
139
            branch.set_stacked_on_url(None)
136
140
            if not trace.is_quiet():
137
141
                ui.ui_factory.note(gettext(
138
142
                    "%s is now not stacked\n")
139
143
                    % (branch.base,))
 
144
        finally:
 
145
            branch.unlock()
140
146
 
141
147
 
142
148
class Reconfigure(object):
267
273
            raise ReconfigurationNotSupported(reconfiguration.controldir)
268
274
        if with_trees and reconfiguration.repository.make_working_trees():
269
275
            raise AlreadyWithTrees(controldir)
270
 
        elif (not with_trees and
271
 
              not reconfiguration.repository.make_working_trees()):
 
276
        elif (not with_trees
 
277
              and not reconfiguration.repository.make_working_trees()):
272
278
            raise AlreadyWithNoTrees(controldir)
273
279
        else:
274
280
            reconfiguration._repository_trees = with_trees
286
292
                self._create_repository = True
287
293
        else:
288
294
            if want_reference and (
289
 
                    self.repository.user_url == self.controldir.user_url):
 
295
                self.repository.user_url == self.controldir.user_url):
290
296
                if not self.repository.is_shared():
291
297
                    self._destroy_repository = True
292
298
        if self.referenced_branch is None:
326
332
 
327
333
    def changes_planned(self):
328
334
        """Return True if changes are planned, False otherwise"""
329
 
        return (self._unbind or self._bind or self._destroy_tree or
330
 
                self._create_tree or self._destroy_reference or
331
 
                self._create_branch or self._create_repository or
332
 
                self._create_reference or self._destroy_repository)
 
335
        return (self._unbind or self._bind or self._destroy_tree
 
336
                or self._create_tree or self._destroy_reference
 
337
                or self._create_branch or self._create_repository
 
338
                or self._create_reference or self._destroy_repository)
333
339
 
334
340
    def _check(self):
335
341
        """Raise if reconfiguration would destroy local changes"""
336
342
        if self._destroy_tree and self.tree.has_changes():
337
 
            raise errors.UncommittedChanges(self.tree)
 
343
                raise errors.UncommittedChanges(self.tree)
338
344
        if self._create_reference and self.local_branch is not None:
339
345
            reference_branch = branch.Branch.open(self._select_bind_location())
340
 
            if (reference_branch.last_revision()
341
 
                    != self.local_branch.last_revision()):
 
346
            if (reference_branch.last_revision() !=
 
347
                self.local_branch.last_revision()):
342
348
                raise UnsyncedBranches(self.controldir, reference_branch)
343
349
 
344
350
    def _select_bind_location(self):