← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to bzrtools.py

Update for integration changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrtools.py
65
65
    return True, non_source 
66
66
 
67
67
def set_pull_data(br, location, rev_id):
68
 
    pull_file = file (br.controlfilename("x-pull-data"), "wb")
 
68
    pull_file = file (br.control_files.controlfilename("x-pull-data"), "wb")
69
69
    pull_file.write("%s\n%s\n" % (location, rev_id))
70
70
 
71
71
def get_pull_data(br):
78
78
    ('http://somewhere', '888-777')
79
79
    >>> rm_branch(br)
80
80
    """
81
 
    filename = br.controlfilename("x-pull-data")
 
81
    filename = br.control_files.controlfilename("x-pull-data")
82
82
    if not os.path.exists(filename):
83
83
        return (None, None)
84
84
    pull_file = file (filename, "rb")
86
86
    return location, rev_id
87
87
 
88
88
def set_push_data(br, location):
89
 
    push_file = file (br.controlfilename("x-push-data"), "wb")
 
89
    push_file = file (br.control_files.controlfilename("x-push-data"), "wb")
90
90
    push_file.write("%s\n" % location)
91
91
 
92
92
def get_push_data(br):
99
99
    'http://somewhere'
100
100
    >>> rm_branch(br)
101
101
    """
102
 
    filename = br.controlfilename("x-push-data")
 
102
    filename = br.control_files.controlfilename("x-push-data")
103
103
    if not os.path.exists(filename):
104
104
        return None
105
105
    push_file = file (filename, "rb")