← 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-03-18 17:00:37 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060318170037-6e2b7eeba66a92f7
Lock repo for branch-history

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
 
    )
40
 
from bzrlib.bzrdir import BzrDir, BzrDirFormat
41
 
from bzrlib.transport import get_transport
 
28
from bzrlib.errors import BzrCommandError
 
29
from bzrlib.bzrdir import BzrDir
42
30
 
43
31
def temp_tree():
44
32
    dirname = tempfile.mkdtemp("temp-branch")
50
38
def is_clean(cur_tree):
51
39
    """
52
40
    Return true if no files are modifed or unknown
 
41
    >>> import bzrlib.add
 
42
    >>> tree = temp_tree()
 
43
    >>> is_clean(tree)
 
44
    (True, [])
 
45
    >>> fooname = os.path.join(tree.basedir, "foo")
 
46
    >>> file(fooname, "wb").write("bar")
 
47
    >>> is_clean(tree)
 
48
    (True, [u'foo'])
 
49
    >>> bzrlib.add.smart_add_tree(tree, [tree.basedir])
 
50
    ([u'foo'], {})
 
51
    >>> is_clean(tree)
 
52
    (False, [])
 
53
    >>> tree.commit("added file")
 
54
    >>> is_clean(tree)
 
55
    (True, [])
 
56
    >>> rm_tree(tree)
53
57
    """
 
58
    from bzrlib.diff import compare_trees
54
59
    old_tree = cur_tree.basis_tree()
55
60
    new_tree = cur_tree
56
61
    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()
 
62
    for path, file_class, kind, file_id, entry in new_tree.list_files():
 
63
        if file_class in ('?', 'I'):
 
64
            non_source.append(path)
 
65
    delta = compare_trees(old_tree, new_tree, want_unchanged=False)
65
66
    return not delta.has_changed(), non_source
66
67
 
67
68
def set_push_data(tree, location):
68
 
    tree.branch.control_files.put_utf8("x-push-data", "%s\n" % location)
 
69
    push_file = file (tree.branch.control_files.controlfilename("x-push-data"), "wb")
 
70
    push_file.write("%s\n" % location)
69
71
 
70
72
def get_push_data(tree):
71
73
    """
74
76
    True
75
77
    >>> set_push_data(tree, 'http://somewhere')
76
78
    >>> get_push_data(tree)
77
 
    u'http://somewhere'
 
79
    'http://somewhere'
78
80
    >>> rm_tree(tree)
79
81
    """
80
 
    try:
81
 
        location = tree.branch.control_files.get_utf8('x-push-data').read()
82
 
    except NoSuchFile:
 
82
    filename = tree.branch.control_files.controlfilename("x-push-data")
 
83
    if not os.path.exists(filename):
83
84
        return None
84
 
    return location.rstrip('\n')
 
85
    push_file = file (filename, "rb")
 
86
    (location,) = [f.rstrip('\n') for f in push_file]
 
87
    return location
85
88
 
86
89
"""
87
90
>>> shell_escape('hello')
109
112
    def __init__(self, rsync_name):
110
113
        Exception.__init__(self, "%s not found." % rsync_name)
111
114
 
112
 
 
113
 
def rsync(source, target, ssh=False, excludes=(), silent=False,
 
115
def rsync(source, target, ssh=False, excludes=(), silent=False, 
114
116
          rsync_name="rsync"):
 
117
    """
 
118
    >>> new_dir = tempfile.mkdtemp()
 
119
    >>> old_dir = os.getcwd()
 
120
    >>> os.chdir(new_dir)
 
121
    >>> rsync("a", "b", silent=True)
 
122
    Traceback (most recent call last):
 
123
    RsyncNoFile: No such file...
 
124
    >>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True)
 
125
    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")
 
128
    Traceback (most recent call last):
 
129
    NoRsync: rsyncc not found.
 
130
    >>> os.chdir(old_dir)
 
131
    >>> os.rmdir(new_dir)
 
