~abentley/bzrtools/bzrtools.dev

16 by abentley
Got is_clean under test, added setters/getters for pull data
1
import bzrlib
19 by abentley
librified most of the pull script
2
import os
16 by abentley
Got is_clean under test, added setters/getters for pull data
3
import os.path
19 by abentley
librified most of the pull script
4
import sys
16 by abentley
Got is_clean under test, added setters/getters for pull data
5
import tempfile
6
import shutil
7
8
def temp_branch():
9
    dirname = tempfile.mkdtemp("temp-branch")
10
    return bzrlib.Branch(dirname, init=True)
11
12
def rm_branch(br):
13
    shutil.rmtree(br.base)
14
15
def is_clean(cur_branch):
16
    """
17
    Return true if no files are modifed or unknown
18
    >>> br = temp_branch()
19
    >>> is_clean(br)
20
    True
21
    >>> fooname = os.path.join(br.base, "foo")
22
    >>> file(fooname, "wb").write("bar")
23
    >>> is_clean(br)
24
    False
25
    >>> bzrlib.add.smart_add([fooname])
26
    >>> is_clean(br)
27
    False
28
    >>> br.commit("added file")
29
    >>> is_clean(br)
30
    True
31
    >>> rm_branch(br)
32
    """
33
    old_tree = cur_branch.basis_tree()
34
    new_tree = cur_branch.working_tree()
41 by Aaron Bentley
Adapted to new ways of checking for clean tree
35
    for path, file_class, kind, file_id in new_tree.list_files():
42 by Aaron Bentley
Got tree check working with new API
36
        if file_class == '?':
16 by abentley
Got is_clean under test, added setters/getters for pull data
37
            return False
41 by Aaron Bentley
Adapted to new ways of checking for clean tree
38
    delta = bzrlib.compare_trees(old_tree, new_tree, want_unchanged=False)
42 by Aaron Bentley
Got tree check working with new API
39
    if len(delta.added) > 0 or len(delta.removed) > 0 or \
40
        len(delta.modified) > 0:
41 by Aaron Bentley
Adapted to new ways of checking for clean tree
41
        return False
16 by abentley
Got is_clean under test, added setters/getters for pull data
42
    return True
43
44
def set_pull_data(br, location, rev_id):
19 by abentley
librified most of the pull script
45
    pull_file = file (br.controlfilename("x-pull-data"), "wb")
16 by abentley
Got is_clean under test, added setters/getters for pull data
46
    pull_file.write("%s\n%s\n" % (location, rev_id))
47
48
def get_pull_data(br):
49
    """
50
    >>> br = temp_branch()
51
    >>> get_pull_data(br)
52
    (None, None)
53
    >>> set_pull_data(br, 'http://somewhere', '888-777')
54
    >>> get_pull_data(br)
55
    ('http://somewhere', '888-777')
56
    >>> rm_branch(br)
57
    """
19 by abentley
librified most of the pull script
58
    filename = br.controlfilename("x-pull-data")
16 by abentley
Got is_clean under test, added setters/getters for pull data
59
    if not os.path.exists(filename):
60
        return (None, None)
61
    pull_file = file (filename, "rb")
62
    location, rev_id = [f.rstrip('\n') for f in pull_file]
63
    return location, rev_id
64
20 by abentley
added bzr-push command
65
def set_push_data(br, location):
66
    push_file = file (br.controlfilename("x-push-data"), "wb")
67
    push_file.write("%s\n" % location)
68
69
def get_push_data(br):
70
    """
71
    >>> br = temp_branch()
72
    >>> get_push_data(br) is None
73
    True
74
    >>> set_push_data(br, 'http://somewhere')
75
    >>> get_push_data(br)
76
    'http://somewhere'
77
    >>> rm_branch(br)
78
    """
79
    filename = br.controlfilename("x-push-data")
80
    if not os.path.exists(filename):
81
        return None
82
    push_file = file (filename, "rb")
83
    (location,) = [f.rstrip('\n') for f in push_file]
84
    return location
85
19 by abentley
librified most of the pull script
86
"""
87
>>> shell_escape('hello')
88
'\h\e\l\l\o'
89
"""
90
def shell_escape(arg):
91
    return "".join(['\\'+c for c in arg])
92
93
def safe_system(args):
94
    """
95
    >>> real_system = os.system
96
    >>> os.system = sys.stdout.write
97
    >>> safe_system(['a', 'b', 'cd'])
98
    \\a \\b \\c\\d
99
    >>> os.system = real_system
100
    """
101
    arg_str = " ".join([shell_escape(a) for a in args])
102
    return os.system(arg_str)
103
25 by abentley
fixed push for x files, tracefile, push/pull miscommunication
104
def rsync(source, target, ssh=False, exclude_globs=()):
19 by abentley
librified most of the pull script
105
    """
106
    >>> real_system = os.system
107
    >>> os.system = sys.stdout.write
108
    >>> rsync("a", "b")
109
    \\r\\s\\y\\n\\c \\-\\a\\v \\-\\-\\d\\e\\l\\e\\t\\e \\a \\b
25 by abentley
fixed push for x files, tracefile, push/pull miscommunication
110
    >>> rsync("a", "b", exclude_globs=("*.py",))
111
    \\r\\s\\y\\n\\c \\-\\a\\v \\-\\-\\d\\e\\l\\e\\t\\e\
112
 \\-\\-\\e\\x\\c\\l\\u\\d\\e \\*\\.\\p\\y \\a \\b
19 by abentley
librified most of the pull script
113
    >>> os.system = real_system
114
    """
20 by abentley
added bzr-push command
115
    cmd = ["rsync", "-av", "--delete"]
116
    if ssh:
117
        cmd.extend(('-e', 'ssh'))
25 by abentley
fixed push for x files, tracefile, push/pull miscommunication
118
    for exclude in exclude_globs:
119
        cmd.extend(('--exclude', exclude))
20 by abentley
added bzr-push command
120
    cmd.extend((source, target))
121
    safe_system(cmd)
19 by abentley
librified most of the pull script
122
25 by abentley
fixed push for x files, tracefile, push/pull miscommunication
123
exclusions = ('x-push-data', 'x-pull-data')
124
125
48 by Aaron Bentley
Added overwrite parameter to bzr-pull
126
def pull(cur_branch, location=None, overwrite=False):
19 by abentley
librified most of the pull script
127
    pull_location, pull_revision = get_pull_data(cur_branch)
128
    if pull_location is not None:
48 by Aaron Bentley
Added overwrite parameter to bzr-pull
129
        if not overwrite and cur_branch.last_patch() != pull_revision:
19 by abentley
librified most of the pull script
130
            print "Aborting: This branch has had commits, so pull would lose data."
131
            sys.exit(1)
21 by abentley
removed references to sys.argv
132
    if location is not None:
133
        pull_location = location
19 by abentley
librified most of the pull script
134
        if not pull_location.endswith('/'):
25 by abentley
fixed push for x files, tracefile, push/pull miscommunication
135
            pull_location+='/'
19 by abentley
librified most of the pull script
136
137
    if pull_location is None:
138
        print "No pull location saved.  Please specify one on the command line."
139
        sys.exit(1)
140
141
    if not is_clean(cur_branch):
142
        print "Error: This tree has uncommitted changes or unknown (?) files."
143
        sys.exit(1)
144
145
    print "Synchronizing with %s" % pull_location
25 by abentley
fixed push for x files, tracefile, push/pull miscommunication
146
    rsync (pull_location, cur_branch.base+'/', exclude_globs=exclusions)
19 by abentley
librified most of the pull script
147
148
    set_pull_data(cur_branch, pull_location, cur_branch.last_patch())
149
20 by abentley
added bzr-push command
150
151
def push(cur_branch, location=None):
152
    push_location = get_push_data(cur_branch)
153
    if location is not None:
25 by abentley
fixed push for x files, tracefile, push/pull miscommunication
154
        if not location.endswith('/'):
155
            location += '/'
20 by abentley
added bzr-push command
156
        push_location = location
157
    
158
    if push_location is None:
159
        print "No push location saved.  Please specify one on the command line."
160
        sys.exit(1)
161
162
    if not is_clean(cur_branch):
163
        print "Error: This tree has uncommitted changes or unknown (?) files."
164
        sys.exit(1)
165
166
    print "Pushing to %s" % push_location
25 by abentley
fixed push for x files, tracefile, push/pull miscommunication
167
    rsync(cur_branch.base+'/', push_location, ssh=True,
168
          exclude_globs=exclusions)
20 by abentley
added bzr-push command
169
170
    set_push_data(cur_branch, push_location)
171
19 by abentley
librified most of the pull script
172
def run_tests():
16 by abentley
Got is_clean under test, added setters/getters for pull data
173
    import doctest
18 by abentley
Finished implementing bzr-pull
174
    result = doctest.testmod()
19 by abentley
librified most of the pull script
175
    if result[1] > 0:
176
        if result[0] == 0:
177
            print "All tests passed"
178
    else:
179
        print "No tests to run"
180
if __name__ == "__main__":
181
    run_tests()