1
# Copyright (C) 2005 Aaron Bentley
2
# <aaron.bentley@utoronto.ca>
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
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
>>> br.working_tree().add(["foo"])
49
>>> br.working_tree().commit("added file")
54
from bzrlib.diff import compare_trees
55
old_tree = cur_branch.basis_tree()
56
new_tree = cur_branch.working_tree()
58
for path, file_class, kind, file_id, entry in new_tree.list_files():
59
if file_class in ('?', 'I'):
60
non_source.append(path)
61
delta = compare_trees(old_tree, new_tree, want_unchanged=False)
62
return not delta.has_changed(), non_source
64
def set_pull_data(br, location, rev_id):
65
pull_file = file (br.controlfilename("x-pull-data"), "wb")
66
pull_file.write("%s\n%s\n" % (location, rev_id))
68
def get_pull_data(br):
70
>>> br = temp_branch()
73
>>> set_pull_data(br, 'http://somewhere', '888-777')
75
('http://somewhere', '888-777')
78
filename = br.controlfilename("x-pull-data")
79
if not os.path.exists(filename):
81
pull_file = file (filename, "rb")
82
location, rev_id = [f.rstrip('\n') for f in pull_file]
83
return location, rev_id
85
def set_push_data(br, location):
86
push_file = file (br.controlfilename("x-push-data"), "wb")
87
push_file.write("%s\n" % location)
89
def get_push_data(br):
91
>>> br = temp_branch()
92
>>> get_push_data(br) is None
94
>>> set_push_data(br, 'http://somewhere')
99
filename = br.controlfilename("x-push-data")
100
if not os.path.exists(filename):
102
push_file = file (filename, "rb")
103
(location,) = [f.rstrip('\n') for f in push_file]
107
>>> shell_escape('hello')
110
def shell_escape(arg):
111
return "".join(['\\'+c for c in arg])
113
def safe_system(args):
115
>>> real_system = os.system
116
>>> os.system = sys.stdout.write
117
>>> safe_system(['a', 'b', 'cd'])
119
>>> os.system = real_system
121
arg_str = " ".join([shell_escape(a) for a in args])
122
return os.system(arg_str)
124
class RsyncUnknownStatus(Exception):
125
def __init__(self, status):
126
Exception.__init__(self, "Unknown status: %d" % status)
128
class NoRsync(Exception):
129
def __init__(self, rsync_name):
130
Exception.__init__(self, "%s not found." % rsync_name)
132
def rsync(source, target, ssh=False, excludes=(), silent=False,
135
>>> rsync("a", "b", silent=True)
136
Traceback (most recent call last):
137
RsyncNoFile: No such file a
138
>>> rsync("a", "b", excludes=("*.py",), silent=True)
139
Traceback (most recent call last):
140
RsyncNoFile: No such file a
141
>>> rsync("a", "b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
142
Traceback (most recent call last):
143
NoRsync: rsyncc not found.
145
cmd = [rsync_name, "-av", "--delete"]
147
cmd.extend(('-e', 'ssh'))
148
if len(excludes) > 0:
149
cmd.extend(('--exclude-from', '-'))
150
cmd.extend((source, target))
158
proc = Popen(cmd, stdin=PIPE, stderr=stderr, stdout=stdout)
160
if e.errno == errno.ENOENT:
161
raise NoRsync(rsync_name)
163
proc.stdin.write('\n'.join(excludes)+'\n')
171
if proc.returncode == 12:
172
raise RsyncStreamIO()
173
elif proc.returncode == 23:
174
raise RsyncNoFile(source)
175
elif proc.returncode != 0:
176
raise RsyncUnknownStatus(proc.returncode)
180
def rsync_ls(source, ssh=False, silent=True):
183
cmd.extend(('-e', 'ssh'))
189
proc = Popen(cmd, stderr=stderr, stdout=PIPE)
190
result = proc.stdout.read()
196
if proc.returncode == 12:
197
raise RsyncStreamIO()
198
elif proc.returncode == 23:
199
raise RsyncNoFile(source)
200
elif proc.returncode != 0:
201
raise RsyncUnknownStatus(proc.returncode)
202
return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
204
exclusions = ('.bzr/x-push-data', '.bzr/parent', '.bzr/x-pull-data',
205
'.bzr/x-pull', '.bzr/pull', '.bzr/stat-cache',
209
def read_revision_history(fname):
210
return [l.rstrip('\r\n') for l in
211
codecs.open(fname, 'rb', 'utf-8').readlines()]
213
class RsyncNoFile(Exception):
214
def __init__(self, path):
215
Exception.__init__(self, "No such file %s" % path)
217
class RsyncStreamIO(Exception):
219
Exception.__init__(self, "Error in rsync protocol data stream.")
221
def get_revision_history(location):
222
tempdir = tempfile.mkdtemp('push')
224
history_fname = os.path.join(tempdir, 'revision-history')
225
cmd = rsync(location+'.bzr/revision-history', history_fname,
227
history = read_revision_history(history_fname)
229
shutil.rmtree(tempdir)
232
def history_subset(location, branch):
233
remote_history = get_revision_history(location)
234
local_history = branch.revision_history()
235
if len(remote_history) > len(local_history):
237
for local, remote in zip(remote_history, local_history):
242
def empty_or_absent(location):
244
files = rsync_ls(location)
245
return files == ['.']
249
def push(cur_branch, location=None, overwrite=False):
250
push_location = get_push_data(cur_branch)
251
if location is not None:
252
if not location.endswith('/'):
254
push_location = location
256
if push_location is None:
257
raise bzrlib.errors.MustUseDecorated
259
if push_location.find('://') != -1:
260
raise bzrlib.errors.MustUseDecorated
262
if push_location.find(':') == -1:
263
raise bzrlib.errors.MustUseDecorated
265
clean, non_source = is_clean(cur_branch)
267
print """Error: This tree has uncommitted changes or unknown (?) files.
268
Use "bzr status" to list them."""
270
non_source.extend(exclusions)
273
if not history_subset(push_location, cur_branch):
274
raise bzrlib.errors.BzrCommandError("Local branch is not a"
275
" newer version of remote"
278
if not empty_or_absent(push_location):
279
raise bzrlib.errors.BzrCommandError("Remote location is not a"
280
" bzr branch (or empty"
282
except RsyncStreamIO:
283
raise bzrlib.errors.BzrCommandError("Rsync could not use the"
284
" specified location. Please ensure that"
285
' "%s" is of the form "machine:/path".' % push_location)
286
print "Pushing to %s" % push_location
287
rsync(cur_branch.base+'/', push_location, ssh=True, excludes=non_source)
289
set_push_data(cur_branch, push_location)
293
result = doctest.testmod()
296
print "All tests passed"
298
print "No tests to run"
299
if __name__ == "__main__":
added
removed
bzrtools.py
