← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to push.py

  • Committer: Robert Collins
  • Date: 2005-10-24 07:01:08 UTC
  • mto: (147.1.42) (364.1.3 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: robertc@robertcollins.net-20051024070108-f85025066b05f809
use sets and strings to optimise finding indirect merges somewhat

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