← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Martin Pool
  • Date: 2010-01-29 14:09:05 UTC
  • mto: This revision was merged to the branch mainline in revision 4992.
  • Revision ID: mbp@sourcefrog.net-20100129140905-2uiarb6p8di1ywsr
Correction to url

from review: https://code.edge.launchpad.net/~mbp/bzr/doc/+merge/18250

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
"""UI helper for the push command."""
18
18
 
19
19
from bzrlib import (
 
20
    builtins,
 
21
    branch,
20
22
    bzrdir,
21
23
    errors,
22
24
    revision as _mod_revision,
57
59
 
58
60
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
59
61
    overwrite=False, remember=False, stacked_on=None, create_prefix=False,
60
 
    use_existing_dir=False, no_tree=False):
 
62
    use_existing_dir=False):
61
63
    """Push a branch to a location.
62
64
 
63
65
    :param br_from: the source branch
87
89
        try:
88
90
            br_to = br_from.create_clone_on_transport(to_transport,
89
91
                revision_id=revision_id, stacked_on=stacked_on,
90
 
                create_prefix=create_prefix, use_existing_dir=use_existing_dir,
91
 
                no_tree=no_tree)
 
92
                create_prefix=create_prefix, use_existing_dir=use_existing_dir)
92
93
        except errors.FileExists, err:
93
94
            if err.path.endswith('/.bzr'):
94
95
                raise errors.BzrCommandError(
109
110
                    "\nYou may supply --create-prefix to create all"
110
111
                    " leading parent directories."
111
112
                    % location)
112
 
            # This shouldn't occur (because create_prefix is true, so
113
 
            # create_clone_on_transport should be catching NoSuchFile and
114
 
            # creating the missing directories) but if it does the original
115
 
            # NoSuchFile error will be more informative than an
116
 
            # UnboundLocalError for br_to.
117
 
            raise
118
113
        except errors.TooManyRedirections:
119
114
            raise errors.BzrCommandError("Too many redirections trying "
120
115
                                         "to make %s." % location)
129
124
        push_result.target_branch = br_to
130
125
        push_result.old_revid = _mod_revision.NULL_REVISION
131
126
        push_result.old_revno = 0
132
 
        # Remembers if asked explicitly or no previous location is set
133
 
        if (remember
134
 
            or (remember is None and br_from.get_push_location() is None)):
 
127
        if br_from.get_push_location() is None or remember:
135
128
            br_from.set_push_location(br_to.base)
136
129
    else:
137
130
        if stacked_on is not None: