← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to bzrtools.py

Make work with integration again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrtools.py
62
62
    return not delta.has_changed(), non_source
63
63
 
64
64
def set_pull_data(br, location, rev_id):
65
 
    pull_file = file (br.control_files.controlfilename("x-pull-data"), "wb")
 
65
    pull_file = file (br.controlfilename("x-pull-data"), "wb")
66
66
    pull_file.write("%s\n%s\n" % (location, rev_id))
67
67
 
68
68
def get_pull_data(br):
75
75
    ('http://somewhere', '888-777')
76
76
    >>> rm_branch(br)
77
77
    """
78
 
    filename = br.control_files.controlfilename("x-pull-data")
 
78
    filename = br.controlfilename("x-pull-data")
79
79
    if not os.path.exists(filename):
80
80
        return (None, None)
81
81
    pull_file = file (filename, "rb")
83
83
    return location, rev_id
84
84
 
85
85
def set_push_data(br, location):
86
 
    push_file = file (br.control_files.controlfilename("x-push-data"), "wb")
 
86
    push_file = file (br.controlfilename("x-push-data"), "wb")
87
87
    push_file.write("%s\n" % location)
88
88
 
89
89
def get_push_data(br):
96
96
    'http://somewhere'
97
97
    >>> rm_branch(br)
98
98
    """
99
 
    filename = br.control_files.controlfilename("x-push-data")
 
99
    filename = br.controlfilename("x-push-data")
100
100
    if not os.path.exists(filename):
101
101
        return None
102
102
    push_file = file (filename, "rb")