← 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-11-04 23:18:25 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20051104231825-e1c079c6f517a0ee
Cherry-picked Robert's diff and push fixes

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
18
19
from bzrlib.option import Option
19
20
import sys
20
21
import os
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
36
                            ' branches and overwrite unconditionally')]
36
38
    def run(self, location=None, overwrite=False):
37
39
        cur_branch = Branch.open_containing(".")[0]
38
40
        bzrtools.push(cur_branch, location, overwrite=overwrite)
 
41
        
 
42
    def run_argv(self, argv):
 
43
        """Parse command line and run.
 
44
        
 
45
        If the command requests it, run the decorated version.
 
46
        """
 
47
        try:
 
48
            super(cmd_push, self).run_argv(list(argv))
 
49
        except (MustUseDecorated, BzrOptionError):
 
50
            if self._original_command is None:
 
51
                raise
 
52
            self._original_command().run_argv(argv)