← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to bzrtools.py

  • Committer: Aaron Bentley
  • Date: 2008-01-23 23:09:27 UTC
  • Revision ID: aaron@aaronbentley.com-20080123230927-7wtn8mvyyuhs5gq3
Remove unneeded imports from dotgraph

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrtools.py
1
 
# Copyright (C) 2005 Aaron Bentley
2
 
# <aaron.bentley@utoronto.ca>
 
1
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron.bentley@utoronto.ca>
 
2
# Copyright (C) 2007 John Arbash Meinel
3
3
#
4
4
#    This program is free software; you can redistribute it and/or modify
5
5
#    it under the terms of the GNU General Public License as published by
24
24
import sys
25
25
 
26
26
import bzrlib
 
27
from bzrlib import revision as _mod_revision, trace, urlutils
27
28
import bzrlib.errors
28
 
from bzrlib.errors import (BzrCommandError, NotBranchError, NoSuchFile,
29
 
                           UnsupportedFormatError, TransportError, 
30
 
                           NoWorkingTree, PermissionDenied)
 
29
from bzrlib.errors import (
 
30
    BzrCommandError,
 
31
    BzrError,
 
32
    ConnectionError,
 
33
    NotBranchError,
 
34
    NoSuchFile,
 
35
    NoWorkingTree,
 
36
    PermissionDenied,
 
37
    UnsupportedFormatError,
 
38
    TransportError,
 
39
    )
31
40
from bzrlib.bzrdir import BzrDir, BzrDirFormat
 
41
from bzrlib.transport import get_transport
32
42
 
33
43
def temp_tree():
34
44
    dirname = tempfile.mkdtemp("temp-branch")
40
50
def is_clean(cur_tree):
41
51
    """
42
52
    Return true if no files are modifed or unknown
43
 
    >>> import bzrlib.add
44
 
    >>> tree = temp_tree()
45
 
    >>> is_clean(tree)
46
 
    (True, [])
47
 
    >>> fooname = os.path.join(tree.basedir, "foo")
48
 
    >>> file(fooname, "wb").write("bar")
49
 
    >>> is_clean(tree)
50
 
    (True, [u'foo'])
51
 
    >>> bzrlib.add.smart_add_tree(tree, [tree.basedir])
52
 
    ([u'foo'], {})
53
 
    >>> is_clean(tree)
54
 
    (False, [])
55
 
    >>> tree.commit("added file")
56
 
    >>> is_clean(tree)
57
 
    (True, [])
58
 
    >>> rm_tree(tree)
59
53
    """
60
 
    from bzrlib.diff import compare_trees
61
54
    old_tree = cur_tree.basis_tree()
62
55
    new_tree = cur_tree
63
56
    non_source = []
64
 
    for path, file_class, kind, file_id, entry in new_tree.list_files():
65
 
        if file_class in ('?', 'I'):
66
 
            non_source.append(path)
67
 
    delta = compare_trees(old_tree, new_tree, want_unchanged=False)
 
57
    new_tree.lock_read()
 
58
    try:
 
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 = new_tree.changes_from(old_tree, want_unchanged=False)
 
63
    finally:
 
64
        new_tree.unlock()
68
65
    return not delta.has_changed(), non_source
69
66
 
70
67
def set_push_data(tree, location):
71
 
    push_file = file (tree.branch.control_files.controlfilename("x-push-data"), "wb")
72
 
    push_file.write("%s\n" % location)
 
68
    tree.branch.control_files.put_utf8("x-push-data", "%s\n" % location)
73
69
 
74
70
def get_push_data(tree):
75
71
    """
78
74
    True
79
75
    >>> set_push_data(tree, 'http://somewhere')
80
76
    >>> get_push_data(tree)
81
 
    'http://somewhere'
 
77
    u'http://somewhere'
82
78
    >>> rm_tree(tree)
83
79
    """
84
 
    filename = tree.branch.control_files.controlfilename("x-push-data")
85
 
    if not os.path.exists(filename):
 
