/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
1
# Copyright (C) 2008, 2009 Canonical Ltd
0.152.1 by Vincent Ladeuil
Empty shell
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
16
0.152.6 by Vincent Ladeuil
Really use the transports and test against all targeted protocols.
17
"""Upload a working tree, incrementally.
18
0.152.63 by Vincent Ladeuil
Make the doc more easily discoverable.
19
Quickstart
20
----------
21
22
To get started, it's as simple as running::
23
24
    bzr upload sftp://user@host/location/on/webserver
25
26
This will initially upload the whole working tree, and leave a file on the
27
remote location indicating the last revision that was uploaded
28
(.bzr-upload.revid), in order to avoid uploading unnecessary information the
29
next time.
30
31
If you would like to upload a specific revision, you just do:
32
33
    bzr upload -r X  sftp://user@host/location/on/webserver
34
35
bzr-upload, just as bzr does, will remember the location where you upload the 
36
first time, so you don't need to specify it every time.
37
38
If you need to re-upload the whole working tree for some reason, you can:
39
40
    bzr upload --full sftp://user@host/location/on/webserver
41
42
43
Automatically Uploading
44
-----------------------
45
46
bzr-upload comes with a hook that can be used to trigger an upload whenever
47
the tip of the branch changes, including on commit, push, uncommit etc. This
48
would allow you to keep the code on the target up to date automatically.
49
50
The easiest way to enable this is to run upload with the --auto option.
51
52
     bzr upload --auto
53
54
will enable the hook for this branch. If you were to do a commit in this branch
55
now you would see it trigger the upload automatically.
56
57
If you wish to disable this for a branch again then you can use the --no-auto
58
option.
59
60
     bzr upload --no-auto
61
62
will disable the feature for that branch.
63
64
Since the auto hook is triggered automatically, you can't use the --quiet
65
option available for the upload command. Instead, you can set the
66
'upload_auto_quiet' configuration variable to True or False in either
67
bazaar.conf, locations.conf or branch.conf.
68
69
70
Storing the '.bzr-upload.revid' file
71
------------------------------------
72
0.152.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
73
The only bzr-related info uploaded with the working tree is the corresponding
0.152.6 by Vincent Ladeuil
Really use the transports and test against all targeted protocols.
74
revision id. The uploaded working tree is not linked to any other bzr data.
75
0.152.63 by Vincent Ladeuil
Make the doc more easily discoverable.
76
If the layout of your remote server is such that you can't write in the
77
root directory but only in the directories inside that root, you will need
78
to use the 'upload_revid_location' configuration variable to specify the
79
relative path to be used. That configuration variable can be specified in
80
locations.conf or branch.conf.
81
82
For example, given the following layout:
83
84
  Project/
85
    private/
86
    public/
87
88
you may have write access in 'private' and 'public' but in 'Project'
89
itself. In that case, you can add the following in your locations.conf or
90
branch.conf file:
91
92
  upload_revid_location = private/.bzr-upload.revid
93
94
95
Upload from Remote Location
96
---------------------------
97
98
It is possible to upload to a remote location from another remote location by
99
specifying it with the --directory option:
100
101
    bzr upload ftp://public.example.com --directory sftp://private.example.com 
102
103
This, together with --auto, can be used to upload when you push to your
104
central branch, rather than when you commit to your local branch.
105
106
Note that you will consume more bandwith this way than uploading from a local
107
branch.
108
109
Collaborating
110
-------------
111
112
While we don't have any platform setup, you can branch from trunk:
113
114
    bzr branch lp:bzr-upload
115
116
And change anything you'd like, and get in touch with any of the authors to 
117
review and add the changes.
118
119
120
Known Issues
121
------------
122
123
 * Symlinks are not supported
124
125
0.152.6 by Vincent Ladeuil
Really use the transports and test against all targeted protocols.
126
"""
0.152.1 by Vincent Ladeuil
Empty shell
127
0.152.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
128
# TODO: the chmod bits *can* be supported via the upload protocols
129
# (i.e. poorly), but since the web developers use these protocols to upload
130
# manually, it is expected that the associated web server is coherent with
131
# their presence/absence. In other words, if a web hosting provider requires
132
# chmod bits but don't provide an ftp server that support them, well, better
133
# find another provider ;-)
134
0.152.44 by Vincent Ladeuil
More robust full upload (at least regarding files changed to dirs and vice-versa).
135
# TODO: The message emitted in verbose mode displays local paths. That may be
136
# scary for the user when we say 'Deleting <path>' and are referring to
137
# remote files...
0.152.19 by Vincent Ladeuil
Handle kind_change. Trivial implementation, blocked by bug #205636.
138
0.152.3 by v.ladeuil+lp at free
Make the tests fail not error out.
139
from bzrlib import (
0.155.2 by James Westby
Add a post_change_branch_tip hook to upload.
140
    branch,
0.152.3 by v.ladeuil+lp at free
Make the tests fail not error out.
141
    commands,
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
142
    lazy_import,
0.152.3 by v.ladeuil+lp at free
Make the tests fail not error out.
143
    option,
144
    )
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
145
lazy_import.lazy_import(globals(), """
0.152.44 by Vincent Ladeuil
More robust full upload (at least regarding files changed to dirs and vice-versa).
146
import stat
147
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
148
from bzrlib import (
0.158.1 by Gary van der Merwe
Don't require a working tree.
149
    bzrdir,
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
150
    errors,
151
    revisionspec,
152
    transport,
0.152.44 by Vincent Ladeuil
More robust full upload (at least regarding files changed to dirs and vice-versa).
153
    osutils,
0.152.40 by Martin Albisetti
We need to import urlutils if we are going to use it
154
    urlutils,
0.152.27 by Martin Albisetti
* Added error message if the working tree has uncommited changes
155
    workingtree,
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
156
    )
157
""")
0.152.16 by Vincent Ladeuil
Handle renames. Robust implementation.
158
0.152.54 by Vincent Ladeuil
Let's start dev for a 1.0.
159
version_info = (1, 0, 0, 'dev', 0)
0.152.23 by Martin Albisetti
Added version_info and plugin_name
160
plugin_name = 'upload'
161
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
162
0.155.3 by James Westby
Add some tests for the hook, rename the option to "upload_auto"
163
def _get_branch_option(branch, option):
164
    return branch.get_config().get_user_option(option)
