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
28
from bzrlib.errors import (BzrCommandError, NotBranchError, NoSuchFile,
29
UnsupportedFormatError, TransportError,
30
NoWorkingTree, PermissionDenied)
31
from bzrlib.bzrdir import BzrDir, BzrDirFormat
34
29
dirname = tempfile.mkdtemp("temp-branch")
35
return BzrDir.create_standalone_workingtree(dirname)
38
shutil.rmtree(tree.basedir)
40
def is_clean(cur_tree):
30
return bzrlib.branch.Branch.initialize(dirname)
33
shutil.rmtree(br.base)
35
def is_clean(cur_branch):
42
37
Return true if no files are modifed or unknown
43
38
>>> import bzrlib.add
44
>>> tree = temp_tree()
39
>>> br = temp_branch()
47
>>> fooname = os.path.join(tree.basedir, "foo")
42
>>> fooname = os.path.join(br.base, "foo")
48
43
>>> file(fooname, "wb").write("bar")
51
>>> bzrlib.add.smart_add_tree(tree, [tree.basedir])
46
>>> bzrlib.add.smart_add_branch(br, [br.base])
55
>>> tree.commit("added file", rev_id='commit-id')
50
>>> br.commit("added file")
61
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()
64
59
for path, file_class, kind, file_id, entry in new_tree.list_files():
65
60
if file_class in ('?', 'I'):
66
61
non_source.append(path)
67
delta = new_tree.changes_from(old_tree, want_unchanged=False)
62
delta = compare_trees(old_tree, new_tree, want_unchanged=False)
68
63
return not delta.has_changed(), non_source
70
def set_push_data(tree, location):
71
tree.branch.control_files.put_utf8("x-push-data", "%s\n" % location)
73
def get_push_data(tree):
75
>>> tree = temp_tree()
76
>>> 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
78
>>> set_push_data(tree, 'http://somewhere')
79
>>> get_push_data(tree)
95
>>> set_push_data(br, 'http://somewhere')
84
location = tree.branch.control_files.get_utf8('x-push-data').read()
100
filename = br.controlfilename("x-push-data")
101
if not os.path.exists(filename):
87
return location.rstrip('\n')
103
push_file = file (filename, "rb")
104
(location,) = [f.rstrip('\n') for f in push_file]
90
108
>>> shell_escape('hello')
115
133
def rsync(source, target, ssh=False, excludes=(), silent=False,
116
134
rsync_name="rsync"):
118
>>> new_dir = tempfile.mkdtemp()
119
>>> old_dir = os.getcwd()
120
>>> os.chdir(new_dir)
121
136
>>> rsync("a", "b", silent=True)
122
137
Traceback (most recent call last):
123
RsyncNoFile: No such file...
124
>>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True)
138
RsyncNoFile: No such file a
139
>>> rsync("a", "b", excludes=("*.py",), silent=True)
125
140
Traceback (most recent call last):
126
RsyncNoFile: No such file...
127
>>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
141
RsyncNoFile: No such file a
142
>>> rsync("a", "b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
128
143
Traceback (most recent call last):
129
144
NoRsync: rsyncc not found.
130
>>> os.chdir(old_dir)
131
>>> os.rmdir(new_dir)
133
146
cmd = [rsync_name, "-av", "--delete"]
189
202
raise RsyncUnknownStatus(proc.returncode)
190
203
return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
192
exclusions = ('.bzr/x-push-data', '.bzr/branch/x-push/data', '.bzr/parent',
193
'.bzr/branch/parent', '.bzr/x-pull-data', '.bzr/x-pull',
194
'.bzr/pull', '.bzr/stat-cache', '.bzr/x-rsync-data',
195
'.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',
198
210
def read_revision_history(fname):
239
247
except RsyncNoFile:
242
def rspush(tree, location=None, overwrite=False, working_tree=True):
243
push_location = get_push_data(tree)
250
def push(cur_branch, location=None, overwrite=False):
251
push_location = get_push_data(cur_branch)
244
252
if location is not None:
245
253
if not location.endswith('/'):
247
255
push_location = location
249
257
if push_location is None:
250
raise BzrCommandError("No rspush location known or specified.")
252
if (push_location.find('::') != -1):
257
if (push_location.find('://') != -1 or
258
push_location.find(':') == -1):
259
raise BzrCommandError("Invalid rsync path %r." % push_location)
262
clean, non_source = is_clean(tree)
264
print """Error: This tree has uncommitted changes or unknown (?) files.
265
Use "bzr status" to list them."""
267
final_exclusions = non_source[:]
270
final_exclusions = []
271
for path, status, kind, file_id, entry in wt.list_files():
272
final_exclusions.append(path)
274
final_exclusions.extend(exclusions)
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)
275
272
if not overwrite:
277
if not history_subset(push_location, tree.branch):
274
if not history_subset(push_location, cur_branch):
278
275
raise bzrlib.errors.BzrCommandError("Local branch is not a"
279
276
" newer version of remote"
288
285
" specified location. Please ensure that"
289
286
' "%s" is of the form "machine:/path".' % push_location)
290
287
print "Pushing to %s" % push_location
291
rsync(tree.basedir+'/', push_location, ssh=usessh,
292
excludes=final_exclusions)
294
set_push_data(tree, push_location)
297
def short_committer(committer):
298
new_committer = re.sub('<.*>', '', committer).strip(' ')
299
if len(new_committer) < 2:
305
"""Screen-scrape Apache listings"""
306
apache_dir = '<img border="0" src="/icons/folder.gif" alt="[dir]">'\
309
expr = re.compile('<a[^>]*href="([^>]*)"[^>]*>', flags=re.I)
311
match = expr.search(line)
315
if url.startswith('http://') or url.startswith('/') or '../' in url:
319
yield url.rstrip('/')
322
def iter_branches(t, lister=None):
323
"""Iterate through all the branches under a transport"""
324
for bzrdir in iter_bzrdirs(t, lister):
326
branch = bzrdir.open_branch()
327
if branch.bzrdir is bzrdir:
329
except (NotBranchError, UnsupportedFormatError):
333
def iter_branch_tree(t, lister=None):
334
for bzrdir in iter_bzrdirs(t, lister):
336
wt = bzrdir.open_workingtree()
338
except NoWorkingTree, UnsupportedFormatError:
340
branch = bzrdir.open_branch()
341
if branch.bzrdir is bzrdir:
343
except (NotBranchError, UnsupportedFormatError):
347
def iter_bzrdirs(t, lister=None):
350
return t.list_dir('.')
352
bzrdir = bzrdir_from_transport(t)
354
except (NotBranchError, UnsupportedFormatError, TransportError,
358
for directory in lister(t):
359
if directory == ".bzr":
362
subt = t.clone(directory)
363
except UnicodeDecodeError:
365
for bzrdir in iter_bzrdirs(subt, lister):
367
except (NoSuchFile, PermissionDenied, TransportError):
371
def bzrdir_from_transport(t):
372
"""Open a bzrdir from a transport (not a location)"""
373
format = BzrDirFormat.find_format(t)
374
BzrDir._check_supported(format, False)
375
return format.open(t)
288
rsync(cur_branch.base+'/', push_location, ssh=True, excludes=non_source)
290
set_push_data(cur_branch, push_location)
added
removed
bzrtools.py
