← 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-28 03:01:02 UTC
  • mfrom: (147.4.13)
  • mto: (147.4.24 trunk)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: aaron.bentley@utoronto.ca-20051028030102-eead1e484007de74
Merged lifeless

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
16
17
from bzrlib.commands import Command
17
18
from bzrlib.option import Option
18
 
from bzrlib.workingtree import WorkingTree
19
19
import sys
20
20
import os
21
21
import bzrtools 
22
22
 
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
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 
 
28
    prevent dirty trees from being uploaded, push will error out if there are 
29
29
    unknown files or local changes.  It will also error out if the upstream 
30
30
    directory is non-empty and not an earlier version of the branch. 
31
31
    """
32
32
    takes_args = ['location?']
33
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.')]
 
34
                            ' branches and overwrite unconditionally')]
37
35
 
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)
 
36
    def run(self, location=None, overwrite=False):
 
37
        cur_branch = Branch.open_containing(".")[0]
 
38
        bzrtools.push(cur_branch, location, overwrite=overwrite)