/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.152.6 by Vincent Ladeuil
Really use the transports and test against all targeted protocols.
1
# Copyright (C) 2008 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.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
19
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.
20
revision id. The uploaded working tree is not linked to any other bzr data.
21
0.152.35 by Martin Albisetti
* Tell the user if the remote location is already up to date
22
The intended use is for web developers which keep their web sites versioned
23
with bzr, can can use either FTP or SFTP to upload their site.
0.152.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
24
25
Known limitations:
26
- Symlinks are ignored,
27
28
- chmod bits are not supported.
0.152.6 by Vincent Ladeuil
Really use the transports and test against all targeted protocols.
29
"""
0.152.1 by Vincent Ladeuil
Empty shell
30
0.152.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
31
# TODO: the chmod bits *can* be supported via the upload protocols
32
# (i.e. poorly), but since the web developers use these protocols to upload
33
# manually, it is expected that the associated web server is coherent with
34
# their presence/absence. In other words, if a web hosting provider requires
35
# chmod bits but don't provide an ftp server that support them, well, better
36
# find another provider ;-)
37
0.152.19 by Vincent Ladeuil
Handle kind_change. Trivial implementation, blocked by bug #205636.
38
0.152.3 by v.ladeuil+lp at free
Make the tests fail not error out.
39
from bzrlib import (
40
    commands,
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
41
    lazy_import,
0.152.3 by v.ladeuil+lp at free
Make the tests fail not error out.
42
    option,
43
    )
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
44
lazy_import.lazy_import(globals(), """
45
from bzrlib import (
46
    branch,
47
    errors,
48
    revisionspec,
49
    transport,
0.152.40 by Martin Albisetti
We need to import urlutils if we are going to use it
50
    urlutils,
0.152.27 by Martin Albisetti
* Added error message if the working tree has uncommited changes
51
    workingtree,
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
52
    )
53
""")
0.152.16 by Vincent Ladeuil
Handle renames. Robust implementation.
54
0.152.23 by Martin Albisetti
Added version_info and plugin_name
55
version_info = (0,1,0)
56
plugin_name = 'upload'
57
0.152.1 by Vincent Ladeuil
Empty shell
58
class cmd_upload(commands.Command):
0.152.2 by v.ladeuil+lp at free
Add failing tests for basic usage.
59
    """Upload a working tree, as a whole or incrementally.
60
61
    If no destination is specified use the last one used.
62
    If no revision is specified upload the changes since the last upload.