165
0.152.64 by Vincent Ladeuil
Fix compatibility with bzr.
166
# FIXME: Get rid of that as soon as we depend on a bzr API that includes
167
# get_user_option_as_bool
168
def _get_branch_bool_option(branch, option):
169
    conf = branch.get_config()
170
    if hasattr(conf, 'get_user_option_as_bool'):
171
        value = conf.get_user_option_as_bool(option)
172
    else:
173
        value = conf.get_user_option(option)
174
        if value is not None:
175
            if value.lower().strip() == 'true':
176
                value = True
177
            else:
178
                value = False
179
    return value
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
180
0.155.3 by James Westby
Add some tests for the hook, rename the option to "upload_auto"
181
def _set_branch_option(branch, option, value):
182
    branch.get_config().set_user_option(option, value)
183
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
184
0.155.3 by James Westby
Add some tests for the hook, rename the option to "upload_auto"
185
def get_upload_location(branch):
186
    return _get_branch_option(branch, 'upload_location')
187
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
188
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
189
def set_upload_location(branch, location):
0.155.3 by James Westby
Add some tests for the hook, rename the option to "upload_auto"
190
    _set_branch_option(branch, 'upload_location', location)
191
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
192
0.152.62 by Vincent Ladeuil
Fix bug #423331 by adding a way to configure the path used to
193
# FIXME: Add more tests around invalid paths used here or relative paths that
194
# doesn't exist on remote (if only to get proper error messages)
195
def get_upload_revid_location(branch):
196
    loc =  _get_branch_option(branch, 'upload_revid_location')
197
    if loc is None:
198
        loc = '.bzr-upload.revid'
199
    return loc
200
201
202
def set_upload_revid_location(branch, location):
203
    _set_branch_option(branch, 'upload_revid_location', location)
204
205
0.155.3 by James Westby
Add some tests for the hook, rename the option to "upload_auto"
206
def get_upload_auto(branch):
0.152.64 by Vincent Ladeuil
Fix compatibility with bzr.
207
    auto = _get_branch_bool_option(branch, 'upload_auto')
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
208
    if auto is None:
209
        auto = False # Default to False if not specified
210
    return auto
