81
by Aaron Bentley
Created push.py plugin |
1 |
# Copyright (C) 2005 by Aaron Bentley
|
2 |
||
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
||
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
||
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
115
by aaron.bentley at utoronto
Import fixes from magnus@therning.org |
16 |
from bzrlib.branch import Branch |
230
by Jelmer Vernooij
Fix for new Option API |
17 |
from bzrlib.commands import Command |
271
by Aaron Bentley
Cherry-picked Robert's diff and push fixes |
18 |
from bzrlib.errors import MustUseDecorated, BzrOptionError |
230
by Jelmer Vernooij
Fix for new Option API |
19 |
from bzrlib.option import Option |
81
by Aaron Bentley
Created push.py plugin |
20 |
import sys |
21 |
import os |
|
22 |
import bzrtools |
|
23 |
||
195
by Aaron Bentley
prevented accidental overwrites from push |
24 |
|
81
by Aaron Bentley
Created push.py plugin |
25 |
class cmd_push(Command): |
26 |
"""Upload this branch to another location using rsync.
|
|
27 |
||
236
by Aaron Bentley
Changed overwrite description |
28 |
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
|
|
30 |
unknown files or local changes. It will also error out if the upstream
|
|
31 |
directory is non-empty and not an earlier version of the branch.
|
|
81
by Aaron Bentley
Created push.py plugin |
32 |
"""
|
271
by Aaron Bentley
Cherry-picked Robert's diff and push fixes |
33 |
_original_command = None |
81
by Aaron Bentley
Created push.py plugin |
34 |
takes_args = ['location?'] |
245
by Aaron Bentley
Turned overwrite into a local, not global, option |
35 |
takes_options = [Option('overwrite', help='Ignore differences between' |
36 |
' branches and overwrite unconditionally')] |
|
81
by Aaron Bentley
Created push.py plugin |
37 |
|
195
by Aaron Bentley
prevented accidental overwrites from push |
38 |
def run(self, location=None, overwrite=False): |
234
by Aaron Bentley
Adopted Branch.open_containing's new format |
39 |
cur_branch = Branch.open_containing(".")[0] |
195
by Aaron Bentley
prevented accidental overwrites from push |
40 |
bzrtools.push(cur_branch, location, overwrite=overwrite) |
271
by Aaron Bentley
Cherry-picked Robert's diff and push fixes |
41 |
|
42 |
def run_argv(self, argv): |
|
43 |
"""Parse command line and run.
|
|
44 |
|
|
45 |
If the command requests it, run the decorated version.
|
|
46 |
"""
|
|
47 |
try: |
|
48 |
super(cmd_push, self).run_argv(list(argv)) |
|
49 |
except (MustUseDecorated, BzrOptionError): |
|
50 |
if self._original_command is None: |
|
51 |
raise
|
|
52 |
self._original_command().run_argv(argv) |