1
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron@aaronbentley.com>
2
# Copyright (C) 2007 John Arbash Meinel
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23
from subprocess import Popen, PIPE
27
from bzrlib import revision as _mod_revision, trace, urlutils
28
from bzrlib.errors import (
34
from bzrlib.bzrdir import BzrDir
35
from bzrlib.transport import get_transport
38
9
dirname = tempfile.mkdtemp("temp-branch")
39
return BzrDir.create_standalone_workingtree(dirname)
42
shutil.rmtree(tree.basedir)
44
def is_clean(cur_tree):
10
return bzrlib.Branch(dirname, init=True)
13
shutil.rmtree(br.base)
15
def is_clean(cur_branch):
46
17
Return true if no files are modifed or unknown
48
old_tree = cur_tree.basis_tree()
53
for path, file_class, kind, file_id, entry in new_tree.list_files():
54
if file_class in ('?', 'I'):
55
non_source.append(path)
56
delta = new_tree.changes_from(old_tree, want_unchanged=False)
59
return not delta.has_changed(), non_source
61
def set_push_data(tree, location):
62
tree.branch._transport.put_bytes("x-push-data", "%s\n" % location)
64
def get_push_data(tree):
66
>>> tree = temp_tree()
67
>>> get_push_data(tree) is None
69
>>> set_push_data(tree, 'http://somewhere')
70
>>> get_push_data(tree)
75
location = tree.branch._transport.get('x-push-data').read()
18
>>> br = temp_branch()
21
>>> fooname = os.path.join(br.base, "foo")
22
>>> file(fooname, "wb").write("bar")
25
>>> bzrlib.add.smart_add([fooname])
28
>>> br.commit("added file")
33
old_tree = cur_branch.basis_tree()
34
new_tree = cur_branch.working_tree()
35
for path, file_class, kind, file_id in new_tree.list_files():
38
delta = bzrlib.compare_trees(old_tree, new_tree, want_unchanged=False)
39
if len(delta.added) > 0 or len(delta.removed) > 0 or \
40
len(delta.modified) > 0:
44
def set_pull_data(br, location, rev_id):
45
pull_file = file (br.controlfilename("x-pull-data"), "wb")
46
pull_file.write("%s\n%s\n" % (location, rev_id))
48
def get_pull_data(br):
50
>>> br = temp_branch()
53
>>> set_pull_data(br, 'http://somewhere', '888-777')
55
('http://somewhere', '888-777')
58
filename = br.controlfilename("x-pull-data")
59
if not os.path.exists(filename):
61
pull_file = file (filename, "rb")
62
location, rev_id = [f.rstrip('\n') for f in pull_file]
63
return location, rev_id
65
def set_push_data(br, location):
66
push_file = file (br.controlfilename("x-push-data"), "wb")
67
push_file.write("%s\n" % location)
69
def get_push_data(br):
71
>>> br = temp_branch()
72
>>> get_push_data(br) is None
74
>>> set_push_data(br, 'http://somewhere')
79
filename = br.controlfilename("x-push-data")
80
if not os.path.exists(filename):
78
location = location.decode('utf-8')
79
return location.rstrip('\n')
82
push_file = file (filename, "rb")
83
(location,) = [f.rstrip('\n') for f in push_file]
82
87
>>> shell_escape('hello')
96
101
arg_str = " ".join([shell_escape(a) for a in args])
97
102
return os.system(arg_str)
99
class RsyncUnknownStatus(Exception):
100
def __init__(self, status):
101
Exception.__init__(self, "Unknown status: %d" % status)
103
class NoRsync(Exception):
104
def __init__(self, rsync_name):
105
Exception.__init__(self, "%s not found." % rsync_name)
108
def rsync(source, target, ssh=False, excludes=(), silent=False,
110
cmd = [rsync_name, "-av", "--delete"]
104
def rsync(source, target, ssh=False, exclude_globs=()):
106
>>> real_system = os.system
107
>>> os.system = sys.stdout.write
109
\\r\\s\\y\\n\\c \\-\\a\\v \\-\\-\\d\\e\\l\\e\\t\\e \\a \\b
110
>>> rsync("a", "b", exclude_globs=("*.py",))
111
\\r\\s\\y\\n\\c \\-\\a\\v \\-\\-\\d\\e\\l\\e\\t\\e\
112
\\-\\-\\e\\x\\c\\l\\u\\d\\e \\*\\.\\p\\y \\a \\b
113
>>> os.system = real_system
115
cmd = ["rsync", "-av", "--delete"]
112
117
cmd.extend(('-e', 'ssh'))
113
if len(excludes) > 0:
114
cmd.extend(('--exclude-from', '-'))
118
for exclude in exclude_globs:
119
cmd.extend(('--exclude', exclude))
115
120
cmd.extend((source, target))
123
proc = Popen(cmd, stdin=PIPE, stderr=stderr, stdout=stdout)
125
if e.errno == errno.ENOENT:
126
raise NoRsync(rsync_name)
128
proc.stdin.write('\n'.join(excludes)+'\n')
136
if proc.returncode == 12:
137
raise RsyncStreamIO()
138
elif proc.returncode == 23:
139
raise RsyncNoFile(source)
140
elif proc.returncode != 0:
141
raise RsyncUnknownStatus(proc.returncode)
145
def rsync_ls(source, ssh=False, silent=True):
148
cmd.extend(('-e', 'ssh'))
154
proc = Popen(cmd, stderr=stderr, stdout=PIPE)
155
result = proc.stdout.read()
161
if proc.returncode == 12:
162
raise RsyncStreamIO()
163
elif proc.returncode == 23:
164
raise RsyncNoFile(source)
165
elif proc.returncode != 0:
166
raise RsyncUnknownStatus(proc.returncode)
167
return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
169
exclusions = ('.bzr/x-push-data', '.bzr/branch/x-push/data', '.bzr/parent',
170
'.bzr/branch/parent', '.bzr/x-pull-data', '.bzr/x-pull',
171
'.bzr/pull', '.bzr/stat-cache', '.bzr/x-rsync-data',
172
'.bzr/basis-inventory', '.bzr/inventory.backup.weave')
175
def read_revision_history(fname):
176
return [l.rstrip('\r\n') for l in
177
codecs.open(fname, 'rb', 'utf-8').readlines()]
180
def read_revision_info(path):
181
"""Parse a last_revision file to determine revision_info"""
182
line = open(path, 'rb').readlines()[0].strip('\n')
183
revno, revision_id = line.split(' ', 1)
185
return revno, revision_id
188
class RsyncNoFile(Exception):
189
def __init__(self, path):
190
Exception.__init__(self, "No such file %s" % path)
192
class RsyncStreamIO(Exception):
194
Exception.__init__(self, "Error in rsync protocol data stream.")
197
class NotStandalone(BzrError):
199
_fmt = '%(location)s is not a standalone tree.'
202
def __init__(self, location):
203
BzrError.__init__(self, location=location)
206
def get_revision_history(location, _rsync):
207
tempdir = tempfile.mkdtemp('push')
212
history_fname = os.path.join(tempdir, 'revision-history')
214
cmd = my_rsync(location+'.bzr/revision-history', history_fname,
217
cmd = rsync(location+'.bzr/branch/revision-history', history_fname,
219
history = read_revision_history(history_fname)
221
shutil.rmtree(tempdir)
225
def get_revision_info(location, _rsync):
226
"""Get the revsision_info for an rsync-able branch"""
227
tempdir = tempfile.mkdtemp('push')
232
info_fname = os.path.join(tempdir, 'last-revision')
233
cmd = rsync(location+'.bzr/branch/last-revision', info_fname,
235
return read_revision_info(info_fname)
237
shutil.rmtree(tempdir)
240
def history_subset(location, branch, _rsync=None):
241
local_history = branch.revision_history()
243
remote_history = get_revision_history(location, _rsync)
245
revno, revision_id = get_revision_info(location, _rsync)
246
if revision_id == _mod_revision.NULL_REVISION:
248
return bool(revision_id.decode('utf-8') in local_history)
250
if len(remote_history) > len(local_history):
252
for local, remote in zip(remote_history, local_history):
258
def empty_or_absent(location):
260
files = rsync_ls(location)
261
return files == ['.']
265
def rspush(tree, location=None, overwrite=False, working_tree=True,
272
if (tree.bzrdir.root_transport.base !=
273
tree.branch.bzrdir.root_transport.base):
274
raise NotStandalone(tree.bzrdir.root_transport.base)
275
if (tree.branch.get_bound_location() is not None):
276
raise NotStandalone(tree.bzrdir.root_transport.base)
277
if (tree.branch.repository.is_shared()):
278
raise NotStandalone(tree.bzrdir.root_transport.base)
279
push_location = get_push_data(tree)
280
if location is not None:
281
if not location.endswith('/'):
283
push_location = location
285
if push_location is None:
286
raise BzrCommandError("No rspush location known or specified.")
288
if (push_location.find('::') != -1):
293
if (push_location.find('://') != -1 or
294
push_location.find(':') == -1):
295
raise BzrCommandError("Invalid rsync path %r." % push_location)
298
clean, non_source = is_clean(tree)
300
raise BzrCommandError(
301
'This tree has uncommitted changes or unknown'
302
' (?) files. Use "bzr status" to list them.')
304
final_exclusions = non_source[:]
307
final_exclusions = []
308
for path, status, kind, file_id, entry in wt.list_files():
309
final_exclusions.append(path)
311
final_exclusions.extend(exclusions)
314
if not history_subset(push_location, tree.branch,
316
raise BzrCommandError(
317
"Local branch is not a newer version of remote"
320
if not empty_or_absent(push_location):
321
raise BzrCommandError(
322
"Remote location is not a bzr branch (or empty"
324
except RsyncStreamIO:
325
raise BzrCommandError("Rsync could not use the"
326
" specified location. Please ensure that"
327
' "%s" is of the form "machine:/path".' % push_location)
328
trace.note("Pushing to %s", push_location)
329
my_rsync(tree.basedir+'/', push_location, ssh=usessh,
330
excludes=final_exclusions)
332
set_push_data(tree, push_location)
337
def short_committer(committer):
338
new_committer = re.sub('<.*>', '', committer).strip(' ')
339
if len(new_committer) < 2:
345
"""Screen-scrape Apache listings"""
346
apache_dir = '<img border="0" src="/icons/folder.gif" alt="[dir]">'\
349
t._remote_path = lambda x: t.base
354
expr = re.compile('<a[^>]*href="([^>]*)\/"[^>]*>', flags=re.I)
356
match = expr.search(line)
360
if url.startswith('http://') or url.startswith('/') or '../' in url:
364
yield url.rstrip('/')
367
def list_branches(t):
368
def is_inside(branch):
369
return bool(branch.base.startswith(t.base))
371
if t.base.startswith('http://'):
372
def evaluate(bzrdir):
374
branch = bzrdir.open_branch()
375
if is_inside(branch):
379
except NotBranchError:
381
return [b for b in BzrDir.find_bzrdirs(t, list_current=apache_ls,
382
evaluate=evaluate) if b is not None]
383
elif not t.listable():
384
raise BzrCommandError("Can't list this type of location.")
385
return [b for b in BzrDir.find_branches(t) if is_inside(b)]
388
def evaluate_branch_tree(bzrdir):
390
tree, branch = bzrdir._get_tree_branch()
391
except NotBranchError:
394
return True, (branch, tree)
397
def iter_branch_tree(t, lister=None):
398
return (x for x in BzrDir.find_bzrdirs(t, evaluate=evaluate_branch_tree,
399
list_current=lister) if x is not None)
402
def open_from_url(location):
403
location = urlutils.normalize_url(location)
404
dirname, basename = urlutils.split(location)
405
if location.endswith('/') and not basename.endswith('/'):
407
return get_transport(dirname).get(basename)
123
exclusions = ('x-push-data', 'x-pull-data')
126
def pull(cur_branch, location=None, overwrite=False):
127
pull_location, pull_revision = get_pull_data(cur_branch)
128
if pull_location is not None:
129
if not overwrite and cur_branch.last_patch() != pull_revision:
130
print "Aborting: This branch has had commits, so pull would lose data."
132
if location is not None:
133
pull_location = location
134
if not pull_location.endswith('/'):
137
if pull_location is None:
138
print "No pull location saved. Please specify one on the command line."
141
if not is_clean(cur_branch):
142
print "Error: This tree has uncommitted changes or unknown (?) files."
145
print "Synchronizing with %s" % pull_location
146
rsync (pull_location, cur_branch.base+'/', exclude_globs=exclusions)
148
set_pull_data(cur_branch, pull_location, cur_branch.last_patch())
151
def push(cur_branch, location=None):
152
push_location = get_push_data(cur_branch)
153
if location is not None:
154
if not location.endswith('/'):
156
push_location = location
158
if push_location is None:
159
print "No push location saved. Please specify one on the command line."
162
if not is_clean(cur_branch):
163
print "Error: This tree has uncommitted changes or unknown (?) files."
166
print "Pushing to %s" % push_location
167
rsync(cur_branch.base+'/', push_location, ssh=True,
168
exclude_globs=exclusions)
170
set_push_data(cur_branch, push_location)
added
removed
scriptlib.py