63
    """
0.152.7 by Vincent Ladeuil
Slight refactoring.
64
    takes_args = ['location?']
0.152.2 by v.ladeuil+lp at free
Add failing tests for basic usage.
65
    takes_options = [
66
        'revision',
0.152.12 by Vincent Ladeuil
Implement 'upload_location' in config files.
67
        'remember',
0.152.3 by v.ladeuil+lp at free
Make the tests fail not error out.
68
        option.Option('full', 'Upload the full working tree.'),
0.152.35 by Martin Albisetti
* Tell the user if the remote location is already up to date
69
        option.Option('quiet', 'Do not output what is being done.', 
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
70
                       short_name='q'),
0.152.11 by Vincent Ladeuil
Be coherent with bzr push.
71
        option.Option('directory',
72
                      help='Branch to upload from, '
73
                      'rather than the one containing the working directory.',
74
                      short_name='d',
75
                      type=unicode,
76
                      ),
0.152.4 by v.ladeuil+lp at free
Implement a trivial implementation to make one test pass.
77
       ]
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
78
0.152.21 by Martin Albisetti
Fix uploading using the remembered location
79
    def run(self, location=None, full=False, revision=None, remember=None,
0.153.1 by Vincent Ladeuil
Clean up references to verbose.
80
            directory=None, quiet=False,
0.152.8 by Vincent Ladeuil
Handle uploading directories.
81
            ):
0.152.11 by Vincent Ladeuil
Be coherent with bzr push.
82
        if directory is None:
83
            directory = u'.'
0.152.27 by Martin Albisetti
* Added error message if the working tree has uncommited changes
84
85
        wt = workingtree.WorkingTree.open(directory)
86
        changes = wt.changes_from(wt.basis_tree())
0.152.33 by Vincent Ladeuil
Ensure that we refuse to upload if the working tree contains
87
0.152.27 by Martin Albisetti
* Added error message if the working tree has uncommited changes
88
        if changes.has_changed():
89
            raise errors.UncommittedChanges(wt)
90
0.152.30 by Vincent Ladeuil
Comply to verbose.
91
        self.branch = wt.branch
0.152.4 by v.ladeuil+lp at free
Implement a trivial implementation to make one test pass.
92
0.152.7 by Vincent Ladeuil
Slight refactoring.
93
        if location is None:
0.152.12 by Vincent Ladeuil
Implement 'upload_location' in config files.
94
            stored_loc = self.get_upload_location()
95
            if stored_loc is None:
96
                raise errors.BzrCommandError('No upload location'
97
                                             ' known or specified.')
98
            else:
0.152.41 by Martin Albisetti
Add a comment where tests are not reaching
99
                # FIXME: Not currently tested
0.152.12 by Vincent Ladeuil
Implement 'upload_location' in config files.
100
                display_url = urlutils.unescape_for_display(stored_loc,
101
                        self.outf.encoding)
102
                self.outf.write("Using saved location: %s\n" % display_url)
103
                location = stored_loc
104
105
        self.to_transport = transport.get_transport(location)
0.152.4 by v.ladeuil+lp at free
Implement a trivial implementation to make one test pass.
106
        if revision is None:
0.152.12 by Vincent Ladeuil
Implement 'upload_location' in config files.
107
            rev_id = self.branch.last_revision()
0.152.4 by v.ladeuil+lp at free
Implement a trivial implementation to make one test pass.
108
        else:
109
            if len(revision) != 1:
110
                raise errors.BzrCommandError(
111
                    'bzr upload --revision takes exactly 1 argument')
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
112
            rev_id = revision[0].in_history(self.branch).rev_id
0.152.4 by v.ladeuil+lp at free
Implement a trivial implementation to make one test pass.
113
0.152.12 by Vincent Ladeuil
Implement 'upload_location' in config files.
114
        self.tree = self.branch.repository.revision_tree(rev_id)
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
115
        self.rev_id = rev_id
0.152.16 by Vincent Ladeuil
Handle renames. Robust implementation.
116
        self._pending_renames = []
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
117
        self._pending_deletions = []
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
118
        self.quiet = quiet
0.152.22 by Martin Albisetti
Changed default behaviour to do a full upload if no previous upload has been detected
119
0.152.4 by v.ladeuil+lp at free
Implement a trivial implementation to make one test pass.
120
        if full:
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
121
            self.upload_full_tree()
0.152.4 by v.ladeuil+lp at free
Implement a trivial implementation to make one test pass.
122
        else:
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
123
            self.upload_tree()
124
0.152.12 by Vincent Ladeuil
Implement 'upload_location' in config files.
125
        # We uploaded successfully, remember it
126
        if self.get_upload_location() is None or remember:
127
            self.set_upload_location(self.to_transport.base)
128
129
    def set_upload_location(self, location):
130
        self.branch.get_config().set_user_option('upload_location', location)
131
132
    def get_upload_location(self):
133
        return self.branch.get_config().get_user_option('upload_location')
134
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
135
    bzr_upload_revid_file_name = '.bzr-upload.revid'
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
136
137
    def set_uploaded_revid(self, rev_id):
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
138
        # XXX: Add tests for concurrent updates, etc.
139
        self.to_transport.put_bytes(self.bzr_upload_revid_file_name, rev_id)
140
141
    def get_uploaded_revid(self):
142
        return self.to_transport.get_bytes(self.bzr_upload_revid_file_name)
0.152.7 by Vincent Ladeuil
Slight refactoring.
143
144
    def upload_file(self, relpath, id):
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
145
        if not self.quiet:
146
            self.outf.write('Uploading %s\n' % relpath)
0.152.7 by Vincent Ladeuil
Slight refactoring.
147
        self.to_transport.put_bytes(relpath, self.tree.get_file_text(id))
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
148
0.152.8 by Vincent Ladeuil
Handle uploading directories.
149
    def make_remote_dir(self, relpath):
150
        # XXX: handle mode
151
        self.to_transport.mkdir(relpath)
152
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
153
    def delete_remote_file(self, relpath):
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
154
        if not self.quiet:
0.152.30 by Vincent Ladeuil
Comply to verbose.
155
            self.outf.write('Deleting %s\n' % relpath)
0.152.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
156
        self.to_transport.delete(relpath)
157
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
158
    def delete_remote_dir(self, relpath):
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
159
        if not self.quiet:
0.152.30 by Vincent Ladeuil
Comply to verbose.
160
            self.outf.write('Deleting %s\n' % relpath)
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
161
        self.to_transport.rmdir(relpath)
162
163
    def delete_remote_dir_maybe(self, relpath):
164
        """Try to delete relpath, keeping failures to retry later."""
165
        try:
166
            self.to_transport.rmdir(relpath)
167
        # any kind of PathError would be OK, though we normally expect
168
        # DirectoryNotEmpty
169
        except errors.PathError:
170
            self._pending_deletions.append(relpath)
171
172
    def finish_deletions(self):
173
        if self._pending_deletions:
174
            # Process the previously failed deletions in reverse order to
175
            # delete children before parents
176
            for relpath in reversed(self._pending_deletions):
177
                self.to_transport.rmdir(relpath)
178
            # The following shouldn't be needed since we use it once per
179
            # upload, but better safe than sorry ;-)
180
            self._pending_deletions = []
181
0.152.16 by Vincent Ladeuil
Handle renames. Robust implementation.
182
    def rename_remote(self, old_relpath, new_relpath):
183
        """Rename a remote file or directory taking care of collisions.