211
0.155.3 by James Westby
Add some tests for the hook, rename the option to "upload_auto"
212
213
def set_upload_auto(branch, auto):
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
214
    # FIXME: What's the point in allowing a boolean here instead of requiring
215
    # the callers to use strings instead ?
0.155.3 by James Westby
Add some tests for the hook, rename the option to "upload_auto"
216
    if auto:
217
        auto_str = "True"
218
    else:
219
        auto_str = "False"
220
    _set_branch_option(branch, 'upload_auto', auto_str)
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
221
222
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
223
def get_upload_auto_quiet(branch):
0.152.64 by Vincent Ladeuil
Fix compatibility with bzr.
224
    quiet = _get_branch_bool_option(branch, 'upload_auto_quiet')
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
225
    if quiet is None:
226
        quiet = False # Default to False if not specified
227
    return quiet
228
229
230
def set_upload_auto_quiet(branch, quiet):
231
    _set_branch_option(branch, 'upload_auto_quiet', quiet)
232
233
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
234
class BzrUploader(object):
235
236
    def __init__(self, branch, to_transport, outf, tree, rev_id,
0.152.62 by Vincent Ladeuil
Fix bug #423331 by adding a way to configure the path used to
237
                 quiet=False):
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
238
        self.branch = branch
239
        self.to_transport = to_transport
240
        self.outf = outf
241
        self.tree = tree
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
242
        self.rev_id = rev_id
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
243
        self.quiet = quiet
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
244
        self._pending_deletions = []
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
245
        self._pending_renames = []
0.152.12 by Vincent Ladeuil
Implement 'upload_location' in config files.
246
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
247
    def set_uploaded_revid(self, rev_id):
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
248
        # XXX: Add tests for concurrent updates, etc.
0.152.62 by Vincent Ladeuil
Fix bug #423331 by adding a way to configure the path used to
249
        revid_path = get_upload_revid_location(self.branch)
250
        self.to_transport.put_bytes(revid_path, rev_id)
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
251
252
    def get_uploaded_revid(self):
0.152.62 by Vincent Ladeuil
Fix bug #423331 by adding a way to configure the path used to
253
        revid_path = get_upload_revid_location(self.branch)
254
        return self.to_transport.get_bytes(revid_path)
0.152.7 by Vincent Ladeuil
Slight refactoring.
255
0.152.46 by Vincent Ladeuil
Handle x mode bit for files and provides default mode bits for
256
    def upload_file(self, relpath, id, mode=None):
257
        if mode is None:
258
            if self.tree.is_executable(id):
259
                mode = 0775
260
            else:
261
                mode = 0664
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
262
        if not self.quiet:
263
            self.outf.write('Uploading %s\n' % relpath)
0.152.46 by Vincent Ladeuil
Handle x mode bit for files and provides default mode bits for
264
        self.to_transport.put_bytes(relpath, self.tree.get_file_text(id), mode)
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
265
0.152.46 by Vincent Ladeuil
Handle x mode bit for files and provides default mode bits for
266
    def upload_file_robustly(self, relpath, id, mode=None):
0.152.44 by Vincent Ladeuil
More robust full upload (at least regarding files changed to dirs and vice-versa).
267
        """Upload a file, clearing the way on the remote side.
268
269
        When doing a full upload, it may happen that a directory exists where
270
        we want to put our file.
271
        """
272
        try:
273
            st = self.to_transport.stat(relpath)
274
            if stat.S_ISDIR(st.st_mode):
275
                # A simple rmdir may not be enough
276
                if not self.quiet:
277
                    self.outf.write('Clearing %s/%s\n' % (
278
                            self.to_transport.external_url(), relpath))
279
                self.to_transport.delete_tree(relpath)
280
        except errors.PathError:
281
            pass
0.152.46 by Vincent Ladeuil
Handle x mode bit for files and provides default mode bits for
282
        self.upload_file(relpath, id, mode)
283
284
    def make_remote_dir(self, relpath, mode=None):
285
        if mode is None:
286
            mode = 0775
287
        self.to_transport.mkdir(relpath, mode)
288
289
    def make_remote_dir_robustly(self, relpath, mode=None):
0.152.44 by Vincent Ladeuil
More robust full upload (at least regarding files changed to dirs and vice-versa).
290
        """Create a remote directory, clearing the way on the remote side.
291
292
        When doing a full upload, it may happen that a file exists where we
293
        want to create our directory.
294
        """
