← 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-10-04 16:52:26 UTC
  • mto: This revision was merged to the branch mainline in revision 211.
  • Revision ID: abentley@panoramicfeedback.com-20051004165226-05abbb66e0127c5f
Applied win32 compatibility fix from Belchenko

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.commands import Command
17
 
from bzrlib.option import Option
18
 
from bzrlib.workingtree import WorkingTree
 
16
from bzrlib.branch import Branch
 
17
from bzrlib.commands import Command, OPTIONS
19
18
import sys
20
19
import os
21
20
import bzrtools 
22
21
 
 
22
OPTIONS['overwrite'] = None
23
23
 
24
 
class cmd_rspush(Command):
 
24
class cmd_push(Command):
25
25
    """Upload this branch to another location using rsync.
26
26
 
27
 
    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. 
 
27
    If no location is specified, the last-used location will be used.  To
 
28
    to prevent dirty trees from being uploaded, push will error out if there
 
29
    are unknown files or local changes.
31
30
    """
32
31
    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.')]
 
32
    takes_options = ['overwrite']
37
33
 
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)
 
34
    def run(self, location=None, overwrite=False):
 
35
        cur_branch = Branch.open_containing(".")
 
36
        bzrtools.push(cur_branch, location, overwrite=overwrite)