1
=== modified file 'utilities/on-edge'
2
--- utilities/on-edge	2010-02-01 23:41:00 +0000
3
+++ utilities/on-edge	2010-02-02 18:36:26 +0000
4
@@ -61,25 +61,58 @@
5
61
    return os.path.dirname(os.path.dirname(os.path.dirname(this_file)))
61
    return os.path.dirname(os.path.dirname(os.path.dirname(this_file)))
6
62
62
7
63
63
8
64
def print_revisions(branch, end_id):
9
65
    """Output revision messages up to end_id."""
10
66
    rev_iter = branch.iter_merge_sorted_revisions(
11
67
        None, end_id, 'include')
12
68
    for rev_info in rev_iter:
13
69
        (rev_id, depth, revno, end_of_merge) = rev_info
14
70
        if depth > 0:
15
71
            continue
16
72
        revision = branch.repository.get_revision(rev_id)
17
73
        revno_str = ".".join(map(str, revno))
18
74
        print "r%s:\n%s" % (revno_str, revision.message)
19
75
20
76
21
64
def report_difference_to_server(server, branch_path, revno, verbose):
77
def report_difference_to_server(server, branch_path, revno, verbose):
22
78
    """Output if and how the local branch differs from the server."""
23
65
    branch = Branch.open(branch_path)
79
    branch = Branch.open(branch_path)
25
66
    print '%s is running %s r%s' % (server, branch.nick, revno)
80
    print '%s is running %s r%d.' % (server, branch.nick, revno)
26
67
    try:
81
    try:
28
68
        branch.dotted_revno_to_revision_id(str(revno + 1))
82
        current_id = branch.dotted_revno_to_revision_id((revno,))
29
69
    except errors.NoSuchRevision:
83
    except errors.NoSuchRevision:
31
70
        print '%s is up-to-date' % (server,)
84
        print '%s has newer revisions than %s.' % (server, branch.nick)
32
71
    else:
85
    else:
37
72
        if verbose:
86
        if current_id == branch.last_revision():
38
73
            command = 'bzr log -r%s.. %s' % (revno, branch_path)
87
            print '%s is up-to-date.' % (server,)
39
74
            os.system(command)
88
        else:
40
75
            print
89
            if verbose:
41
90
                print_revisions(branch, current_id)
42
91
43
92
44
93
automatic_merge_regex = re.compile(
45
94
    "automatic merge from stable[.] "
46
95
    "Revisions:[0-9,\s]*\s+([0-9]+)\s+included")
47
96
48
97
49
98
def get_last_automatic_stable_merge_revno(branch_path):
50
99
    """Find out which stable revision was last commited to db-stable."""
51
100
    branch = Branch.open(branch_path)
52
101
    for rev_info in branch.iter_merge_sorted_revisions():
53
102
        (rev_id, depth, revno, end_of_merge) = rev_info
54
103
        if depth > 0:
55
104
            continue
56
105
        revision = branch.repository.get_revision(rev_id)
57
106
        match = automatic_merge_regex.search(revision.message)
58
107
        if match is not None:
59
108
            return match.group(1)
60
76
109
61
77
110
62
78
def get_opt_parse():
111
def get_opt_parse():
63
79
    parser = optparse.OptionParser(
112
    parser = optparse.OptionParser(
64
80
        description="Show local revisions that aren't on beta servers.")
113
        description="Show local revisions that aren't on beta servers.")
65
81
    parser.add_option(
114
    parser.add_option(
67
82
        '-v', '--verbose', action='store_true', help="Show revision log")
115
        '-v', '--verbose', action='store_true', help="Show revision log.")
68
83
    parser.add_option(
116
    parser.add_option(
69
84
        '--edge-only', action='store_true',
117
        '--edge-only', action='store_true',
70
85
        help="Only show revisions not on edge. Do not consult staging.")
118
        help="Only show revisions not on edge. Do not consult staging.")
71
@@ -103,6 +136,8 @@
72
103
        db_stable_branch = os.path.join(parent_dir, 'db-stable')
136
        db_stable_branch = os.path.join(parent_dir, 'db-stable')
73
104
        report_difference_to_server(
137
        report_difference_to_server(
74
105
            'staging', db_stable_branch, staging_revision, verbose)
138
            'staging', db_stable_branch, staging_revision, verbose)
75
139
        print "Last automatic merge on db-stable was stable r%s." % (
76
140
            get_last_automatic_stable_merge_revno(db_stable_branch),)
77
106
141
78
107
142
79
108
def main(argv):
143
def main(argv):
Status:	Merged
Approved by:	Jeroen T. Vermeulen on 2010-02-02
Approved revision:	not available
Merged at revision:	not available
Proposed branch:	lp:~henninge/launchpad/on-edge
Merge into:	lp:launchpad
Diff against target:	79 lines (+43/-8) 1 file modified utilities/on-edge (+43/-8)
To merge this branch:	bzr merge lp:~henninge/launchpad/on-edge
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jeroen T. Vermeulen (community)	code	2010-02-02	Approve on 2010-02-02
Review via email: mp+18454@code.launchpad.net