← 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 23:29:32 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060318232932-4981a8efa6e028c9
Fixed patch on checkouts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrtools.py
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
17
 
import bzrlib
18
 
import bzrlib.errors
 
17
import codecs
 
18
import errno
19
19
import os
20
 
import os.path
21
 
import sys
 
20
import re
22
21
import tempfile
23
22
import shutil
24
 
import errno
25
23
from subprocess import Popen, PIPE
26
 
import codecs
27
 
 
28
 
def temp_branch():
 
24
import sys
 
25
 
 
26
import bzrlib
 
27
import bzrlib.errors
 
28
from bzrlib.errors import BzrCommandError
 
29
from bzrlib.bzrdir import BzrDir
 
30
 
 
31
def temp_tree():
29
32
    dirname = tempfile.mkdtemp("temp-branch")
30
 
    return bzrlib.branch.Branch.initialize(dirname)
31
 
 
32
 
def rm_branch(br):
33
 
    shutil.rmtree(br.base)
34
 
 
35
 
def is_clean(cur_branch):
 
33
    return BzrDir.create_standalone_workingtree(dirname)
 
34
 
 
35
def rm_tree(tree):
 
36
    shutil.rmtree(tree.basedir)
 
37
 
 
38
def is_clean(cur_tree):
36
39
    """
37
40
    Return true if no files are modifed or unknown
38
41
    >>> import bzrlib.add
39
 
    >>> br = temp_branch()
40
 
    >>> is_clean(br)
 
42
    >>> tree = temp_tree()
 
43
    >>> is_clean(tree)
41
44
    (True, [])
42
 
    >>> fooname = os.path.join(br.base, "foo")
 
45
    >>> fooname = os.path.join(tree.basedir, "foo")
43
46
    >>> file(fooname, "wb").write("bar")
44
 
    >>> is_clean(br)
 
47
    >>> is_clean(tree)
45
48
    (True, [u'foo'])
46
 
    >>> bzrlib.add.smart_add_branch(br, [br.base])
47
 
    1
48
 
    >>> is_clean(br)
 
49
    >>> bzrlib.add.smart_add_tree(tree, [tree.basedir])
 
50
    ([u'foo'], {})
 
51
    >>> is_clean(tree)
49
52
    (False, [])
50
 
    >>> br.commit("added file")
51
 
    >>> is_clean(br)
 
53
    >>> tree.commit("added file")
 
54
    >>> is_clean(tree)
52
55
    (True, [])
53
 
    >>> rm_branch(br)
 
56
    >>> rm_tree(tree)
54
57
    """
55
58
    from bzrlib.diff import compare_trees
56
 
    old_tree = cur_branch.basis_tree()
57
 
    new_tree = cur_branch.working_tree()
 
59
    old_tree = cur_tree.basis_tree()
 
60
    new_tree = cur_tree
58
61
    non_source = []
59
62
    for path, file_class, kind, file_id, entry in new_tree.list_files():
60
63
        if file_class in ('?', 'I'):
61
64
            non_source.append(path)
62
65
    delta = compare_trees(old_tree, new_tree, want_unchanged=False)
63
 
    if len(delta.added) > 0 or len(delta.removed) > 0 or \
64
 
        len(delta.modified) > 0:
65
 
        return False, non_source
66
 
    return True, non_source 
67
 
 
68
 
def set_pull_data(br, location, rev_id):
69
 
    pull_file = file (br.controlfilename("x-pull-data"), "wb")
70
 
    pull_file.write("%s\n%s\n" % (location, rev_id))
71
 
 
72
 
def get_pull_data(br):
73
 
    """
74
 
    >>> br = temp_branch()
75
 
    >>> get_pull_data(br)
76
 
    (None, None)
77
 
    >>> set_pull_data(br, 'http://somewhere', '888-777')
78
 
    >>> get_pull_data(br)
79
 
    ('http://somewhere', '888-777')
80
 
    >>> rm_branch(br)
81
 
    """
82
 
    filename = br.controlfilename("x-pull-data")
83
 
    if not os.path.exists(filename):
84
 
        return (None, None)
85
 
    pull_file = file (filename, "rb")
86
 
    location, rev_id = [f.rstrip('\n') for f in pull_file]
87
 
    return location, rev_id
88
 
 
89
 
def set_push_data(br, location):
90
 
    push_file = file (br.controlfilename("x-push-data"), "wb")
 
66
    return not delta.has_changed(), non_source
 
67
 
 
68
def set_push_data(tree, location):
 
69
    push_file = file (tree.branch.control_files.controlfilename("x-push-data"), "wb")
91
70
    push_file.write("%s\n" % location)
92
71
 
93
 
def get_push_data(br):
 
