50
40
def is_clean(cur_tree):
52
42
Return true if no files are modifed or unknown
44
>>> tree = temp_tree()
47
>>> fooname = os.path.join(tree.basedir, "foo")
48
>>> file(fooname, "wb").write("bar")
51
>>> bzrlib.add.smart_add_tree(tree, [tree.basedir])
55
>>> tree.commit("added file", rev_id='commit-id')
54
61
old_tree = cur_tree.basis_tree()
55
62
new_tree = cur_tree
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)
64
for path, file_class, kind, file_id, entry in new_tree.list_files():
65
if file_class in ('?', 'I'):
66
non_source.append(path)
67
delta = new_tree.changes_from(old_tree, want_unchanged=False)
65
68
return not delta.has_changed(), non_source
67
70
def set_push_data(tree, location):
109
112
def __init__(self, rsync_name):
110
113
Exception.__init__(self, "%s not found." % rsync_name)
113
def rsync(source, target, ssh=False, excludes=(), silent=False,
115
def rsync(source, target, ssh=False, excludes=(), silent=False,
114
116
rsync_name="rsync"):
118
>>> new_dir = tempfile.mkdtemp()
119
>>> old_dir = os.getcwd()
120
>>> os.chdir(new_dir)
121
>>> rsync("a", "b", silent=True)
122
Traceback (most recent call last):
123
RsyncNoFile: No such file...
124
>>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True)
125
Traceback (most recent call last):
126
RsyncNoFile: No such file...
127
>>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
128
Traceback (most recent call last):
129
NoRsync: rsyncc not found.
130
>>> os.chdir(old_dir)
131
>>> os.rmdir(new_dir)
115
133
cmd = [rsync_name, "-av", "--delete"]
117
135
cmd.extend(('-e', 'ssh'))
171
189
raise RsyncUnknownStatus(proc.returncode)
172
190
return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
174
exclusions = ('.bzr/x-push-data', '.bzr/branch/x-push/data', '.bzr/parent',
192
exclusions = ('.bzr/x-push-data', '.bzr/branch/x-push/data', '.bzr/parent',
175
193
'.bzr/branch/parent', '.bzr/x-pull-data', '.bzr/x-pull',
176
194
'.bzr/pull', '.bzr/stat-cache', '.bzr/x-rsync-data',
177
195
'.bzr/basis-inventory', '.bzr/inventory.backup.weave')
181
199
return [l.rstrip('\r\n') for l in
182
200
codecs.open(fname, 'rb', 'utf-8').readlines()]
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)
190
return revno, revision_id
193
202
class RsyncNoFile(Exception):
194
203
def __init__(self, path):
195
204
Exception.__init__(self, "No such file %s" % path)
198
207
def __init__(self):
199
208
Exception.__init__(self, "Error in rsync protocol data stream.")
202
class NotStandalone(BzrError):
204
_format = '%(location) is not a standalone tree.'
207
def __init__(self, location):
208
BzrError.__init__(self, location=location)
211
def get_revision_history(location, _rsync):
210
def get_revision_history(location):
212
211
tempdir = tempfile.mkdtemp('push')
217
213
history_fname = os.path.join(tempdir, 'revision-history')
219
cmd = my_rsync(location+'.bzr/revision-history', history_fname,
215
cmd = rsync(location+'.bzr/revision-history', history_fname,
221
217
except RsyncNoFile:
222
218
cmd = rsync(location+'.bzr/branch/revision-history', history_fname,
226
222
shutil.rmtree(tempdir)
230
def get_revision_info(location, _rsync):
231
"""Get the revsision_info for an rsync-able branch"""
232
tempdir = tempfile.mkdtemp('push')
237
info_fname = os.path.join(tempdir, 'last-revision')
238
cmd = rsync(location+'.bzr/branch/last-revision', info_fname,
240
return read_revision_info(info_fname)
242
shutil.rmtree(tempdir)
245
def history_subset(location, branch, _rsync=None):
225
def history_subset(location, branch):
226
remote_history = get_revision_history(location)
246
227
local_history = branch.revision_history()
248
remote_history = get_revision_history(location, _rsync)
250
revno, revision_id = get_revision_info(location, _rsync)
251
if revision_id == _mod_revision.NULL_REVISION:
253
return bool(revision_id.decode('utf-8') in local_history)
255
if len(remote_history) > len(local_history):
257
for local, remote in zip(remote_history, local_history):
228
if len(remote_history) > len(local_history):
230
for local, remote in zip(remote_history, local_history):
263
235
def empty_or_absent(location):
267
239
except RsyncNoFile:
270
def rspush(tree, location=None, overwrite=False, working_tree=True,
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('/'):
288
push_location = location
290
if push_location is None:
291
raise BzrCommandError("No rspush location known or specified.")
293
if (push_location.find('::') != -1):
298
if (push_location.find('://') != -1 or
299
push_location.find(':') == -1):
300
raise BzrCommandError("Invalid rsync path %r." % push_location)
303
clean, non_source = is_clean(tree)
305
raise bzrlib.errors.BzrCommandError(
306
'This tree has uncommitted changes or unknown'
307
' (?) files. Use "bzr status" to list them.')
309
final_exclusions = non_source[:]
312
final_exclusions = []
313
for path, status, kind, file_id, entry in wt.list_files():
314
final_exclusions.append(path)
316
final_exclusions.extend(exclusions)
319
if not history_subset(push_location, tree.branch,
321
raise bzrlib.errors.BzrCommandError(
322
"Local branch is not a newer version of remote"
325
if not empty_or_absent(push_location):
326
raise bzrlib.errors.BzrCommandError(
327
"Remote location is not a bzr branch (or empty"
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)
337
set_push_data(tree, push_location)
242
def rspush(tree, location=None, overwrite=False, working_tree=True):
243
push_location = get_push_data(tree)
244
if location is not None:
245
if not location.endswith('/'):
247
push_location = location
249
if push_location is None:
250
raise BzrCommandError("No rspush location known or specified.")
252
if (push_location.find('::') != -1):
257
if (push_location.find('://') != -1 or
258
push_location.find(':') == -1):
259
raise BzrCommandError("Invalid rsync path %r." % push_location)
262
clean, non_source = is_clean(tree)
264
print """Error: This tree has uncommitted changes or unknown (?) files.
265
Use "bzr status" to list them."""
267
final_exclusions = non_source[:]
270
final_exclusions = []
271
for path, status, kind, file_id, entry in wt.list_files():
272
final_exclusions.append(path)
274
final_exclusions.extend(exclusions)
277
if not history_subset(push_location, tree.branch):
278
raise bzrlib.errors.BzrCommandError("Local branch is not a"
279
" newer version of remote"
282
if not empty_or_absent(push_location):
283
raise bzrlib.errors.BzrCommandError("Remote location is not a"
284
" bzr branch (or empty"
286
except RsyncStreamIO:
287
raise bzrlib.errors.BzrCommandError("Rsync could not use the"
288
" specified location. Please ensure that"
289
' "%s" is of the form "machine:/path".' % push_location)
290
print "Pushing to %s" % push_location
291
rsync(tree.basedir+'/', push_location, ssh=usessh,
292
excludes=final_exclusions)
294
set_push_data(tree, push_location)
342
297
def short_committer(committer):
369
319
yield url.rstrip('/')
372
def list_branches(t):
373
def is_inside(branch):
374
return bool(branch.base.startswith(t.base))
376
if t.base.startswith('http://'):
377
def evaluate(bzrdir):
322
def iter_branches(t, lister=None):
323
"""Iterate through all the branches under a transport"""
324
for bzrdir in iter_bzrdirs(t, lister):
326
branch = bzrdir.open_branch()
327
if branch.bzrdir is bzrdir:
329
except (NotBranchError, UnsupportedFormatError):
333
def iter_branch_tree(t, lister=None):
334
for bzrdir in iter_bzrdirs(t, lister):
336
wt = bzrdir.open_workingtree()
338
except NoWorkingTree, UnsupportedFormatError:
379
340
branch = bzrdir.open_branch()
380
if is_inside(branch):
384
except NotBranchError:
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)]
393
def evaluate_branch_tree(bzrdir):
395
tree, branch = bzrdir._get_tree_branch()
396
except NotBranchError:
399
return True, (branch, tree)
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)
407
def open_from_url(location):
408
location = urlutils.normalize_url(location)
409
dirname, basename = urlutils.split(location)
410
return get_transport(dirname).get(basename)
341
if branch.bzrdir is bzrdir:
343
except (NotBranchError, UnsupportedFormatError):
347
def iter_bzrdirs(t, lister=None):
350
return t.list_dir('.')
352
bzrdir = bzrdir_from_transport(t)
354
except (NotBranchError, UnsupportedFormatError, TransportError,
358
for directory in lister(t):
359
if directory == ".bzr":
362
subt = t.clone(directory)
363
except UnicodeDecodeError:
365
for bzrdir in iter_bzrdirs(subt, lister):
367
except (NoSuchFile, PermissionDenied, TransportError):
371
def bzrdir_from_transport(t):
372
"""Open a bzrdir from a transport (not a location)"""
373
format = BzrDirFormat.find_format(t)
374
BzrDir._check_supported(format, False)
375
return format.open(t)
added
removed
bzrtools.py
