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
23
25
from subprocess import Popen, PIPE
27
from bzrlib import revision as _mod_revision, trace, urlutils
29
from bzrlib.errors import (
37
UnsupportedFormatError,
40
from bzrlib.bzrdir import BzrDir, BzrDirFormat
41
from bzrlib.transport import get_transport
44
29
dirname = tempfile.mkdtemp("temp-branch")
45
return BzrDir.create_standalone_workingtree(dirname)
48
shutil.rmtree(tree.basedir)
50
def is_clean(cur_tree):
30
return bzrlib.branch.Branch.initialize(dirname)
33
shutil.rmtree(br.base)
35
def is_clean(cur_branch):
52
37
Return true if no files are modifed or unknown
39
>>> br = temp_branch()
42
>>> fooname = os.path.join(br.base, "foo")
43
>>> file(fooname, "wb").write("bar")
46
>>> bzrlib.add.smart_add_branch(br, [br.base])
50
>>> br.commit("added file")
54
old_tree = cur_tree.basis_tree()
55
from bzrlib.diff import compare_trees
56
old_tree = cur_branch.basis_tree()
57
new_tree = cur_branch.working_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)
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 = compare_trees(old_tree, new_tree, want_unchanged=False)
65
63
return not delta.has_changed(), non_source
67
def set_push_data(tree, location):
68
tree.branch._transport.put_bytes("x-push-data", "%s\n" % location)
70
def get_push_data(tree):
72
>>> tree = temp_tree()
73
>>> get_push_data(tree) is None
65
def set_pull_data(br, location, rev_id):
66
pull_file = file (br.controlfilename("x-pull-data"), "wb")
67
pull_file.write("%s\n%s\n" % (location, rev_id))
69
def get_pull_data(br):
71
>>> br = temp_branch()
74
>>> set_pull_data(br, 'http://somewhere', '888-777')
76
('http://somewhere', '888-777')
79
filename = br.controlfilename("x-pull-data")
80
if not os.path.exists(filename):
82
pull_file = file (filename, "rb")
83
location, rev_id = [f.rstrip('\n') for f in pull_file]
84
return location, rev_id
86
def set_push_data(br, location):
87
push_file = file (br.controlfilename("x-push-data"), "wb")
88
push_file.write("%s\n" % location)
90
def get_push_data(br):
92
>>> br = temp_branch()
93
>>> get_push_data(br) is None
75
>>> set_push_data(tree, 'http://somewhere')
76
>>> get_push_data(tree)
95
>>> set_push_data(br, 'http://somewhere')
81
location = tree.branch._transport.get('x-push-data').read()
100
filename = br.controlfilename("x-push-data")
101
if not os.path.exists(filename):
84
location = location.decode('utf-8')
85
return location.rstrip('\n')
103
push_file = file (filename, "rb")
104
(location,) = [f.rstrip('\n') for f in push_file]
88
108
>>> shell_escape('hello')
110
130
def __init__(self, rsync_name):
111
131
Exception.__init__(self, "%s not found." % rsync_name)
114
def rsync(source, target, ssh=False, excludes=(), silent=False,
133
def rsync(source, target, ssh=False, excludes=(), silent=False,
115
134
rsync_name="rsync"):
136
>>> rsync("a", "b", silent=True)
137
Traceback (most recent call last):
138
RsyncNoFile: No such file a
139
>>> rsync("a", "b", excludes=("*.py",), silent=True)
140
Traceback (most recent call last):
141
RsyncNoFile: No such file a
142
>>> rsync("a", "b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
143
Traceback (most recent call last):
144
NoRsync: rsyncc not found.
116
146
cmd = [rsync_name, "-av", "--delete"]
118
148
cmd.extend(('-e', 'ssh'))
172
202
raise RsyncUnknownStatus(proc.returncode)
173
203
return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
175
exclusions = ('.bzr/x-push-data', '.bzr/branch/x-push/data', '.bzr/parent',
176
'.bzr/branch/parent', '.bzr/x-pull-data', '.bzr/x-pull',
177
'.bzr/pull', '.bzr/stat-cache', '.bzr/x-rsync-data',
178
'.bzr/basis-inventory', '.bzr/inventory.backup.weave')
205
exclusions = ('.bzr/x-push-data', '.bzr/parent', '.bzr/x-pull-data',
206
'.bzr/x-pull', '.bzr/pull', '.bzr/stat-cache',
181
210
def read_revision_history(fname):
182
211
return [l.rstrip('\r\n') for l in
183
212
codecs.open(fname, 'rb', 'utf-8').readlines()]
186
def read_revision_info(path):
187
"""Parse a last_revision file to determine revision_info"""
188
line = open(path, 'rb').readlines()[0].strip('\n')
189
revno, revision_id = line.split(' ', 1)
191
return revno, revision_id
194
214
class RsyncNoFile(Exception):
195
215
def __init__(self, path):
196
216
Exception.__init__(self, "No such file %s" % path)
199
219
def __init__(self):
200
220
Exception.__init__(self, "Error in rsync protocol data stream.")
203
class NotStandalone(BzrError):
205
_fmt = '%(location)s is not a standalone tree.'
208
def __init__(self, location):
209
BzrError.__init__(self, location=location)
212
def get_revision_history(location, _rsync):
222
def get_revision_history(location):
213
223
tempdir = tempfile.mkdtemp('push')
218
225
history_fname = os.path.join(tempdir, 'revision-history')
220
cmd = my_rsync(location+'.bzr/revision-history', history_fname,
223
cmd = rsync(location+'.bzr/branch/revision-history', history_fname,
226
cmd = rsync(location+'.bzr/revision-history', history_fname,
225
228
history = read_revision_history(history_fname)
227
230
shutil.rmtree(tempdir)
231
def get_revision_info(location, _rsync):
232
"""Get the revsision_info for an rsync-able branch"""
233
tempdir = tempfile.mkdtemp('push')
238
info_fname = os.path.join(tempdir, 'last-revision')
239
cmd = rsync(location+'.bzr/branch/last-revision', info_fname,
241
return read_revision_info(info_fname)
243
shutil.rmtree(tempdir)
246
def history_subset(location, branch, _rsync=None):
233
def history_subset(location, branch):
234
remote_history = get_revision_history(location)
247
235
local_history = branch.revision_history()
249
remote_history = get_revision_history(location, _rsync)
251
revno, revision_id = get_revision_info(location, _rsync)
252
if revision_id == _mod_revision.NULL_REVISION:
254
return bool(revision_id.decode('utf-8') in local_history)
256
if len(remote_history) > len(local_history):
258
for local, remote in zip(remote_history, local_history):
236
if len(remote_history) > len(local_history):
238
for local, remote in zip(remote_history, local_history):
264
243
def empty_or_absent(location):
268
247
except RsyncNoFile:
271
def rspush(tree, location=None, overwrite=False, working_tree=True,
278
if (tree.bzrdir.root_transport.base !=
279
tree.branch.bzrdir.root_transport.base):
280
raise NotStandalone(tree.bzrdir.root_transport.base)
281
if (tree.branch.get_bound_location() is not None):
282
raise NotStandalone(tree.bzrdir.root_transport.base)
283
if (tree.branch.repository.is_shared()):
284
raise NotStandalone(tree.bzrdir.root_transport.base)
285
push_location = get_push_data(tree)
286
if location is not None:
287
if not location.endswith('/'):
289
push_location = location
291
if push_location is None:
292
raise BzrCommandError("No rspush location known or specified.")
294
if (push_location.find('::') != -1):
299
if (push_location.find('://') != -1 or
300
push_location.find(':') == -1):
301
raise BzrCommandError("Invalid rsync path %r." % push_location)
304
clean, non_source = is_clean(tree)
306
raise bzrlib.errors.BzrCommandError(
307
'This tree has uncommitted changes or unknown'
308
' (?) files. Use "bzr status" to list them.')
310
final_exclusions = non_source[:]
313
final_exclusions = []
314
for path, status, kind, file_id, entry in wt.list_files():
315
final_exclusions.append(path)
317
final_exclusions.extend(exclusions)
320
if not history_subset(push_location, tree.branch,
322
raise bzrlib.errors.BzrCommandError(
323
"Local branch is not a newer version of remote"
326
if not empty_or_absent(push_location):
327
raise bzrlib.errors.BzrCommandError(
328
"Remote location is not a bzr branch (or empty"
330
except RsyncStreamIO:
331
raise bzrlib.errors.BzrCommandError("Rsync could not use the"
332
" specified location. Please ensure that"
333
' "%s" is of the form "machine:/path".' % push_location)
334
trace.note("Pushing to %s", push_location)
335
my_rsync(tree.basedir+'/', push_location, ssh=usessh,
336
excludes=final_exclusions)
338
set_push_data(tree, push_location)
343
def short_committer(committer):
344
new_committer = re.sub('<.*>', '', committer).strip(' ')
345
if len(new_committer) < 2:
351
"""Screen-scrape Apache listings"""
352
apache_dir = '<img border="0" src="/icons/folder.gif" alt="[dir]">'\
355
t._remote_path = lambda x: t.base
358
except bzrlib.errors.NoSuchFile:
360
expr = re.compile('<a[^>]*href="([^>]*)\/"[^>]*>', flags=re.I)
362
match = expr.search(line)
366
if url.startswith('http://') or url.startswith('/') or '../' in url:
370
yield url.rstrip('/')
373
def list_branches(t):
374
def is_inside(branch):
375
return bool(branch.base.startswith(t.base))
377
if t.base.startswith('http://'):
378
def evaluate(bzrdir):
380
branch = bzrdir.open_branch()
381
if is_inside(branch):
385
except NotBranchError:
387
return [b for b in BzrDir.find_bzrdirs(t, list_current=apache_ls,
388
evaluate=evaluate) if b is not None]
389
elif not t.listable():
390
raise BzrCommandError("Can't list this type of location.")
391
return [b for b in BzrDir.find_branches(t) if is_inside(b)]
394
def evaluate_branch_tree(bzrdir):
396
tree, branch = bzrdir._get_tree_branch()
397
except NotBranchError:
400
return True, (branch, tree)
403
def iter_branch_tree(t, lister=None):
404
return (x for x in BzrDir.find_bzrdirs(t, evaluate=evaluate_branch_tree,
405
list_current=lister) if x is not None)
408
def open_from_url(location):
409
location = urlutils.normalize_url(location)
410
dirname, basename = urlutils.split(location)
411
if location.endswith('/') and not basename.endswith('/'):
413
return get_transport(dirname).get(basename)
250
def push(cur_branch, location=None, overwrite=False):
251
push_location = get_push_data(cur_branch)
252
if location is not None:
253
if not location.endswith('/'):
255
push_location = location
257
if push_location is None:
258
raise bzrlib.errors.MustUseDecorated
260
if push_location.find('://') != -1:
261
raise bzrlib.errors.MustUseDecorated
263
if push_location.find(':') == -1:
264
raise bzrlib.errors.MustUseDecorated
266
clean, non_source = is_clean(cur_branch)
268
print """Error: This tree has uncommitted changes or unknown (?) files.
269
Use "bzr status" to list them."""
271
non_source.extend(exclusions)
274
if not history_subset(push_location, cur_branch):
275
raise bzrlib.errors.BzrCommandError("Local branch is not a"
276
" newer version of remote"
279
if not empty_or_absent(push_location):
280
raise bzrlib.errors.BzrCommandError("Remote location is not a"
281
" bzr branch (or empty"
283
except RsyncStreamIO:
284
raise bzrlib.errors.BzrCommandError("Rsync could not use the"
285
" specified location. Please ensure that"
286
' "%s" is of the form "machine:/path".' % push_location)
287
print "Pushing to %s" % push_location
288
rsync(cur_branch.base+'/', push_location, ssh=True, excludes=non_source)
290
set_push_data(cur_branch, push_location)
added
removed
bzrtools.py
