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
from contextlib import contextmanager
20
from bzrlib import urlutils
21
from bzrlib.errors import (
26
from bzrlib.bzrdir import BzrDir
27
from bzrlib.transport import get_transport
31
def read_locked(lockable):
32
"""Read-lock a tree, branch or repository in this context."""
25
from subprocess import Popen, PIPE
29
dirname = tempfile.mkdtemp("temp-branch")
30
return bzrlib.branch.Branch.initialize(dirname)
33
shutil.rmtree(br.base)
35
def is_clean(cur_branch):
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")
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 = compare_trees(old_tree, new_tree, want_unchanged=False)
63
return not delta.has_changed(), non_source
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
95
>>> set_push_data(br, 'http://somewhere')
100
filename = br.controlfilename("x-push-data")
101
if not os.path.exists(filename):
103
push_file = file (filename, "rb")
104
(location,) = [f.rstrip('\n') for f in push_file]
108
>>> shell_escape('hello')
111
def shell_escape(arg):
112
return "".join(['\\'+c for c in arg])
114
def safe_system(args):
116
>>> real_system = os.system
117
>>> os.system = sys.stdout.write
118
>>> safe_system(['a', 'b', 'cd'])
120
>>> os.system = real_system
122
arg_str = " ".join([shell_escape(a) for a in args])
123
return os.system(arg_str)
125
class RsyncUnknownStatus(Exception):
126
def __init__(self, status):
127
Exception.__init__(self, "Unknown status: %d" % status)
129
class NoRsync(Exception):
130
def __init__(self, rsync_name):
131
Exception.__init__(self, "%s not found." % rsync_name)
133
def rsync(source, target, ssh=False, excludes=(), silent=False,
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.
146
cmd = [rsync_name, "-av", "--delete"]
148
cmd.extend(('-e', 'ssh'))
149
if len(excludes) > 0:
150
cmd.extend(('--exclude-from', '-'))
151
cmd.extend((source, target))
159
proc = Popen(cmd, stdin=PIPE, stderr=stderr, stdout=stdout)
161
if e.errno == errno.ENOENT:
162
raise NoRsync(rsync_name)
164
proc.stdin.write('\n'.join(excludes)+'\n')
172
if proc.returncode == 12:
173
raise RsyncStreamIO()
174
elif proc.returncode == 23:
175
raise RsyncNoFile(source)
176
elif proc.returncode != 0:
177
raise RsyncUnknownStatus(proc.returncode)
181
def rsync_ls(source, ssh=False, silent=True):
184
cmd.extend(('-e', 'ssh'))
190
proc = Popen(cmd, stderr=stderr, stdout=PIPE)
191
result = proc.stdout.read()
197
if proc.returncode == 12:
198
raise RsyncStreamIO()
199
elif proc.returncode == 23:
200
raise RsyncNoFile(source)
201
elif proc.returncode != 0:
202
raise RsyncUnknownStatus(proc.returncode)
203
return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
205
exclusions = ('.bzr/x-push-data', '.bzr/parent', '.bzr/x-pull-data',
206
'.bzr/x-pull', '.bzr/pull', '.bzr/stat-cache',
210
def read_revision_history(fname):
211
return [l.rstrip('\r\n') for l in
212
codecs.open(fname, 'rb', 'utf-8').readlines()]
214
class RsyncNoFile(Exception):
215
def __init__(self, path):
216
Exception.__init__(self, "No such file %s" % path)
218
class RsyncStreamIO(Exception):
220
Exception.__init__(self, "Error in rsync protocol data stream.")
222
def get_revision_history(location):
223
tempdir = tempfile.mkdtemp('push')
225
history_fname = os.path.join(tempdir, 'revision-history')
226
cmd = rsync(location+'.bzr/revision-history', history_fname,
228
history = read_revision_history(history_fname)
40
def short_committer(committer):
41
new_committer = re.sub('<.*>', '', committer).strip(' ')
42
if len(new_committer) < 2:
48
"""Screen-scrape Apache listings"""
49
apache_dir = '<img border="0" src="/icons/folder.gif" alt="[dir]">'\
52
t._remote_path = lambda x: t.base
57
expr = re.compile('<a[^>]*href="([^>]*)\/"[^>]*>', flags=re.I)
59
match = expr.search(line)
63
if url.startswith('http://') or url.startswith('/') or '../' in url:
71
def is_inside(branch):
72
return bool(branch.base.startswith(t.base))
74
if t.base.startswith('http://'):
77
branch = bzrdir.open_branch()
82
except NotBranchError:
84
return [b for b in BzrDir.find_bzrdirs(t, list_current=apache_ls,
85
evaluate=evaluate) if b is not None]
86
elif not t.listable():
87
raise BzrCommandError("Can't list this type of location.")
88
return [b for b in BzrDir.find_branches(t) if is_inside(b)]
91
def evaluate_branch_tree(bzrdir):
93
tree, branch = bzrdir._get_tree_branch()
94
except NotBranchError:
97
return True, (branch, tree)
100
def iter_branch_tree(t, lister=None):
101
return (x for x in BzrDir.find_bzrdirs(t, evaluate=evaluate_branch_tree,
102
list_current=lister) if x is not None)
105
def open_from_url(location):
106
location = urlutils.normalize_url(location)
107
dirname, basename = urlutils.split(location)
108
if location.endswith('/') and not basename.endswith('/'):
110
return get_transport(dirname).get(basename)
230
shutil.rmtree(tempdir)
233
def history_subset(location, branch):
234
remote_history = get_revision_history(location)
235
local_history = branch.revision_history()
236
if len(remote_history) > len(local_history):
238
for local, remote in zip(remote_history, local_history):
243
def empty_or_absent(location):
245
files = rsync_ls(location)
246
return files == ['.']
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