295
        try:
296
            st = self.to_transport.stat(relpath)
297
            if not stat.S_ISDIR(st.st_mode):
298
                if not self.quiet:
299
                    self.outf.write('Deleting %s/%s\n' % (
300
                            self.to_transport.external_url(), relpath))
301
                self.to_transport.delete(relpath)
0.152.47 by Vincent Ladeuil
Don't fail a full upload on an already existing dir.
302
            else:
303
                # Ok the remote dir already exists, nothing to do
304
                return
0.152.44 by Vincent Ladeuil
More robust full upload (at least regarding files changed to dirs and vice-versa).
305
        except errors.PathError:
306
            pass
0.152.46 by Vincent Ladeuil
Handle x mode bit for files and provides default mode bits for
307
        self.make_remote_dir(relpath, mode)
0.152.44 by Vincent Ladeuil
More robust full upload (at least regarding files changed to dirs and vice-versa).
308
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
309
    def delete_remote_file(self, relpath):
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
310
        if not self.quiet:
0.152.30 by Vincent Ladeuil
Comply to verbose.
311
            self.outf.write('Deleting %s\n' % relpath)
0.152.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
312
        self.to_transport.delete(relpath)
313
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
314
    def delete_remote_dir(self, relpath):
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
315
        if not self.quiet:
0.152.30 by Vincent Ladeuil
Comply to verbose.
316
            self.outf.write('Deleting %s\n' % relpath)
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
317
        self.to_transport.rmdir(relpath)
318
319
    def delete_remote_dir_maybe(self, relpath):
320
        """Try to delete relpath, keeping failures to retry later."""
321
        try:
322
            self.to_transport.rmdir(relpath)
323
        # any kind of PathError would be OK, though we normally expect
324
        # DirectoryNotEmpty
325
        except errors.PathError:
326
            self._pending_deletions.append(relpath)
327
328
    def finish_deletions(self):
329
        if self._pending_deletions:
330
            # Process the previously failed deletions in reverse order to
331
            # delete children before parents
332
            for relpath in reversed(self._pending_deletions):
333
                self.to_transport.rmdir(relpath)
334
            # The following shouldn't be needed since we use it once per
335
            # upload, but better safe than sorry ;-)
336
            self._pending_deletions = []
337
0.152.16 by Vincent Ladeuil
Handle renames. Robust implementation.
338
    def rename_remote(self, old_relpath, new_relpath):
339
        """Rename a remote file or directory taking care of collisions.
340
341
        To avoid collisions during bulk renames, each renamed target is
342
        temporarily assigned a unique name. When all renames have been done,
343
        each target get its proper name.
344
        """
345
        # We generate a sufficiently random name to *assume* that
346
        # no collisions will occur and don't worry about it (nor
347
        # handle it).
348
        import os
349
        import random
350
        import time
351
352
        stamp = '.tmp.%.9f.%d.%d' % (time.time(),
353
                                     os.getpid(),
354
                                     random.randint(0,0x7FFFFFFF))
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
355
        if not self.quiet:
0.152.30 by Vincent Ladeuil
Comply to verbose.
356
            self.outf.write('Renaming %s to %s\n' % (old_relpath, new_relpath))
0.152.16 by Vincent Ladeuil
Handle renames. Robust implementation.
357
        self.to_transport.rename(old_relpath, stamp)
358
        self._pending_renames.append((stamp, new_relpath))
359
360
    def finish_renames(self):
361
        for (stamp, new_path) in self._pending_renames:
362
            self.to_transport.rename(stamp, new_path)
363
        # The following shouldn't be needed since we use it once per upload,
364
        # but better safe than sorry ;-)
365
        self._pending_renames = []
366
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
367
    def upload_full_tree(self):
0.152.14 by Vincent Ladeuil
Handle renames (trivial implementation).
368
        self.to_transport.ensure_base() # XXX: Handle errors (add
369
                                        # --create-prefix option ?)
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
370
        self.tree.lock_read()
371
        try:
0.152.44 by Vincent Ladeuil
More robust full upload (at least regarding files changed to dirs and vice-versa).
372
            for relpath, ie in self.tree.inventory.iter_entries():
373
                if relpath in ('', '.bzrignore'):
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
374
                    # skip root ('')
