← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to rpush.py

  • Committer: Aaron Bentley
  • Date: 2006-05-03 19:39:28 UTC
  • mfrom: (147.4.37 push-to-rpush)
  • mto: This revision was merged to the branch mainline in revision 366.
  • Revision ID: abentley@panoramicfeedback.com-20060503193928-9cb76ec7fa7e881d
Merge from Robert

Show diffs side-by-side

added added

removed removed

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