← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to bzrtools.py

  • Committer: Aaron Bentley
  • Date: 2006-04-12 01:27:15 UTC
  • mto: This revision was merged to the branch mainline in revision 362.
  • Revision ID: aaron.bentley@utoronto.ca-20060412012715-b8e33bae91b660a0
Tweak switch command

Show diffs side-by-side

added added

removed removed

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