80
    try:
 
81
        location = tree.branch.control_files.get_utf8('x-push-data').read()
 
82
    except NoSuchFile:
86
83
        return None
87
 
    push_file = file (filename, "rb")
88
 
    (location,) = [f.rstrip('\n') for f in push_file]
89
 
    return location
 
84
    return location.rstrip('\n')
90
85
 
91
86
"""
92
87
>>> shell_escape('hello')
114
109
    def __init__(self, rsync_name):
115
110
        Exception.__init__(self, "%s not found." % rsync_name)
116
111
 
117
 
def rsync(source, target, ssh=False, excludes=(), silent=False, 
 
112
 
 
113
def rsync(source, target, ssh=False, excludes=(), silent=False,
118
114
          rsync_name="rsync"):
119
 
    """
120
 
    >>> new_dir = tempfile.mkdtemp()
121
 
    >>> old_dir = os.getcwd()
122
 
    >>> os.chdir(new_dir)
123
 
    >>> rsync("a", "b", silent=True)
124
 
    Traceback (most recent call last):
125
 
    RsyncNoFile: No such file...
126
 
    >>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True)
127
 
    Traceback (most recent call last):
128
 
    RsyncNoFile: No such file...
129
 
    >>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
130
 
    Traceback (most recent call last):
131
 
    NoRsync: rsyncc not found.
132
 
    >>> os.chdir(old_dir)
133
 
    >>> os.rmdir(new_dir)
