← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to push.py

  • Committer: Aaron Bentley
  • Date: 2005-10-29 04:53:42 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20051029045342-5b7a8ebf57e3f713
Release 0.6

Show diffs side-by-side

added added

removed removed

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