72
def get_push_data(tree):
94
73
    """
95
 
    >>> br = temp_branch()
96
 
    >>> get_push_data(br) is None
 
74
    >>> tree = temp_tree()
 
75
    >>> get_push_data(tree) is None
97
76
    True
98
 
    >>> set_push_data(br, 'http://somewhere')
99
 
    >>> get_push_data(br)
 
77
    >>> set_push_data(tree, 'http://somewhere')
 
78
    >>> get_push_data(tree)
100
79
    'http://somewhere'
101
 
    >>> rm_branch(br)
 
80
    >>> rm_tree(tree)
102
81
    """
103
 
    filename = br.controlfilename("x-push-data")
 
82
    filename = tree.branch.control_files.controlfilename("x-push-data")
104
83
    if not os.path.exists(filename):
105
84
        return None
106
85
    push_file = file (filename, "rb")
136
115
def rsync(source, target, ssh=False, excludes=(), silent=False, 
137
116
          rsync_name="rsync"):
138
117
    """
 
118
    >>> new_dir = tempfile.mkdtemp()
 
119
    >>> old_dir = os.getcwd()
 
120
    >>> os.chdir(new_dir)
139
121
    >>> rsync("a", "b", silent=True)
140
122
    Traceback (most recent call last):
141
 
    RsyncNoFile: No such file a
142
 
    >>> rsync("a", "b", excludes=("*.py",), silent=True)
 
123
    RsyncNoFile: No such file...
 
124
    >>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True)
143
125
    Traceback (most recent call last):
144
 
    RsyncNoFile: No such file a
145
 
    >>> rsync("a", "b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
 
126
    RsyncNoFile: No such file...
 
127
    >>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
146
128
    Traceback (most recent call last):
147
129
    NoRsync: rsyncc not found.
 
130
    >>> os.chdir(old_dir)
 
131
    >>> os.rmdir(new_dir)
148
132
    """
149
133
    cmd = [rsync_name, "-av", "--delete"]
150
134
    if ssh:
205
189
        raise RsyncUnknownStatus(proc.returncode)
206
190
    return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
207
191
 
208
 
exclusions = ('.bzr/x-push-data', '.bzr/parent', '.bzr/x-pull-data', 
209
 
              '.bzr/x-pull', '.bzr/pull', '.bzr/stat-cache',
210
 
              '.bzr/x-rsync-data')
 
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')
211
196
 
212
197
 
213
198
def read_revision_history(fname):
226
211
    tempdir = tempfile.mkdtemp('push')
227
212
    try:
228
213
        history_fname = os.path.join(tempdir, 'revision-history')
229
 
        cmd = rsync(location+'.bzr/revision-history', history_fname,
230
 
                    silent=True)
 
214
        try:
 
215
            cmd = rsync(location+'.bzr/revision-history', history_fname,
 
216
                        silent=True)
 
217
        except RsyncNoFile:
 
218
            cmd = rsync(location+'.bzr/branch/revision-history', history_fname,
 
219
                        silent=True)
231
220
        history = read_revision_history(history_fname)
232
221
    finally:
233
222
        shutil.rmtree(tempdir)
250
239
    except RsyncNoFile:
251
240
        return True
252
241
 
253
 
def push(cur_branch, location=None, overwrite=False):
254
 
    push_location = get_push_data(cur_branch)
 
242
def push(tree, location=None, overwrite=False, working_tree=True):
 
243
    push_location = get_push_data(tree)
255
244
    if location is not None:
256
245
        if not location.endswith('/'):
257
246
            location += '/'
258
247
        push_location = location
259
248
    
260
249
    if push_location is None:
261
 
        print "No push location saved.  Please specify one on the command line."
262
 
        sys.exit(1)
263
 
 
264
 
    clean, non_source = is_clean(cur_branch)
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
 
    non_source.extend(exclusions)
 
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)
270
275
    if not overwrite:
271
276
        try:
272
 
            if not history_subset(push_location, cur_branch):
 
277
            if not history_subset(push_location, tree.branch):
273
278
                raise bzrlib.errors.BzrCommandError("Local branch is not a"
274
279
                                                    " newer version of remote"
275
280
                                                    " branch.")
283
288
                " specified location.  Please ensure that"
284
289
                ' "%s" is of the form "machine:/path".' % push_location)
285
290
    print "Pushing to %s" % push_location
286
 
    rsync(cur_branch.base+'/', push_location, ssh=True, excludes=non_source)
287
 
 
288
 
    set_push_data(cur_branch, push_location)
 
291
    rsync(tree.basedir+'/', push_location, ssh=True, 
 
292
          excludes=final_exclusions)
 
293
 
 
294
    set_push_data(tree, push_location)
 
295
 
 
296
 
 
297
def short_committer(committer):
 
298
    new_committer = re.sub('<.*>', '', committer).strip(' ')
 
299
    if len(new_committer) < 2:
 
300
        return committer
 
301
    return new_committer
 
302
 
289
303
 
290
304
def run_tests():
291
305
    import doctest