134
 
    """
135
115
    cmd = [rsync_name, "-av", "--delete"]
136
116
    if ssh:
137
117
        cmd.extend(('-e', 'ssh'))
149
129
    except OSError, e:
150
130
        if e.errno == errno.ENOENT:
151
131
            raise NoRsync(rsync_name)
152
 
            
 
132
 
153
133
    proc.stdin.write('\n'.join(excludes)+'\n')
154
134
    proc.stdin.close()
155
135
    if silent:
191
171
        raise RsyncUnknownStatus(proc.returncode)
192
172
    return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
193
173
 
194
 
exclusions = ('.bzr/x-push-data', '.bzr/branch/x-push/data', '.bzr/parent', 
 
174
exclusions = ('.bzr/x-push-data', '.bzr/branch/x-push/data', '.bzr/parent',
195
175
              '.bzr/branch/parent', '.bzr/x-pull-data', '.bzr/x-pull',
196
176
              '.bzr/pull', '.bzr/stat-cache', '.bzr/x-rsync-data',
197
177
              '.bzr/basis-inventory', '.bzr/inventory.backup.weave')
201
181
    return [l.rstrip('\r\n') for l in
202
182
            codecs.open(fname, 'rb', 'utf-8').readlines()]
203
183
 
 
184
 
 
185
def read_revision_info(path):
 
186
    """Parse a last_revision file to determine revision_info"""
 
187
    line = open(path, 'rb').readlines()[0].strip('\n')
 
188
    revno, revision_id = line.split(' ', 1)
 
189
    revno = int(revno)
 
190
    return revno, revision_id
 
191
 
 
192
 
204
193
class RsyncNoFile(Exception):
205
194
    def __init__(self, path):
206
195
        Exception.__init__(self, "No such file %s" % path)
209
198
    def __init__(self):
210
199
        Exception.__init__(self, "Error in rsync protocol data stream.")
211
200
 
212
 
def get_revision_history(location):
 
201
 
 
202
class NotStandalone(BzrError):
 
203
 
 
204
    _format = '%(location) is not a standalone tree.'
 
205
    _internal = False
 
206
 
 
207
    def __init__(self, location):
 
208
        BzrError.__init__(self, location=location)
 
209
 
 
210
 
 
211
def get_revision_history(location, _rsync):
213
212
    tempdir = tempfile.mkdtemp('push')
 
213
    my_rsync = _rsync
 
214
    if my_rsync is None:
 
215
        my_rsync = rsync
214
216
    try:
215
217
        history_fname = os.path.join(tempdir, 'revision-history')
216
218
        try:
217
 
            cmd = rsync(location+'.bzr/revision-history', history_fname,
 
219
            cmd = my_rsync(location+'.bzr/revision-history', history_fname,
218
220
                        silent=True)
219
221
        except RsyncNoFile:
220
222
            cmd = rsync(location+'.bzr/branch/revision-history', history_fname,
224
226
        shutil.rmtree(tempdir)
225
227
    return history
226
228
 
227
 
def history_subset(location, branch):
228
 
    remote_history = get_revision_history(location)
 
229
 
 
230
def get_revision_info(location, _rsync):
 
231
    """Get the revsision_info for an rsync-able branch"""
 
232
    tempdir = tempfile.mkdtemp('push')
 
233
    my_rsync = _rsync
 
234
    if my_rsync is None:
 
235
        my_rsync = rsync
 
236
    try:
 
237
        info_fname = os.path.join(tempdir, 'last-revision')
 
238
        cmd = rsync(location+'.bzr/branch/last-revision', info_fname,
 
239
                    silent=True)
 
240
        return read_revision_info(info_fname)
 
241
    finally:
 
242
        shutil.rmtree(tempdir)
 
243
 
 
244
 
 
245
def history_subset(location, branch, _rsync=None):
229
246
    local_history = branch.revision_history()
230
 
    if len(remote_history) > len(local_history):
231
 
        return False
232
 
    for local, remote in zip(remote_history, local_history):
233
 
        if local != remote:
234
 
            return False 
235
 
    return True
 
247
    try:
 
248
        remote_history = get_revision_history(location, _rsync)
 
249
    except RsyncNoFile:
 
250
        revno, revision_id = get_revision_info(location, _rsync)
 
251
        if revision_id == _mod_revision.NULL_REVISION:
 
252
            return True
 
253
        return bool(revision_id.decode('utf-8') in local_history)
 
254
    else:
 
255
        if len(remote_history) > len(local_history):
 
256
            return False
 
257
        for local, remote in zip(remote_history, local_history):
 
258
            if local != remote:
 
259
                return False
 
260
        return True
 
261
 
236
262
 
237
263
def empty_or_absent(location):
238
264
    try:
241
267
    except RsyncNoFile:
242
268
        return True
243
269
 
244
 
def rspush(tree, location=None, overwrite=False, working_tree=True):
245
 
    push_location = get_push_data(tree)
246
 
    if location is not None:
247
 
        if not location.endswith('/'):
248
 
            location += '/'
249
 
        push_location = location
250
 
    
251
 
    if push_location is None:
252
 
        raise BzrCommandError("No rspush location known or specified.")
253
 
 
254
 
    if (push_location.find('://') != -1 or
255
 
        push_location.find(':') == -1):
256
 
        raise BzrCommandError("Invalid rsync path %r." % push_location)
257
 
 
258
 
    if working_tree:
259
 
        clean, non_source = is_clean(tree)
260
 
        if not clean:
261
 
            print """Error: This tree has uncommitted changes or unknown (?) files.
