← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-03-06 06:48:25 UTC
  • mfrom: (4070.8.6 debug-config)
  • Revision ID: pqm@pqm.ubuntu.com-20090306064825-kbpwggw21dygeix6
(mbp) debug_flags configuration option

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""UI helper for the push command."""
18
18
 
19
 
from bzrlib import (
20
 
    builtins,
21
 
    branch,
22
 
    bzrdir,
23
 
    errors,
24
 
    revision as _mod_revision,
25
 
    transport,
26
 
    )
27
 
from bzrlib.trace import (
28
 
    note,
29
 
    warning,
30
 
    )
31
 
 
32
 
 
33
 
class PushResult(object):
34
 
    """Result of a push operation.
35
 
 
36
 
    :ivar branch_push_result: Result of a push between branches
37
 
    :ivar target_branch: The target branch
38
 
    :ivar stacked_on: URL of the branch on which the result is stacked
39
 
    :ivar workingtree_updated: Whether or not the target workingtree was updated.
40
 
    """
41
 
 
42
 
    def __init__(self):
43
 
        self.branch_push_result = None
44
 
        self.stacked_on = None
45
 
        self.workingtree_updated = None
46
 
        self.target_branch = None
47
 
 
48
 
    def report(self, to_file):
49
 
        """Write a human-readable description of the result."""
50
 
        if self.branch_push_result is None:
51
 
            if self.stacked_on is not None:
52
 
                note('Created new stacked branch referring to %s.' %
53
 
                    self.stacked_on)
54
 
            else:
55
 
                note('Created new branch.')
56
 
        else:
57
 
            self.branch_push_result.report(to_file)
 
19
from bzrlib import (builtins, bzrdir, errors, revision as _mod_revision,
 
20
                    transport)
 
21
from bzrlib.trace import note, warning
58
22
 
59
23
 
60
24
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
84
48
        dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
85
49
    except errors.NotBranchError:
86
50
        pass # Didn't find anything
 
51
    else:
 
52
        # If we can open a branch, use its direct repository, otherwise see
 
53
        # if there is a repository without a branch.
 
54
        try:
 
55
            br_to = dir_to.open_branch()
 
56
        except errors.NotBranchError:
 
57
            # Didn't find a branch, can we find a repository?
 
58
            try:
 
59
                repository_to = dir_to.find_repository()
 
60
            except errors.NoRepositoryPresent:
 
61
                pass
 
62
        else:
 
63
            # Found a branch, so we must have found a repository
 
64
            repository_to = br_to.repository
87
65
 
88
 
    push_result = PushResult()
 
66
    push_result = None
89
67
    if dir_to is None:
90
68
        # The destination doesn't exist; create it.
91
69
        # XXX: Refactor the create_prefix/no_create_prefix code into a
127
105
            revision_id=revision_id, stacked_on=stacked_on)
128
106
        # TODO: Some more useful message about what was copied
129
107
        try:
130
 
            push_result.stacked_on = br_to.get_stacked_on_url()
 
108
            finally_stacked_on = br_to.get_stacked_on_url()
131
109
        except (errors.UnstackableBranchFormat,
132
110
                errors.UnstackableRepositoryFormat,
133
111
                errors.NotStacked):
134
 
            push_result.stacked_on = None
135
 
        push_result.target_branch = br_to
136
 
        push_result.old_revid = _mod_revision.NULL_REVISION
137
 
        push_result.old_revno = 0
 
112
            finally_stacked_on = None
 
113
        if finally_stacked_on is not None:
 
114
            note('Created new stacked branch referring to %s.' %
 
115
                 finally_stacked_on)
 
116
        else:
 
117
            note('Created new branch.')
 
118
        # We successfully created the target, remember it
138
119
        if br_from.get_push_location() is None or remember:
139
120
            br_from.set_push_location(br_to.base)
140
 
    else:
 
121
    elif repository_to is None:
 
122
        # we have a bzrdir but no branch or repository
 
123
        # XXX: Figure out what to do other than complain.
 
124
        raise errors.BzrCommandError("At %s you have a valid .bzr control"
 
125
            " directory, but not a branch or repository. This is an"
 
126
            " unsupported configuration. Please move the target directory"
 
127
            " out of the way and try again."
 
128
            % location)
 
129
    elif br_to is None:
 
130
        # We have a repository but no branch, copy the revisions, and then
 
131
        # create a branch.
141
132
        if stacked_on is not None:
142
133
            warning("Ignoring request for a stacked branch as repository "
143
134
                    "already exists at the destination location.")
 
135
        repository_to.fetch(br_from.repository, revision_id=revision_id)
 
136
        br_to = br_from.clone(dir_to, revision_id=revision_id)
 
137
        note('Created new branch.')
 
138
        if br_from.get_push_location() is None or remember:
 
139
            br_from.set_push_location(br_to.base)
 
140
    else: # We have a valid to branch
 
141
        if stacked_on is not None:
 
142
            warning("Ignoring request for a stacked branch as branch "
 
143
                    "already exists at the destination location.")
 
144
        # We were able to connect to the remote location, so remember it.
 
145
        # (We don't need to successfully push because of possible divergence.)
 
146
        if br_from.get_push_location() is None or remember:
 
147
            br_from.set_push_location(br_to.base)
144
148
        try:
145
 
            push_result = dir_to.push_branch(br_from, revision_id, overwrite, 
146
 
                remember)
 
149
            try:
 
150
                tree_to = dir_to.open_workingtree()
 
151
            except errors.NotLocalUrl:
 
152
                note("This transport does not update the working "
 
153
                     "tree of: %s. See 'bzr help working-trees' for "
 
154
                     "more information." % br_to.base)
 
155
                push_result = br_from.push(br_to, overwrite,
 
156
                                           stop_revision=revision_id)
 
157
            except errors.NoWorkingTree:
 
158
                push_result = br_from.push(br_to, overwrite,
 
159
                                           stop_revision=revision_id)
 
160
            else:
 
161
                tree_to.lock_write()
 
162
                try:
 
163
                    push_result = br_from.push(tree_to.branch, overwrite,
 
164
                                               stop_revision=revision_id)
 
165
                    tree_to.update()
 
166
                finally:
 
167
                    tree_to.unlock()
147
168
        except errors.DivergedBranches:
148
169
            raise errors.BzrCommandError('These branches have diverged.'
149
170
                                    '  Try using "merge" and then "push".')
150
 
        except errors.NoRepositoryPresent:
151
 
            # we have a bzrdir but no branch or repository
152
 
            # XXX: Figure out what to do other than complain.
153
 
            raise errors.BzrCommandError("At %s you have a valid .bzr"
154
 
                " control directory, but not a branch or repository. This"
155
 
                " is an unsupported configuration. Please move the target"
156
 
                " directory out of the way and try again." % location)
157
 
        if push_result.workingtree_updated == False:
158
 
            warning("This transport does not update the working " 
159
 
                    "tree of: %s. See 'bzr help working-trees' for "
160
 
                    "more information." % push_result.target_branch.base)
161
 
    push_result.report(to_file)
 
171
    if push_result is not None:
 
172
        push_result.report(to_file)
 
173
        old_revid = push_result.old_revid
 
174
        old_revno = push_result.old_revno
 
175
    else:
 
176
        old_revid = _mod_revision.NULL_REVISION
 
177
        old_revno = 0
162
178
    if verbose:
163
 
        br_to = push_result.target_branch
164
179
        br_to.lock_read()
165
180
        try:
166
181
            from bzrlib.log import show_branch_change
167
 
            show_branch_change(br_to, to_file, push_result.old_revno, 
168
 
                               push_result.old_revid)
 
182
            show_branch_change(br_to, to_file, old_revno, old_revid)
169
183
        finally:
170
184
            br_to.unlock()
171
 
 
172