« back to all changes in this revision
Viewing changes to bzrtools.py
- browse files at revision 581
- compare with another revision
- download diff
- download tarball
- view history from revision 581
- Committer: Aaron Bentley
- Date: 2007-09-12 00:05:25 UTC
- Revision ID: aaron.bentley@utoronto.ca-20070912000525-y5z0pjbgc0l8lxe3
Tags: release-0.91.0
RELEASE 0.91.0
added
removed
bzrtools.py
1
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron@aaronbentley.com>
1
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron.bentley@utoronto.ca>
2
2
# Copyright (C) 2007 John Arbash Meinel
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
24
24
import sys
25
25
26
26
import bzrlib
27
from bzrlib import revision as _mod_revision, trace, urlutils
27
from bzrlib import urlutils
28
28
import bzrlib.errors
29
from bzrlib.errors import (
30
BzrCommandError,
31
BzrError,
32
ConnectionError,
33
NotBranchError,
34
NoSuchFile,
35
NoWorkingTree,
36
PermissionDenied,
37
UnsupportedFormatError,
38
TransportError,
39
)
29
from bzrlib.errors import (BzrCommandError, NotBranchError, NoSuchFile,
30
UnsupportedFormatError, TransportError,
31
NoWorkingTree, PermissionDenied, ConnectionError)
40
32
from bzrlib.bzrdir import BzrDir, BzrDirFormat
41
33
from bzrlib.transport import get_transport
42
34
109
101
def __init__(self, rsync_name):
110
102
Exception.__init__(self, "%s not found." % rsync_name)
111
103
112
113
104
def rsync(source, target, ssh=False, excludes=(), silent=False,
114
105
rsync_name="rsync"):
106
"""
107
>>> new_dir = tempfile.mkdtemp()
108
>>> old_dir = os.getcwd()
109
>>> os.chdir(new_dir)
110
>>> rsync("a", "b", silent=True)
111
Traceback (most recent call last):
112
RsyncNoFile: No such file...
113
>>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True)
114
Traceback (most recent call last):
115
RsyncNoFile: No such file...
116
>>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
117
Traceback (most recent call last):
118
NoRsync: rsyncc not found.
119
>>> os.chdir(old_dir)
120
>>> os.rmdir(new_dir)
121
"""
115
122
cmd = [rsync_name, "-av", "--delete"]
116
123
if ssh:
117
124
cmd.extend(('-e', 'ssh'))
181
188
return [l.rstrip('\r\n') for l in
182
189
codecs.open(fname, 'rb', 'utf-8').readlines()]
183
190
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
191
class RsyncNoFile(Exception):
194
192
def __init__(self, path):
195
193
Exception.__init__(self, "No such file %s" % path)
198
196
def __init__(self):
199
197
Exception.__init__(self, "Error in rsync protocol data stream.")
200
198
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):
199
def get_revision_history(location):
212
200
tempdir = tempfile.mkdtemp('push')
213
my_rsync = _rsync
214
if my_rsync is None:
215
my_rsync = rsync
216
201
try:
217
202
history_fname = os.path.join(tempdir, 'revision-history')
218
203
try:
219
cmd = my_rsync(location+'.bzr/revision-history', history_fname,
204
cmd = rsync(location+'.bzr/revision-history', history_fname,
220
205
silent=True)
221
206
except RsyncNoFile:
222
207
cmd = rsync(location+'.bzr/branch/revision-history', history_fname,
226
211
shutil.rmtree(tempdir)
227
212
return history
228
213
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):
214
def history_subset(location, branch):
215
remote_history = get_revision_history(location)
246
216
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):
217
if len(remote_history) > len(local_history):
218
return False
219
for local, remote in zip(remote_history, local_history):
220
if local != remote:
256
221
return False
257
for local, remote in zip(remote_history, local_history):
258
if local != remote:
259
return False
260
return True
261
222
return True
262
223
263
224
def empty_or_absent(location):
264
225
try:
267
228
except RsyncNoFile:
268
229
return True
269
230
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()
231
def rspush(tree, location=None, overwrite=False, working_tree=True):
232
push_location = get_push_data(tree)
233
if location is not None:
234
if not location.endswith('/'):
235
location += '/'
236
push_location = location
237
238
if push_location is None:
239
raise BzrCommandError("No rspush location known or specified.")
240
241
if (push_location.find('::') != -1):
242
usessh=False
243
else:
244
usessh=True
245
246
if (push_location.find('://') != -1 or
247
push_location.find(':') == -1):
248
raise BzrCommandError("Invalid rsync path %r." % push_location)
249
250
if working_tree:
251
clean, non_source = is_clean(tree)
252
if not clean:
253
print """Error: This tree has uncommitted changes or unknown (?) files.
254
Use "bzr status" to list them."""
255
sys.exit(1)
256
final_exclusions = non_source[:]
257
else:
258
wt = tree
259
final_exclusions = []
260
for path, status, kind, file_id, entry in wt.list_files():
261
final_exclusions.append(path)
262
263
final_exclusions.extend(exclusions)
264
if not overwrite:
265
try:
266
if not history_subset(push_location, tree.branch):
267
raise bzrlib.errors.BzrCommandError("Local branch is not a"
268
" newer version of remote"
269
" branch.")
270
except RsyncNoFile:
271
if not empty_or_absent(push_location):
272
raise bzrlib.errors.BzrCommandError("Remote location is not a"
273
" bzr branch (or empty"
274
" directory)")
275
except RsyncStreamIO:
276
raise bzrlib.errors.BzrCommandError("Rsync could not use the"
277
" specified location. Please ensure that"
278
' "%s" is of the form "machine:/path".' % push_location)
279
print "Pushing to %s" % push_location
280
rsync(tree.basedir+'/', push_location, ssh=usessh,
281
excludes=final_exclusions)
282
283
set_push_data(tree, push_location)
340
284
341
285
342
286
def short_committer(committer):
352
296
' <a href="'
353
297
t = t.clone()
354
298
t._remote_path = lambda x: t.base
355
try:
356
lines = t.get('')
357
except bzrlib.errors.NoSuchFile:
358
return
359
expr = re.compile('<a[^>]*href="([^>]*)\/"[^>]*>', flags=re.I)
299
lines = t.get('')
300
expr = re.compile('<a[^>]*href="([^>]*)"[^>]*>', flags=re.I)
360
301
for line in lines:
361
302
match = expr.search(line)
362
303
if match is None:
369
310
yield url.rstrip('/')
370
311
371
312
372
def list_branches(t):
373
def is_inside(branch):
374
return bool(branch.base.startswith(t.base))
375
376
if t.base.startswith('http://'):
377
def evaluate(bzrdir):
313
def iter_branches(t, lister=None):
314
"""Iterate through all the branches under a transport"""
315
for bzrdir in iter_bzrdirs(t, lister):
316
try:
317
branch = bzrdir.open_branch()
318
if branch.bzrdir is bzrdir:
319
yield branch
320
except (NotBranchError, UnsupportedFormatError):
321
pass
322
323
324
def iter_branch_tree(t, lister=None):
325
for bzrdir in iter_bzrdirs(t, lister):
326
try:
327
wt = bzrdir.open_workingtree()
328
yield wt.branch, wt
329
except NoWorkingTree, UnsupportedFormatError:
378
330
try:
379
331
branch = bzrdir.open_branch()
380
if is_inside(branch):
381
return True, branch
382
else:
383
return True, None
384
except NotBranchError:
385
return True, None
386
return [b for b in BzrDir.find_bzrdirs(t, list_current=apache_ls,
387
evaluate=evaluate) if b is not None]
388
elif not t.listable():
389
raise BzrCommandError("Can't list this type of location.")
390
return [b for b in BzrDir.find_branches(t) if is_inside(b)]
391
392
393
def evaluate_branch_tree(bzrdir):
394
try:
395
tree, branch = bzrdir._get_tree_branch()
396
except NotBranchError:
397
return True, None
398
else:
399
return True, (branch, tree)
400
401
402
def iter_branch_tree(t, lister=None):
403
return (x for x in BzrDir.find_bzrdirs(t, evaluate=evaluate_branch_tree,
404
list_current=lister) if x is not None)
332
if branch.bzrdir is bzrdir:
333
yield branch, None
334
except (NotBranchError, UnsupportedFormatError):
335
continue
336
337
338
def iter_bzrdirs(t, lister=None):
339
if lister is None:
340
def lister(t):
341
return t.list_dir('.')
342
try:
343
bzrdir = bzrdir_from_transport(t)
344
yield bzrdir
345
except (ConnectionError):
346
raise
347
except (NotBranchError, UnsupportedFormatError, TransportError,
348
PermissionDenied):
349
pass
350
try:
351
for directory in lister(t):
352
if directory == ".bzr":
353
continue
354
try:
355
subt = t.clone(directory)
356
except UnicodeDecodeError:
357
continue
358
for bzrdir in iter_bzrdirs(subt, lister):
359
yield bzrdir
360
except (NoSuchFile, PermissionDenied, TransportError):
361
pass
362
363
364
def bzrdir_from_transport(t):
365
"""Open a bzrdir from a transport (not a location)"""
366
format = BzrDirFormat.find_format(t)
367
BzrDir._check_supported(format, False)
368
return format.open(t)
405
369
406
370
407
371
def open_from_url(location):
Loggerhead is a web-based interface for Breezy
Version: 2.0.1