184
185
        To avoid collisions during bulk renames, each renamed target is
186
        temporarily assigned a unique name. When all renames have been done,
187
        each target get its proper name.
188
        """
189
        # We generate a sufficiently random name to *assume* that
190
        # no collisions will occur and don't worry about it (nor
191
        # handle it).
192
        import os
193
        import random
194
        import time
195
196
        stamp = '.tmp.%.9f.%d.%d' % (time.time(),
197
                                     os.getpid(),
198
                                     random.randint(0,0x7FFFFFFF))
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
199
        if not self.quiet:
0.152.30 by Vincent Ladeuil
Comply to verbose.
200
            self.outf.write('Renaming %s to %s\n' % (old_relpath, new_relpath))
0.152.16 by Vincent Ladeuil
Handle renames. Robust implementation.
201
        self.to_transport.rename(old_relpath, stamp)
202
        self._pending_renames.append((stamp, new_relpath))
203
204
    def finish_renames(self):
205
        for (stamp, new_path) in self._pending_renames:
206
            self.to_transport.rename(stamp, new_path)
207
        # The following shouldn't be needed since we use it once per upload,
208
        # but better safe than sorry ;-)
209
        self._pending_renames = []
210
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
211
    def upload_full_tree(self):
0.152.14 by Vincent Ladeuil
Handle renames (trivial implementation).
212
        self.to_transport.ensure_base() # XXX: Handle errors (add
213
                                        # --create-prefix option ?)
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
214
        self.tree.lock_read()
215
        try:
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
216
            for dp, ie in self.tree.inventory.iter_entries():
217
                if dp in ('', '.bzrignore'):
218
                    # skip root ('')
219
                    # .bzrignore has no meaning outside of a working tree
220
                    # so do not upload it
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
221
                    continue
0.152.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
222
                # XXX: We need to be more robust in case we upload on top of an
223
                # existing tree which may contains existing files or dirs whose
224
                # names will make attempts to upload dirs or files fail.
0.152.8 by Vincent Ladeuil
Handle uploading directories.
225
                if ie.kind == 'file':
226
                    self.upload_file(dp, ie.file_id)
227
                elif ie.kind == 'directory':
228
                    try:
229
                        self.make_remote_dir(dp)
230
                    except errors.FileExists:
231
                        # The directory existed before the upload
232
                        pass
233
                else:
234
                    raise NotImplementedError
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
235
            self.set_uploaded_revid(self.rev_id)
236
        finally:
237
            self.tree.unlock()
238
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
239
    def upload_tree(self):
0.152.24 by Martin Albisetti
Changed the way we upload the full tree if its never been uploaded
240
        # If we can't find the revid file on the remote location, upload the
241
        # full tree instead
242
        try:
243
            rev_id = self.get_uploaded_revid()
244
        except errors.NoSuchFile:
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
245
            if not self.quiet:
0.152.29 by Vincent Ladeuil
Work around test fixture limitation regarding self.outf (cough). All tests passing again.
246
                self.outf.write('No uploaded revision id found,'
0.152.34 by Martin Albisetti
* Change the default behaviour to be more verbose
247
                                ' switching to full upload\n')
0.152.24 by Martin Albisetti
Changed the way we upload the full tree if its never been uploaded
248
            self.upload_full_tree()
0.152.29 by Vincent Ladeuil
Work around test fixture limitation regarding self.outf (cough). All tests passing again.
249
            # We're done
250
            return
0.152.24 by Martin Albisetti
Changed the way we upload the full tree if its never been uploaded
251
0.152.35 by Martin Albisetti
* Tell the user if the remote location is already up to date
252
        # Check if the revision hasn't already been uploaded
253
        if rev_id == self.rev_id:
254
            if not self.quiet:
255
                self.outf.write('Remote location already up to date\n')
256
0.152.10 by Vincent Ladeuil
Fix incremental upload cheat.
257
        # XXX: errors out if rev_id not in branch history (probably someone
258
        # uploaded from a different branch).
259
        from_tree = self.branch.repository.revision_tree(rev_id)
0.152.14 by Vincent Ladeuil
Handle renames (trivial implementation).
260
        self.to_transport.ensure_base() # XXX: Handle errors (add
261
                                        # --create-prefix option ?)
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
262
        changes = self.tree.changes_from(from_tree)
263
        self.tree.lock_read()
264
        try:
0.152.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
265
            for (path, id, kind) in changes.removed:
266
                if kind is 'file':
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
267
                    self.delete_remote_file(path)
268
                elif kind is  'directory':
269
                    self.delete_remote_dir_maybe(path)
0.152.17 by Vincent Ladeuil
Handle deletes (trivial implementation).
270
                else:
271
                    raise NotImplementedError
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
272
0.152.14 by Vincent Ladeuil
Handle renames (trivial implementation).
273
            for (old_path, new_path, id, kind,
274
                 content_change, exec_change) in changes.renamed:
0.152.16 by Vincent Ladeuil
Handle renames. Robust implementation.
275
                self.rename_remote(old_path, new_path)
276
            self.finish_renames()
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
277
            self.finish_deletions()
0.152.16 by Vincent Ladeuil
Handle renames. Robust implementation.
278
0.152.19 by Vincent Ladeuil
Handle kind_change. Trivial implementation, blocked by bug #205636.
279
            for (path, id, old_kind, new_kind) in changes.kind_changed:
280
                if old_kind is 'file':
281
                    self.delete_remote_file(path)
282
                elif old_kind is  'directory':
283
                    self.delete_remote_dir(path)
284
                else:
285
                    raise NotImplementedError
286
287
                if new_kind is 'file':
288
                    self.upload_file(path, id)
289
                elif new_kind is 'directory':
290
                    self.make_remote_dir(path)
291
                else:
292
                    raise NotImplementedError
293
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
294
            for (path, id, kind) in changes.added:
295
                if kind is 'file':
0.152.7 by Vincent Ladeuil
Slight refactoring.
296
                    self.upload_file(path, id)
0.152.8 by Vincent Ladeuil
Handle uploading directories.
297
                elif kind is 'directory':
298
                    self.make_remote_dir(path)
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
299
                else:
300
                    raise NotImplementedError
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
301
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
302
            # XXX: Add a test for exec_change
303
            for (path, id, kind,
304
                 content_change, exec_change) in changes.modified:
305
                if kind is 'file':
0.152.7 by Vincent Ladeuil
Slight refactoring.
306
                    self.upload_file(path, id)
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
307
                else:
308
                    raise NotImplementedError
0.152.18 by Vincent Ladeuil
Handle deletions. Robust implementation.
309
0.152.5 by v.ladeuil+lp at free
Partial incremental upload implementationm tests pass.
310
            self.set_uploaded_revid(self.rev_id)
311
        finally:
312
            self.tree.unlock()
0.152.4 by v.ladeuil+lp at free
Implement a trivial implementation to make one test pass.
313
0.152.1 by Vincent Ladeuil
Empty shell
314
315
commands.register_command(cmd_upload)
316
0.152.4 by v.ladeuil+lp at free
Implement a trivial implementation to make one test pass.
317
0.152.29 by Vincent Ladeuil
Work around test fixture limitation regarding self.outf (cough). All tests passing again.
318
def load_tests(basic_tests, module, loader):
0.153.1 by Vincent Ladeuil
Clean up references to verbose.
319
    # 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.
320
    # that. I prefer to update basic_tests with the other tests to detect
321
    # unwanted tests and I think that's sufficient.
0.152.1 by Vincent Ladeuil
Empty shell
322
323
    testmod_names = [
0.154.1 by Vincent Ladeuil
Create a simple setup.py and rework tests modules accordingly.
324
        'tests',
0.152.1 by Vincent Ladeuil
Empty shell
325
        ]
0.154.1 by Vincent Ladeuil
Create a simple setup.py and rework tests modules accordingly.
326
    basic_tests.addTest(loader.loadTestsFromModuleNames(
0.152.1 by Vincent Ladeuil
Empty shell
327
            ["%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.
328
    return basic_tests