« back to all changes in this revision
Viewing changes to bzrtools.py
- browse files at revision 787
- compare with another revision
- download diff
- download tarball
- view history from revision 787
- Committer: Aaron Bentley
- Date: 2013-08-20 03:02:43 UTC
- Revision ID: aaron@aaronbentley.com-20130820030243-r8v1xfbcnd8f10p4
Fix zap command for 2.6/7
- files added:
- .the_kraken
- files removed:
- baz_helper.py
- external
- files renamed:
- release.py => check-release.py
- __init__.py => command_classes.py
- files modified:
- .bzrignore
added
removed
bzrtools.py
1
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron@aaronbentley.com>
1
# Copyright (C) 2005-2009, 2011-2013 Aaron Bentley <aaron@aaronbentley.com>
2
2
# Copyright (C) 2007 John Arbash Meinel
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
import codecs
18
import errno
19
import os
17
from contextlib import contextmanager
20
18
import re
21
import tempfile
22
import shutil
23
from subprocess import Popen, PIPE
24
import sys
25
19
26
import bzrlib
27
from bzrlib import revision as _mod_revision, trace, urlutils
28
import bzrlib.errors
20
from bzrlib import urlutils
29
21
from bzrlib.errors import (
30
22
BzrCommandError,
31
BzrError,
32
ConnectionError,
33
23
NotBranchError,
34
24
NoSuchFile,
35
NoWorkingTree,
36
PermissionDenied,
37
UnsupportedFormatError,
38
TransportError,
39
25
)
40
from bzrlib.bzrdir import BzrDir, BzrDirFormat
26
from bzrlib.bzrdir import BzrDir
41
27
from bzrlib.transport import get_transport
42
28
43
def temp_tree():
44
dirname = tempfile.mkdtemp("temp-branch")
45
return BzrDir.create_standalone_workingtree(dirname)
46
47
def rm_tree(tree):
48
shutil.rmtree(tree.basedir)
49
50
def is_clean(cur_tree):
51
"""
52
Return true if no files are modifed or unknown
53
"""
54
old_tree = cur_tree.basis_tree()
55
new_tree = cur_tree
56
non_source = []
57
new_tree.lock_read()
58
try:
59
for path, file_class, kind, file_id, entry in new_tree.list_files():
60
if file_class in ('?', 'I'):
61
non_source.append(path)
62
delta = new_tree.changes_from(old_tree, want_unchanged=False)
63
finally:
64
new_tree.unlock()
65
return not delta.has_changed(), non_source
66
67
def set_push_data(tree, location):
68
tree.branch.control_files.put_utf8("x-push-data", "%s\n" % location)
69
70
def get_push_data(tree):
71
"""
72
>>> tree = temp_tree()
73
>>> get_push_data(tree) is None
74
True
75
>>> set_push_data(tree, 'http://somewhere')
76
>>> get_push_data(tree)
77
u'http://somewhere'
78
>>> rm_tree(tree)
79
"""
80
try:
81
location = tree.branch.control_files.get_utf8('x-push-data').read()
82
except NoSuchFile:
83
return None
84
return location.rstrip('\n')
85
86
"""
87
>>> shell_escape('hello')
88
'\h\e\l\l\o'
89
"""
90
def shell_escape(arg):
91
return "".join(['\\'+c for c in arg])
92
93
def safe_system(args):
94
"""
95
>>> real_system = os.system
96
>>> os.system = sys.stdout.write
97
>>> safe_system(['a', 'b', 'cd'])
98
\\a \\b \\c\\d
99
>>> os.system = real_system
100
"""
101
arg_str = " ".join([shell_escape(a) for a in args])
102
return os.system(arg_str)
103
104
class RsyncUnknownStatus(Exception):
105
def __init__(self, status):
106
Exception.__init__(self, "Unknown status: %d" % status)
107
108
class NoRsync(Exception):
109
def __init__(self, rsync_name):
110
Exception.__init__(self, "%s not found." % rsync_name)
111
112
113
def rsync(source, target, ssh=False, excludes=(), silent=False,
114
rsync_name="rsync"):
115
cmd = [rsync_name, "-av", "--delete"]
116
if ssh:
117
cmd.extend(('-e', 'ssh'))
118
if len(excludes) > 0:
119
cmd.extend(('--exclude-from', '-'))
120
cmd.extend((source, target))
121
if silent:
122
stderr = PIPE
123
stdout = PIPE
124
else:
125
stderr = None
126
stdout = None
127
try:
128
proc = Popen(cmd, stdin=PIPE, stderr=stderr, stdout=stdout)
129
except OSError, e:
130
if e.errno == errno.ENOENT:
131
raise NoRsync(rsync_name)
132
133
proc.stdin.write('\n'.join(excludes)+'\n')
134
proc.stdin.close()
135
if silent:
136
proc.stderr.read()
137
proc.stderr.close()
138
proc.stdout.read()
139
proc.stdout.close()
140
proc.wait()
141
if proc.returncode == 12:
142
raise RsyncStreamIO()
143
elif proc.returncode == 23:
144
raise RsyncNoFile(source)
145
elif proc.returncode != 0:
146
raise RsyncUnknownStatus(proc.returncode)
147
return cmd
148
149
150
def rsync_ls(source, ssh=False, silent=True):
151
cmd = ["rsync"]
152
if ssh:
153
cmd.extend(('-e', 'ssh'))
154
cmd.append(source)
155
if silent:
156
stderr = PIPE
157
else:
158
stderr = None
159
proc = Popen(cmd, stderr=stderr, stdout=PIPE)
160
result = proc.stdout.read()
161
proc.stdout.close()
162
if silent:
163
proc.stderr.read()
164
proc.stderr.close()
165
proc.wait()
166
if proc.returncode == 12:
167
raise RsyncStreamIO()
168
elif proc.returncode == 23:
169
raise RsyncNoFile(source)
170
elif proc.returncode != 0:
171
raise RsyncUnknownStatus(proc.returncode)
172
return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
173
174
exclusions = ('.bzr/x-push-data', '.bzr/branch/x-push/data', '.bzr/parent',
175
'.bzr/branch/parent', '.bzr/x-pull-data', '.bzr/x-pull',
176
'.bzr/pull', '.bzr/stat-cache', '.bzr/x-rsync-data',
177
'.bzr/basis-inventory', '.bzr/inventory.backup.weave')
178
179
180
def read_revision_history(fname):
181
return [l.rstrip('\r\n') for l in
182
codecs.open(fname, 'rb', 'utf-8').readlines()]
183
184
185
def read_revision_info(path):
186
"""Parse a last_revision file to determine revision_info"""
187
line = open(path, 'rb').readlines()[0].strip('\n')
188
revno, revision_id = line.split(' ', 1)
189
revno = int(revno)
190
return revno, revision_id
191
192
193
class RsyncNoFile(Exception):
194
def __init__(self, path):
195
Exception.__init__(self, "No such file %s" % path)
196
197
class RsyncStreamIO(Exception):
198
def __init__(self):
199
Exception.__init__(self, "Error in rsync protocol data stream.")
200
201
202
class NotStandalone(BzrError):
203
204
_format = '%(location) is not a standalone tree.'
205
_internal = False
206
207
def __init__(self, location):
208
BzrError.__init__(self, location=location)
209
210
211
def get_revision_history(location, _rsync):
212
tempdir = tempfile.mkdtemp('push')
213
my_rsync = _rsync
214
if my_rsync is None:
215
my_rsync = rsync
216
try:
217
history_fname = os.path.join(tempdir, 'revision-history')
218
try:
219
cmd = my_rsync(location+'.bzr/revision-history', history_fname,
220
silent=True)
221
except RsyncNoFile:
222
cmd = rsync(location+'.bzr/branch/revision-history', history_fname,
223
silent=True)
224
history = read_revision_history(history_fname)
225
finally:
226
shutil.rmtree(tempdir)
227
return history
228
229
230
def get_revision_info(location, _rsync):
231
"""Get the revsision_info for an rsync-able branch"""
232
tempdir = tempfile.mkdtemp('push')
233
my_rsync = _rsync
234
if my_rsync is None:
235
my_rsync = rsync
236
try:
237
info_fname = os.path.join(tempdir, 'last-revision')
238
cmd = rsync(location+'.bzr/branch/last-revision', info_fname,
239
silent=True)
240
return read_revision_info(info_fname)
241
finally:
242
shutil.rmtree(tempdir)
243
244
245
def history_subset(location, branch, _rsync=None):
246
local_history = branch.revision_history()
247
try:
248
remote_history = get_revision_history(location, _rsync)
249
except RsyncNoFile:
250
revno, revision_id = get_revision_info(location, _rsync)
251
if revision_id == _mod_revision.NULL_REVISION:
252
return True
253
return bool(revision_id.decode('utf-8') in local_history)
254
else:
255
if len(remote_history) > len(local_history):
256
return False
257
for local, remote in zip(remote_history, local_history):
258
if local != remote:
259
return False
260
return True
261
262
263
def empty_or_absent(location):
264
try:
265
files = rsync_ls(location)
266
return files == ['.']
267
except RsyncNoFile:
268
return True
269
270
def rspush(tree, location=None, overwrite=False, working_tree=True,
271
_rsync=None):
272
tree.lock_write()
273
try:
274
my_rsync = _rsync
275
if my_rsync is None:
276
my_rsync = rsync
277
if (tree.bzrdir.root_transport.base !=
278
tree.branch.bzrdir.root_transport.base):
279
raise NotStandalone(tree.bzrdir.root_transport.base)
280
if (tree.branch.get_bound_location() is not None):
281
raise NotStandalone(tree.bzrdir.root_transport.base)
282
if (tree.branch.repository.is_shared()):
283
raise NotStandalone(tree.bzrdir.root_transport.base)
284
push_location = get_push_data(tree)
285
if location is not None:
286
if not location.endswith('/'):
287
location += '/'
288
push_location = location
289
290
if push_location is None:
291
raise BzrCommandError("No rspush location known or specified.")
292
293
if (push_location.find('::') != -1):
294
usessh=False
295
else:
296
usessh=True
297
298
if (push_location.find('://') != -1 or
299
push_location.find(':') == -1):
300
raise BzrCommandError("Invalid rsync path %r." % push_location)
301
302
if working_tree:
303
clean, non_source = is_clean(tree)
304
if not clean:
305
raise bzrlib.errors.BzrCommandError(
306
'This tree has uncommitted changes or unknown'
307
' (?) files. Use "bzr status" to list them.')
308
sys.exit(1)
309
final_exclusions = non_source[:]
310
else:
311
wt = tree
312
final_exclusions = []
313
for path, status, kind, file_id, entry in wt.list_files():
314
final_exclusions.append(path)
315
316
final_exclusions.extend(exclusions)
317
if not overwrite:
318
try:
319
if not history_subset(push_location, tree.branch,
320
_rsync=my_rsync):
321
raise bzrlib.errors.BzrCommandError(
322
"Local branch is not a newer version of remote"
323
" branch.")
324
except RsyncNoFile:
325
if not empty_or_absent(push_location):
326
raise bzrlib.errors.BzrCommandError(
327
"Remote location is not a bzr branch (or empty"
328
" directory)")
329
except RsyncStreamIO:
330
raise bzrlib.errors.BzrCommandError("Rsync could not use the"
331
" specified location. Please ensure that"
332
' "%s" is of the form "machine:/path".' % push_location)
333
trace.note("Pushing to %s", push_location)
334
my_rsync(tree.basedir+'/', push_location, ssh=usessh,
335
excludes=final_exclusions)
336
337
set_push_data(tree, push_location)
338
finally:
339
tree.unlock()
29
30
@contextmanager
31
def read_locked(lockable):
32
"""Read-lock a tree, branch or repository in this context."""
33
lockable.lock_read()
34
try:
35
yield lockable
36
finally:
37
lockable.unlock()
340
38
341
39
342
40
def short_committer(committer):
354
52
t._remote_path = lambda x: t.base
355
53
try:
356
54
lines = t.get('')
357
except bzrlib.errors.NoSuchFile:
55
except NoSuchFile:
358
56
return
359
57
expr = re.compile('<a[^>]*href="([^>]*)\/"[^>]*>', flags=re.I)
360
58
for line in lines:
407
105
def open_from_url(location):
408
106
location = urlutils.normalize_url(location)
409
107
dirname, basename = urlutils.split(location)
108
if location.endswith('/') and not basename.endswith('/'):
109
basename += '/'
410
110
return get_transport(dirname).get(basename)
411
111
412
112
Loggerhead is a web-based interface for Breezy
Version: 2.0.1