262
 
    Use "bzr status" to list them."""
263
 
            sys.exit(1)
264
 
        final_exclusions = non_source[:]
265
 
    else:
266
 
        wt = tree
267
 
        final_exclusions = []
268
 
        for path, status, kind, file_id, entry in wt.list_files():
269
 
            final_exclusions.append(path)
270
 
 
271
 
    final_exclusions.extend(exclusions)
272
 
    if not overwrite:
273
 
        try:
274
 
            if not history_subset(push_location, tree.branch):
275
 
                raise bzrlib.errors.BzrCommandError("Local branch is not a"
276
 
                                                    " newer version of remote"
277
 
                                                    " branch.")
278
 
        except RsyncNoFile:
279
 
            if not empty_or_absent(push_location):
280
 
                raise bzrlib.errors.BzrCommandError("Remote location is not a"
281
 
                                                    " bzr branch (or empty"
282
 
                                                    " directory)")
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(tree.basedir+'/', push_location, ssh=True, 
289
 
          excludes=final_exclusions)
290
 
 
291
 
    set_push_data(tree, push_location)
 
270
def rspush(tree, location=None, overwrite=False, working_tree=True,
 
271
    _rsync=None):
 
272
    tree.lock_write()
 
273
    try:
 
274
        my_rsync = _rsync
 
275
        if my_rsync is None:
 
276
            my_rsync = rsync
 
277
        if (tree.bzrdir.root_transport.base !=
 
278
            tree.branch.bzrdir.root_transport.base):
 
279
            raise NotStandalone(tree.bzrdir.root_transport.base)
 
280
        if (tree.branch.get_bound_location() is not None):
 
281
            raise NotStandalone(tree.bzrdir.root_transport.base)
 
282
        if (tree.branch.repository.is_shared()):
 
283
            raise NotStandalone(tree.bzrdir.root_transport.base)
 
284
        push_location = get_push_data(tree)
 
285
        if location is not None:
 
286
            if not location.endswith('/'):
 
287
                location += '/'
 
288
            push_location = location
 
289
 
 
290
        if push_location is None:
 
291
            raise BzrCommandError("No rspush location known or specified.")
 
292
 
 
293
        if (push_location.find('::') != -1):
 
294
            usessh=False
 
295
        else:
 
296
            usessh=True
 
297
 
 
298
        if (push_location.find('://') != -1 or
 
299
            push_location.find(':') == -1):
 
300
            raise BzrCommandError("Invalid rsync path %r." % push_location)
 
301
 
 
302
        if working_tree:
 
303
            clean, non_source = is_clean(tree)
 
304
            if not clean:
 
305
                raise bzrlib.errors.BzrCommandError(
 
306
                    'This tree has uncommitted changes or unknown'
 
307
                    ' (?) files.  Use "bzr status" to list them.')
 
308
                sys.exit(1)
 
309
            final_exclusions = non_source[:]
 
310
        else:
 
311
            wt = tree
 
312
            final_exclusions = []
 
313
            for path, status, kind, file_id, entry in wt.list_files():
 
314
                final_exclusions.append(path)
 
315
 
 
316
        final_exclusions.extend(exclusions)
 
317
        if not overwrite:
 
318
            try:
 
319
                if not history_subset(push_location, tree.branch,
 
320
                                      _rsync=my_rsync):
 
321
                    raise bzrlib.errors.BzrCommandError(
 
322
                        "Local branch is not a newer version of remote"
 
323
                        " branch.")
 
324
            except RsyncNoFile:
 
325
                if not empty_or_absent(push_location):
 
326
                    raise bzrlib.errors.BzrCommandError(
 
327
                        "Remote location is not a bzr branch (or empty"
 
328
                        " directory)")
 
329
            except RsyncStreamIO:
 
330
                raise bzrlib.errors.BzrCommandError("Rsync could not use the"
 
331
                    " specified location.  Please ensure that"
 
332
                    ' "%s" is of the form "machine:/path".' % push_location)
 
333
        trace.note("Pushing to %s", push_location)
 
334
        my_rsync(tree.basedir+'/', push_location, ssh=usessh,
 
335
                 excludes=final_exclusions)
 
336
 
 
337
        set_push_data(tree, push_location)
 
338
    finally:
 
339
        tree.unlock()
292
340
 
293
341
 
294
342
def short_committer(committer):
302
350
    """Screen-scrape Apache listings"""
303
351
    apache_dir = '<img border="0" src="/icons/folder.gif" alt="[dir]">'\
304
352
        ' <a href="'
305
 
    lines = t.get('.')
306
 
    expr = re.compile('<a[^>]*href="([^>]*)"[^>]*>', flags=re.I)
 
353
    t = t.clone()
 
354
    t._remote_path = lambda x: t.base
 
355
    try:
 
356
        lines = t.get('')
 
357
    except bzrlib.errors.NoSuchFile:
 
358
        return
 
359
    expr = re.compile('<a[^>]*href="([^>]*)\/"[^>]*>', flags=re.I)
307
360
    for line in lines:
308
361
        match = expr.search(line)
309
362
        if match is None:
316
369
        yield url.rstrip('/')
317
370
 
318
371
 
319
 
def iter_branches(t, lister=None):
320
 
    """Iterate through all the branches under a transport"""
321
 
    for bzrdir in iter_bzrdirs(t, lister):
322
 
        try:
323
 
            branch = bzrdir.open_branch()
324
 
            if branch.bzrdir is bzrdir:
325
 
                yield branch
326
 
        except (NotBranchError, UnsupportedFormatError):
327
 
            pass
 
372
def list_branches(t):
 
373
    def is_inside(branch):
 
374
        return bool(branch.base.startswith(t.base))
 
375
 
 
376
    if t.base.startswith('http://'):
 
377
        def evaluate(bzrdir):
 
378
            try:
 
379
                branch = bzrdir.open_branch()
 
380
                if is_inside(branch):
 
381
                    return True, branch
 
382
                else:
 
383
                    return True, None
 
384
            except NotBranchError:
 
385
                return True, None
 
386
        return [b for b in BzrDir.find_bzrdirs(t, list_current=apache_ls,
 
387
                evaluate=evaluate) if b is not None]
 
388
    elif not t.listable():
 
389
        raise BzrCommandError("Can't list this type of location.")
 
390
    return [b for b in BzrDir.find_branches(t) if is_inside(b)]
 
391
 
 
392
 
 
393
def evaluate_branch_tree(bzrdir):
 
394
    try:
 
395
        tree, branch = bzrdir._get_tree_branch()
 
396
    except NotBranchError:
 
397
        return True, None
 
398
    else:
 
399
        return True, (branch, tree)
328
400
 
329
401
 
330
402
def iter_branch_tree(t, lister=None):
331
 
    for bzrdir in iter_bzrdirs(t, lister):
332
 
        try:
333
 
            wt = bzrdir.open_workingtree()
334
 
            yield wt.branch, wt
335
 
        except NoWorkingTree, UnsupportedFormatError:
336
 
            try:
337
 
                branch = bzrdir.open_branch()
338
 
                if branch.bzrdir is bzrdir:
339
 
                    yield branch, None
340
 
            except (NotBranchError, UnsupportedFormatError):
341
 
                continue
342
 
 
343
 
 
344
 
def iter_bzrdirs(t, lister=None):
345
 
    if lister is None:
346
 
        def lister(t):
347
 
            return t.list_dir('.')
348
 
    try:
349
 
        bzrdir = bzrdir_from_transport(t)
350
 
        yield bzrdir
351
 
    except (NotBranchError, UnsupportedFormatError, TransportError,
352
 
            PermissionDenied):
353
 
        pass
354
 
    try:
355
 
        for directory in lister(t):
356
 
            if directory == ".bzr":
357
 
                continue
358
 
            try:
359
 
                subt = t.clone(directory)
360
 
            except UnicodeDecodeError:
361
 
                continue
362
 
            for bzrdir in iter_bzrdirs(subt, lister):
363
 
                yield bzrdir
364
 
    except (NoSuchFile, PermissionDenied, TransportError):
365
 
        pass
366
 
 
367
 
    
368
 
def bzrdir_from_transport(t):
369
 
    """Open a bzrdir from a transport (not a location)"""
370
 
    format = BzrDirFormat.find_format(t)
371
 
    BzrDir._check_supported(format, False)
372
 
    return format.open(t)
 
403
    return (x for x in BzrDir.find_bzrdirs(t, evaluate=evaluate_branch_tree,
 
404
            list_current=lister) if x is not None)
 
405
 
 
406
 
 
407
def open_from_url(location):
 
408
    location = urlutils.normalize_url(location)
 
409
    dirname, basename = urlutils.split(location)
 
410
    return get_transport(dirname).get(basename)
373
411
 
374
412
 
375
413
def run_tests():