← 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-18 17:14:51 UTC
  • mfrom: (0.1.98 shelf)
  • Revision ID: aaron.bentley@utoronto.ca-20060318171451-2b15a9bcf7b77d69
Merge from shelf

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
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
16
from bzrlib.commands import Command
 
17
from bzrlib.errors import MustUseDecorated, BzrOptionError
17
18
from bzrlib.option import Option
18
19
from bzrlib.workingtree import WorkingTree
19
20
import sys
21
22
import bzrtools 
22
23
 
23
24
 
24
 
class cmd_rspush(Command):
 
25
class cmd_push(Command):
25
26
    """Upload this branch to another location using rsync.
26
27
 
27
28
    If no location is specified, the last-used location will be used.  To 
28
 
    prevent dirty trees from being uploaded, rspush will error out if there are 
 
29
    prevent dirty trees from being uploaded, push will error out if there are 
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'),
37
39
 
38
40
    def run(self, location=None, overwrite=False, no_tree=False):
39
41
        cur_branch = WorkingTree.open_containing(".")[0]
40
 
        bzrtools.rspush(cur_branch, location, overwrite=overwrite, 
 
42
        bzrtools.push(cur_branch, location, overwrite=overwrite, 
41
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)