375
                    # .bzrignore has no meaning outside of a working tree
376
                    # so do not upload it
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
377
                    continue
0.152.8 by Vincent Ladeuil
Handle uploading directories.
378
                if ie.kind == 'file':
0.152.44 by Vincent Ladeuil
More robust full upload (at least regarding files changed to dirs and vice-versa).
379
                    self.upload_file_robustly(relpath, ie.file_id)
0.152.8 by Vincent Ladeuil
Handle uploading directories.
380
                elif ie.kind == 'directory':
0.152.44 by Vincent Ladeuil
More robust full upload (at least regarding files changed to dirs and vice-versa).
381
                    self.make_remote_dir_robustly(relpath)
0.152.8 by Vincent Ladeuil
Handle uploading directories.
382
                else:
383
                    raise NotImplementedError
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
384
            self.set_uploaded_revid(self.rev_id)
385
        finally:
386
            self.tree.unlock()
387
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
388
    def upload_tree(self):
0.152.24 by Martin Albisetti
Changed the way we upload the full tree if its never been uploaded
389
        # If we can't find the revid file on the remote location, upload the
390
        # full tree instead
391
        try:
392
            rev_id = self.get_uploaded_revid()
393
        except errors.NoSuchFile:
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
394
            if not self.quiet:
0.152.29 by Vincent Ladeuil
Work around test fixture limitation regarding self.outf (cough). All tests passing again.
395
                self.outf.write('No uploaded revision id found,'
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
396
                                ' switching to full upload\n')
0.152.24 by Martin Albisetti
Changed the way we upload the full tree if its never been uploaded
397
            self.upload_full_tree()
0.152.29 by Vincent Ladeuil
Work around test fixture limitation regarding self.outf (cough). All tests passing again.
398
            # We're done
399
            return
0.152.24 by Martin Albisetti
Changed the way we upload the full tree if its never been uploaded
400
0.152.35 by Martin Albisetti
* Tell the user if the remote location is already up to date
401
        # Check if the revision hasn't already been uploaded
402
        if rev_id == self.rev_id:
403
            if not self.quiet:
404
                self.outf.write('Remote location already up to date\n')
405
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
406
        # XXX: errors out if rev_id not in branch history (probably someone
407
        # uploaded from a different branch).
408
        from_tree = self.branch.repository.revision_tree(rev_id)
0.152.14 by Vincent Ladeuil
Handle renames (trivial implementation).
409
        self.to_transport.ensure_base() # XXX: Handle errors (add
410
                                        # --create-prefix option ?)
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
411
        changes = self.tree.changes_from(from_tree)
412
        self.tree.lock_read()
413
        try:
0.152.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
414
            for (path, id, kind) in changes.removed:
415
                if kind is 'file':
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
416
                    self.delete_remote_file(path)
417
                elif kind is  'directory':
418
                    self.delete_remote_dir_maybe(path)
0.152.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
419
                else:
420
                    raise NotImplementedError
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
421
0.152.14 by Vincent Ladeuil
Handle renames (trivial implementation).
422
            for (old_path, new_path, id, kind,
423
                 content_change, exec_change) in changes.renamed:
0.152.52 by Vincent Ladeuil
Fix bug #270219 by handling content changes during renames.
424
                if content_change:
425
                    # We update the old_path content because renames and
426
                    # deletions are differed.
427
                    self.upload_file(old_path, id)
0.152.16 by Vincent Ladeuil
Handle renames. Robust implementation.
428
                self.rename_remote(old_path, new_path)
429
            self.finish_renames()
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
430
            self.finish_deletions()
0.152.16 by Vincent Ladeuil
Handle renames. Robust implementation.
431
0.152.19 by Vincent Ladeuil
Handle kind_change. Trivial implementation, blocked by bug #205636.
432
            for (path, id, old_kind, new_kind) in changes.kind_changed:
433
                if old_kind is 'file':
434
                    self.delete_remote_file(path)
435
                elif old_kind is  'directory':
436
                    self.delete_remote_dir(path)
437
                else:
438
                    raise NotImplementedError
439
440
                if new_kind is 'file':
441
                    self.upload_file(path, id)
442
                elif new_kind is 'directory':
443
                    self.make_remote_dir(path)
444
                else:
445
                    raise NotImplementedError
