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
30
dirname = tempfile.mkdtemp("temp-branch")
31
return bzrlib.branch.Branch.initialize(dirname)
34
shutil.rmtree(br.base)
36
def is_clean(cur_branch):
38
Return true if no files are modifed or unknown
40
>>> br = temp_branch()
43
>>> fooname = os.path.join(br.base, "foo")
44
>>> file(fooname, "wb").write("bar")
47
>>> bzrlib.add.smart_add_tree(br.working_tree(), [br.base])
51
>>> br.working_tree().commit("added file")
56
from bzrlib.diff import compare_trees
57
old_tree = cur_branch.basis_tree()
58
new_tree = cur_branch.working_tree()
60
for path, file_class, kind, file_id, entry in new_tree.list_files():
61
if file_class in ('?', 'I'):
62
non_source.append(path)
63
delta = compare_trees(old_tree, new_tree, want_unchanged=False)
64
return not delta.has_changed(), non_source
66
def set_push_data(br, location):
67
push_file = file (br.control_files.controlfilename("x-push-data"), "wb")
68
push_file.write("%s\n" % location)
70
def get_push_data(br):
72
>>> br = temp_branch()
73
>>> get_push_data(br) is None
75
>>> set_push_data(br, 'http://somewhere')
80
filename = br.control_files.controlfilename("x-push-data")
81
if not os.path.exists(filename):
83
push_file = file (filename, "rb")
84
(location,) = [f.rstrip('\n') for f in push_file]
88
>>> shell_escape('hello')
91
def shell_escape(arg):
92
return "".join(['\\'+c for c in arg])
94
def safe_system(args):
96
>>> real_system = os.system
97
>>> os.system = sys.stdout.write
98
>>> safe_system(['a', 'b', 'cd'])
100
>>> os.system = real_system
102
arg_str = " ".join([shell_escape(a) for a in args])
103
return os.system(arg_str)
105
class RsyncUnknownStatus(Exception):
106
def __init__(self, status):
107
Exception.__init__(self, "Unknown status: %d" % status)
109
class NoRsync(Exception):
110
def __init__(self, rsync_name):
111
Exception.__init__(self, "%s not found." % rsync_name)
113
def rsync(source, target, ssh=False, excludes=(), silent=False,
116
>>> rsync("a", "b", silent=True)
117
Traceback (most recent call last):
118
RsyncNoFile: No such file a
119
>>> rsync("a", "b", excludes=("*.py",), silent=True)
120
Traceback (most recent call last):
121
RsyncNoFile: No such file a
122
>>> rsync("a", "b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
123
Traceback (most recent call last):
124
NoRsync: rsyncc not found.
126
cmd = [rsync_name, "-av", "--delete"]
128
cmd.extend(('-e', 'ssh'))
129
if len(excludes) > 0:
130
cmd.extend(('--exclude-from', '-'))
131
cmd.extend((source, target))
139
proc = Popen(cmd, stdin=PIPE, stderr=stderr, stdout=stdout)
141
if e.errno == errno.ENOENT:
142
raise NoRsync(rsync_name)
144
proc.stdin.write('\n'.join(excludes)+'\n')
152
if proc.returncode == 12:
153
raise RsyncStreamIO()
154
elif proc.returncode == 23:
155
raise RsyncNoFile(source)
156
elif proc.returncode != 0:
157
raise RsyncUnknownStatus(proc.returncode)
161
def rsync_ls(source, ssh=False, silent=True):
164
cmd.extend(('-e', 'ssh'))
170
proc = Popen(cmd, stderr=stderr, stdout=PIPE)
171
result = proc.stdout.read()
177
if proc.returncode == 12:
178
raise RsyncStreamIO()
179
elif proc.returncode == 23:
180
raise RsyncNoFile(source)
181
elif proc.returncode != 0:
182
raise RsyncUnknownStatus(proc.returncode)
183
return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
185
exclusions = ('.bzr/x-push-data', '.bzr/parent', '.bzr/x-pull-data',
186
'.bzr/x-pull', '.bzr/pull', '.bzr/stat-cache',
190
def read_revision_history(fname):
191
return [l.rstrip('\r\n') for l in
192
codecs.open(fname, 'rb', 'utf-8').readlines()]
194
class RsyncNoFile(Exception):
195
def __init__(self, path):
196
Exception.__init__(self, "No such file %s" % path)
198
class RsyncStreamIO(Exception):
200
Exception.__init__(self, "Error in rsync protocol data stream.")
202
def get_revision_history(location):
203
tempdir = tempfile.mkdtemp('push')
205
history_fname = os.path.join(tempdir, 'revision-history')
206
cmd = rsync(location+'.bzr/revision-history', history_fname,
208
history = read_revision_history(history_fname)
210
shutil.rmtree(tempdir)
213
def history_subset(location, branch):
214
remote_history = get_revision_history(location)
215
local_history = branch.revision_history()
216
if len(remote_history) > len(local_history):
218
for local, remote in zip(remote_history, local_history):
223
def empty_or_absent(location):
225
files = rsync_ls(location)
226
return files == ['.']
230
def push(cur_branch, location=None, overwrite=False, working_tree=True):
231
push_location = get_push_data(cur_branch)
232
if location is not None:
233
if not location.endswith('/'):
235
push_location = location
237
if push_location is None:
238
raise bzrlib.errors.MustUseDecorated
240
if push_location.find('://') != -1:
241
raise bzrlib.errors.MustUseDecorated
243
if push_location.find(':') == -1:
244
raise bzrlib.errors.MustUseDecorated
246
clean, non_source = is_clean(cur_branch)
248
print """Error: This tree has uncommitted changes or unknown (?) files.
249
Use "bzr status" to list them."""
252
final_exclusions = non_source[:]
254
wt = cur_branch.working_tree()
255
final_exclusions = []
256
for path, status, kind, file_id, entry in wt.list_files():
257
final_exclusions.append(path)
259
final_exclusions.extend(exclusions)
262
if not history_subset(push_location, cur_branch):
263
raise bzrlib.errors.BzrCommandError("Local branch is not a"
264
" newer version of remote"
267
if not empty_or_absent(push_location):
268
raise bzrlib.errors.BzrCommandError("Remote location is not a"
269
" bzr branch (or empty"
271
except RsyncStreamIO:
272
raise bzrlib.errors.BzrCommandError("Rsync could not use the"
273
" specified location. Please ensure that"
274
' "%s" is of the form "machine:/path".' % push_location)
275
print "Pushing to %s" % push_location
276
rsync(cur_branch.base+'/', push_location, ssh=True,
277
excludes=final_exclusions)
279
set_push_data(cur_branch, push_location)
281
def short_committer(committer):
282
new_committer = re.sub('<.*>', '', committer).strip(' ')
283
if len(new_committer) < 2:
290
result = doctest.testmod()
293
print "All tests passed"
295
print "No tests to run"
296
if __name__ == "__main__":
added
removed
bzrtools.py
