← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to rspush.py

  • Committer: Aaron Bentley
  • Date: 2012-01-20 02:07:15 UTC
  • Revision ID: aaron@aaronbentley.com-20120120020715-ar6jbqnrjcuebggz
Tags: release-2.5
Update for 2.5 release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
rspush.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 import Branch
17
 
from bzrlib.commands import Command
18
 
import sys
19
 
import os
20
 
import bzrtools 
21
 
 
22
 
class cmd_push(Command):
 
16
from bzrlib.option import Option
 
17
from bzrlib.workingtree import WorkingTree
 
18
import bzrtools
 
19
 
 
20
from command import BzrToolsCommand
 
21
 
 
22
class cmd_rspush(BzrToolsCommand):
23
23
    """Upload this branch to another location using rsync.
24
24
 
25
25
    If no location is specified, the last-used location will be used.  To
26
 
    to prevent dirty trees from being uploaded, push will error out if there
27
 
    are unknown files or local changes.
 
26
    prevent dirty trees from being uploaded, rspush will error out if there are
 
27
    unknown files or local changes.  It will also error out if the upstream
 
28
    directory is non-empty and not an earlier version of the branch.
28
29
    """
29
30
    takes_args = ['location?']
 
31
    takes_options = [Option('overwrite', help='Ignore differences between'
 
32
                            ' branches and overwrite unconditionally'),
 
33
                     Option('no-tree', help='Do not push the working tree,'
 
34
                            ' just the .bzr.')]
30
35
 
31
 
    def run(self, location=None):
32
 
        cur_branch = Branch(".")
33
 
        bzrtools.push(cur_branch, location)
 
36
    def run(self, location=None, overwrite=False, no_tree=False):
 
37
        cur_branch = WorkingTree.open_containing(".")[0]
 
38
        bzrtools.rspush(cur_branch, location, overwrite=overwrite,
 
39
                      working_tree=not no_tree)