446
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
447
            for (path, id, kind) in changes.added:
448
                if kind is 'file':
0.152.7 by Vincent Ladeuil
Slight refactoring.
449
                    self.upload_file(path, id)
0.152.8 by Vincent Ladeuil
Handle uploading directories.
450
                elif kind is 'directory':
451
                    self.make_remote_dir(path)
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
452
                else:
453
                    raise NotImplementedError
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
454
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
455
            # XXX: Add a test for exec_change
456
            for (path, id, kind,
457
                 content_change, exec_change) in changes.modified:
458
                if kind is 'file':
0.152.7 by Vincent Ladeuil
Slight refactoring.
459
                    self.upload_file(path, id)
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
460
                else:
461
                    raise NotImplementedError
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
462
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
463
            self.set_uploaded_revid(self.rev_id)
464
        finally:
465
            self.tree.unlock()
0.152.4 by v.ladeuil+lp at free
Implement a trivial implementation to make one test pass.
466
0.152.57 by Vincent Ladeuil
Fix minor 2.4 compatibility bug.
467
0.158.19 by Vincent Ladeuil
Bzr has facilities for exceptions, let's use them.
468
class CannotUploadToWorkingTreeError(errors.BzrCommandError):
469
470
    _fmt = 'Cannot upload to a bzr managed working tree: %(url)s".'
471
0.152.1 by Vincent Ladeuil
Empty shell
472
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
473
class cmd_upload(commands.Command):
474
    """Upload a working tree, as a whole or incrementally.
475
476
    If no destination is specified use the last one used.
477
    If no revision is specified upload the changes since the last upload.
0.152.56 by Vincent Ladeuil
Small tweaks including doc fix (#275538).
478
479
    Changes include files added, renamed, modified or removed.
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
480
    """
0.152.63 by Vincent Ladeuil
Make the doc more easily discoverable.
481
    _see_also = ['plugins/upload']
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
482
    takes_args = ['location?']
483
    takes_options = [
484
        'revision',
485
        'remember',
486
        option.Option('full', 'Upload the full working tree.'),
487
        option.Option('quiet', 'Do not output what is being done.',
488
                       short_name='q'),
489
        option.Option('directory',
490
                      help='Branch to upload from, '
491
                      'rather than the one containing the working directory.',
492
                      short_name='d',
493
                      type=unicode,
494
                      ),
0.155.5 by James Westby
Hook up the --upload option and document it.
495
        option.Option('auto',
496
                      'Trigger an upload from this branch whenever the tip '
497
                      'revision changes.')
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
498
       ]
499
500
    def run(self, location=None, full=False, revision=None, remember=None,
0.155.4 by James Westby
Add the groundwork for --auto that enables the hook for a branch.
501
            directory=None, quiet=False, auto=None
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
502
            ):
503
        if directory is None:
504
            directory = u'.'
0.158.7 by Gary van der Merwe
Clean up white space.
505
0.157.1 by James Westby
Don't try and register the hook if install_named_hook is not available
506
        if auto and not auto_hook_available:
507
            raise BzrCommandError("Your version of bzr does not have the "
508
                    "hooks necessary for --auto to work")
509
0.158.19 by Vincent Ladeuil
Bzr has facilities for exceptions, let's use them.
510
        (wt, branch,
511
         relpath) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
0.158.7 by Gary van der Merwe
Clean up white space.
512
0.158.1 by Gary van der Merwe
Don't require a working tree.
513
        if wt:
514
            changes = wt.changes_from(wt.basis_tree())
0.158.7 by Gary van der Merwe
Clean up white space.
515
0.158.1 by Gary van der Merwe
Don't require a working tree.
516
            if revision is None and  changes.has_changed():
517
                raise errors.UncommittedChanges(wt)
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
518
519
        if location is None:
520
            stored_loc = get_upload_location(branch)
521
            if stored_loc is None:
522
                raise errors.BzrCommandError('No upload location'
523
                                             ' known or specified.')
524
            else:
525
                # FIXME: Not currently tested
526
                display_url = urlutils.unescape_for_display(stored_loc,
527
                        self.outf.encoding)
528
                self.outf.write("Using saved location: %s\n" % display_url)
529
                location = stored_loc
530
531
        to_transport = transport.get_transport(location)
