1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
# Copyright (C) 2007 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Upload a working tree, incrementally"""
from bzrlib import (
commands,
errors,
option,
revisionspec,
transport,
workingtree,
)
class cmd_upload(commands.Command):
"""Upload a working tree, as a whole or incrementally.
If no destination is specified use the last one used.
If no revision is specified upload the changes since the last upload.
"""
takes_args = ['dest?']
takes_options = [
'revision',
option.Option('full', 'Upload the full working tree.'),
]
def run(self, dest, full=False, revision=None):
wt = workingtree.WorkingTree.open_containing(u'.')[0]
b = wt.branch
if dest is None:
raise NotImplementedError
else:
self.dest = transport.get_transport(dest)
if revision is None:
rev_id = wt.last_revision()
else:
if len(revision) != 1:
raise errors.BzrCommandError(
'bzr upload --revision takes exactly 1 argument')
rev_id = revision[0].in_history(b).rev_id
self.rev_id = rev_id
self.tree = b.repository.revision_tree(rev_id)
if full:
self.upload_full_tree()
else:
rev1 = revisionspec.RevisionSpec.from_string('1')
rev1_id = rev1.in_history(b).rev_id
from_tree = b.repository.revision_tree(rev1_id)
self.upload_tree(from_tree)
def set_uploaded_revid(self, rev_id):
# XXX: Rename to .bzr/uploaded ? Add tests for concurrent updates, etc.
self.dest.put_bytes('.bzr.uploaded', rev_id)
def upload_full_tree(self):
self.dest.ensure_base() # XXX: Handle errors
self.tree.lock_read()
dpath = self.dest.local_abspath('.')
try:
inv = self.tree.inventory
entries = inv.iter_entries()
entries.next() # skip root
for dp, ie in entries:
# .bzrignore has no meaning outside of a working tree
# so do not export it
if dp == ".bzrignore":
continue
ie.put_on_disk(dpath, dp, self.tree)
self.set_uploaded_revid(self.rev_id)
finally:
self.tree.unlock()
def upload_tree(self, from_tree):
self.dest.ensure_base() # XXX: Handle errors
# XXX: add tests for directories
changes = self.tree.changes_from(from_tree)
self.tree.lock_read()
try:
for (path, id, kind) in changes.added:
if kind is 'file':
self.dest.put_bytes(path, self.tree.get_file_text(id))
else:
raise NotImplementedError
# XXX: Add a test for exec_change
for (path, id, kind,
content_change, exec_change) in changes.modified:
if kind is 'file':
self.dest.put_bytes(path, self.tree.get_file_text(id))
else:
raise NotImplementedError
self.set_uploaded_revid(self.rev_id)
finally:
self.tree.unlock()
commands.register_command(cmd_upload)
def test_suite():
from bzrlib.tests import TestUtil
suite = TestUtil.TestSuite()
loader = TestUtil.TestLoader()
testmod_names = [
'test_upload',
]
suite.addTest(loader.loadTestsFromModuleNames(
["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
return suite
|