← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to push.py

Merge from ab-baz2bzr

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
18
17
from bzrlib.errors import MustUseDecorated, BzrOptionError
19
18
from bzrlib.option import Option
 
19
from bzrlib.workingtree import WorkingTree
20
20
import sys
21
21
import os
22
22
import bzrtools 
33
33
    _original_command = None
34
34
    takes_args = ['location?']
35
35
    takes_options = [Option('overwrite', help='Ignore differences between'
36
 
                            ' branches and overwrite unconditionally')]
 
36
                            ' branches and overwrite unconditionally'),
 
37
                     Option('no-tree', help='Do not push the working tree,'
 
38
                            ' just the .bzr.')]
37
39
 
38
 
    def run(self, location=None, overwrite=False):
39
 
        cur_branch = Branch.open_containing(".")[0]
40
 
        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)
41
44
        
42
 
    def run_argv(self, argv):
 
45
    def run_argv_aliases(self, argv, alias_argv=None):
43
46
        """Parse command line and run.
44
47
        
45
48
        If the command requests it, run the decorated version.
46
49
        """
47
50
        try:
48
 
            super(cmd_push, self).run_argv(list(argv))
 
51
            super(cmd_push, self).run_argv_aliases(list(argv), alias_argv)
49
52
        except (MustUseDecorated, BzrOptionError):
50
53
            if self._original_command is None:
51
54
                raise
52
 
            self._original_command().run_argv(argv)
 
55
            self._original_command().run_argv_aliases(argv, alias_argv)