0.158.9 by Gary van der Merwe
Add a check to make sure we are not uploading to an existing wt.
532
533
        # Check that we are not uploading to a existing working tree.
534
        try:
535
            to_bzr_dir = bzrdir.BzrDir.open_from_transport(to_transport)
536
            has_wt = to_bzr_dir.has_workingtree()
537
        except errors.NotBranchError:
538
            has_wt = False
539
        except errors.NotLocalUrl:
0.158.19 by Vincent Ladeuil
Bzr has facilities for exceptions, let's use them.
540
            # The exception raised is a bit weird... but that's life.
0.158.9 by Gary van der Merwe
Add a check to make sure we are not uploading to an existing wt.
541
            has_wt = True
542
543
        if has_wt:
0.152.57 by Vincent Ladeuil
Fix minor 2.4 compatibility bug.
544
            raise CannotUploadToWorkingTreeError(url=location)
0.158.9 by Gary van der Merwe
Add a check to make sure we are not uploading to an existing wt.
545
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
546
        if revision is None:
547
            rev_id = branch.last_revision()
548
        else:
549
            if len(revision) != 1:
550
                raise errors.BzrCommandError(
551
                    'bzr upload --revision takes exactly 1 argument')
552
            rev_id = revision[0].in_history(branch).rev_id
553
554
        tree = branch.repository.revision_tree(rev_id)
555
556
        uploader = BzrUploader(branch, to_transport, self.outf, tree,
0.152.62 by Vincent Ladeuil
Fix bug #423331 by adding a way to configure the path used to
557
                               rev_id, quiet=quiet)
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
558
559
        if full:
560
            uploader.upload_full_tree()
561
        else:
562
            uploader.upload_tree()
563
564
        # We uploaded successfully, remember it
565
        if get_upload_location(branch) is None or remember:
566
            set_upload_location(branch, to_transport.base)
0.155.4 by James Westby
Add the groundwork for --auto that enables the hook for a branch.
567
        if auto is not None:
568
            set_upload_auto(branch, auto)
0.155.1 by James Westby
Switch most of the logic to a class outside of the command class.
569
570
0.152.1 by Vincent Ladeuil
Empty shell
571
commands.register_command(cmd_upload)
572
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
573
def install_auto_upload_hook():
574
    from bzrlib.plugins.upload import auto_upload_hook
0.157.1 by James Westby
Don't try and register the hook if install_named_hook is not available
575
    branch.Branch.hooks.install_named_hook('post_change_branch_tip',
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
576
            auto_upload_hook.auto_upload_hook,
0.157.1 by James Westby
Don't try and register the hook if install_named_hook is not available
577
            'Auto upload code from a branch when it is changed.')
0.152.61 by Vincent Ladeuil
Fix bug #312686 and add an 'upload_auto_quiet' config variable.
578
579
580
if hasattr(branch.Branch.hooks, "install_named_hook"):
581
    install_auto_upload_hook()
0.157.1 by James Westby
Don't try and register the hook if install_named_hook is not available
582
    auto_hook_available = True
583
else:
584
    auto_hook_available = False
0.155.2 by James Westby
Add a post_change_branch_tip hook to upload.
585
586
0.152.29 by Vincent Ladeuil
Work around test fixture limitation regarding self.outf (cough). All tests passing again.
587
def load_tests(basic_tests, module, loader):
0.153.1 by Vincent Ladeuil
Clean up references to verbose.
588
    # This module shouldn't define any tests but I don't know how to report
0.154.1 by Vincent Ladeuil
Create a simple setup.py and rework tests modules accordingly.
589
    # that. I prefer to update basic_tests with the other tests to detect
590
    # unwanted tests and I think that's sufficient.
0.152.1 by Vincent Ladeuil
Empty shell
591
592
    testmod_names = [
0.154.1 by Vincent Ladeuil
Create a simple setup.py and rework tests modules accordingly.
593
        'tests',
0.152.1 by Vincent Ladeuil
Empty shell
594
        ]
0.154.1 by Vincent Ladeuil
Create a simple setup.py and rework tests modules accordingly.
595
    basic_tests.addTest(loader.loadTestsFromModuleNames(
0.152.1 by Vincent Ladeuil
Empty shell
596
            ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
0.154.1 by Vincent Ladeuil
Create a simple setup.py and rework tests modules accordingly.
597
    return basic_tests