132
    """
115
133
    cmd = [rsync_name, "-av", "--delete"]
116
134
    if ssh:
117
135
        cmd.extend(('-e', 'ssh'))
129
147
    except OSError, e:
130
148
        if e.errno == errno.ENOENT:
131
149
            raise NoRsync(rsync_name)
132
 
 
 
150
            
133
151
    proc.stdin.write('\n'.join(excludes)+'\n')
134
152
    proc.stdin.close()
135
153
    if silent:
171
189
        raise RsyncUnknownStatus(proc.returncode)
172
190
    return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
173
191
 
174
 
exclusions = ('.bzr/x-push-data', '.bzr/branch/x-push/data', '.bzr/parent',
 
192
exclusions = ('.bzr/x-push-data', '.bzr/branch/x-push/data', '.bzr/parent', 
175
193
              '.bzr/branch/parent', '.bzr/x-pull-data', '.bzr/x-pull',
176
194
              '.bzr/pull', '.bzr/stat-cache', '.bzr/x-rsync-data',
177
195
              '.bzr/basis-inventory', '.bzr/inventory.backup.weave')
181
199
    return [l.rstrip('\r\n') for l in
182
200
            codecs.open(fname, 'rb', 'utf-8').readlines()]
183
201
 
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
 
 
193
202
class RsyncNoFile(Exception):
194
203
    def __init__(self, path):
195
204
        Exception.__init__(self, "No such file %s" % path)
198
207
    def __init__(self):
199
208
        Exception.__init__(self, "Error in rsync protocol data stream.")
200
209
 
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):
 
210
def get_revision_history(location):
212
211
    tempdir = tempfile.mkdtemp('push')
213
 
    my_rsync = _rsync
214
 
    if my_rsync is None:
215
 
        my_rsync = rsync
216
212
    try:
217
213
        history_fname = os.path.join(tempdir, 'revision-history')
218
214
        try:
219
 
            cmd = my_rsync(location+'.bzr/revision-history', history_fname,
 
215
            cmd = rsync(location+'.bzr/revision-history', history_fname,
220
216
                        silent=True)
221
217
        except RsyncNoFile:
222
218
            cmd = rsync(location+'.bzr/branch/revision-history', history_fname,
226
222
        shutil.rmtree(tempdir)
227
223
    return history
228
224
 
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):
 
225
def history_subset(location, branch):
 
226
    remote_history = get_revision_history(location)
246
227
    local_history = branch.revision_history()
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
 
 
 
228
    if len(remote_history) > len(local_history):
 
229
        return False
 
230
    for local, remote in zip(remote_history, local_history):
 
231
        if local != remote:
 
232
            return False 
 
233
    return True
262
234
 
263
235
def empty_or_absent(location):
264
236
    try:
267
239
    except RsyncNoFile:
268
240
        return True
269
241
 
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()
 
242
def push(tree, location=None, overwrite=False, working_tree=True):
 
243
    push_location = get_push_data(tree)
 
244
    if location is not None:
 
245
        if not location.endswith('/'):
 
246
            location += '/'
 
247
        push_location = location
 
248
    
 
249
    if push_location is None:
 
250
        if tree.branch.get_push_location() is None:
 
251
            raise BzrCommandError("No push location known or specified.")
 
252
        else:
 
253
            raise bzrlib.errors.MustUseDecorated
 
254
 
 
255
    if push_location.find('://') != -1:
 
256
        raise bzrlib.errors.MustUseDecorated
 
257
 
 
258
    if push_location.find(':') == -1:
 
259
        raise bzrlib.errors.MustUseDecorated
 
260
 
 
261
    if working_tree:
 
262
        clean, non_source = is_clean(tree)
 
263
        if not clean:
 
264
            print """Error: This tree has uncommitted changes or unknown (?) files.
 
265
    Use "bzr status" to list them."""
 
266
            sys.exit(1)
 
267
        final_exclusions = non_source[:]
 
268
    else:
 
269
        wt = tree
 
270
        final_exclusions = []
 
271
        for path, status, kind, file_id, entry in wt.list_files():
 
272
            final_exclusions.append(path)
 
273
 
 
274
    final_exclusions.extend(exclusions)
 
275
    if not overwrite:
 
276
        try:
 
277
            if not history_subset(push_location, tree.branch):
 
278
                raise bzrlib.errors.BzrCommandError("Local branch is not a"
 
279
                                                    " newer version of remote"
 
280
                                                    " branch.")
 
281
        except RsyncNoFile:
 
282
            if not empty_or_absent(push_location):
 
283
                raise bzrlib.errors.BzrCommandError("Remote location is not a"
 
284
                                                    " bzr branch (or empty"
 
285
                                                    " directory)")
 
286
        except RsyncStreamIO:
 
287
            raise bzrlib.errors.BzrCommandError("Rsync could not use the"
 
288
                " specified location.  Please ensure that"
 
289
                ' "%s" is of the form "machine:/path".' % push_location)
 
290
    print "Pushing to %s" % push_location
 
291
    rsync(tree.basedir+'/', push_location, ssh=True, 
 
292
          excludes=final_exclusions)
 
293
 
 
294
    set_push_data(tree, push_location)
340
295
 
341
296
 
342
297
def short_committer(committer):
346
301
    return new_committer
347
302
 
348
303
 
349
 
def apache_ls(t):
350
 
    """Screen-scrape Apache listings"""
351
 
    apache_dir = '<img border="0" src="/icons/folder.gif" alt="[dir]">'\
352
 
        ' <a href="'
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)
360
 
    for line in lines:
361
 
        match = expr.search(line)
362
 
        if match is None:
363
 
            continue
364
 
        url = match.group(1)
365
 
        if url.startswith('http://') or url.startswith('/') or '../' in url:
366
 
            continue
367
 
        if '?' in url:
368
 
            continue
369
 
        yield url.rstrip('/')
370
 
 
371
 
 
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)
400
 
 
401
 
 
402
 
def iter_branch_tree(t, lister=None):
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)
411
 
 
412
 
 
413
304
def run_tests():
414
305
    import doctest
415
306
    result = doctest.testmod()