← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to push.py

  • Committer: Aaron Bentley
  • Date: 2006-03-27 17:03:31 UTC
  • mto: This revision was merged to the branch mainline in revision 358.
  • Revision ID: abentley@panoramicfeedback.com-20060327170331-1b8ef9a9429cd920
Provided --branch option to for zapping branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
from bzrlib.branch import Branch
17
16
from bzrlib.commands import Command
 
17
from bzrlib.errors import MustUseDecorated, BzrOptionError
18
18
from bzrlib.option import Option
 
19
from bzrlib.workingtree import WorkingTree
19
20
import sys
20
21
import os
21
22
import bzrtools 
29
30
    unknown files or local changes.  It will also error out if the upstream 
30
31
    directory is non-empty and not an earlier version of the branch. 
31
32
    """
 
33
    _original_command = None
32
34
    takes_args = ['location?']
33
35
    takes_options = [Option('overwrite', help='Ignore differences between'
34
 
                            ' branches and overwrite unconditionally')]
 
36
                            ' branches and overwrite unconditionally'),
 
37
                     Option('no-tree', help='Do not push the working tree,'
 
38
                            ' just the .bzr.')]
35
39
 
36
 
    def run(self, location=None, overwrite=False):
37
 
        cur_branch = Branch.open_containing(".")[0]
38
 
        bzrtools.push(cur_branch, location, overwrite=overwrite)
 
40
    def run(self, location=None, overwrite=False, no_tree=False):
 
41
        cur_branch = WorkingTree.open_containing(".")[0]
 
42
        bzrtools.push(cur_branch, location, overwrite=overwrite, 
 
43
                      working_tree=not no_tree)
 
44
        
 
45
    def run_argv_aliases(self, argv, alias_argv=None):
 
46
        """Parse command line and run.
 
47
        
 
48
        If the command requests it, run the decorated version.
 
49
        """
 
50
        try:
 
51
            super(cmd_push, self).run_argv_aliases(list(argv), alias_argv)
 
52
        except (MustUseDecorated, BzrOptionError):
 
53
            if self._original_command is None:
 
54
                raise
 
55
            self._original_command().run_argv_aliases(argv, alias_argv)