Switch to unified view

a/Allura/push_re.py b/Allura/push_re.py
...
...
77
    print('---END---')
77
    print('---END---')
78
    sog_num = raw_input('What is the SOG ticket number? ')
78
    sog_num = raw_input('What is the SOG ticket number? ')
79
    raw_input('Now link the two tickets.')
79
    raw_input('Now link the two tickets.')
80
    if VERBOSE:
80
    if VERBOSE:
81
        print("Ask for approval (copy/paste the following text into Jabber)")
81
        print("Ask for approval (copy/paste the following text into Jabber)")
82
    raw_input('Allura %s push for your approval (https://control.sog.geek.net/sog/trac/ticket/%s).' % (new_tag, sog_num))
82
    raw_input('Allura push, %s, for your approval (https://control.sog.geek.net/sog/trac/ticket/%s).' % (new_tag, sog_num))
83
83
84
    if VERBOSE:
84
    if VERBOSE:
85
        print("Tag and push the Allura repo for release...")
85
        print("Tag and push the Allura repo for release...")
86
    tag_message = '[#%s] - Push to RE' % newforge_num
86
    tag_message = '[#%s] - Push to RE' % newforge_num
87
    git('tag', '-a', '-m', tag_message, new_tag, 'master')
87
    git('tag', '-a', '-m', tag_message, new_tag, 'master')
...
...
102
    git('push', 'origin', 'master', new_tag, git_dir=theme_path)
102
    git('push', 'origin', 'master', new_tag, git_dir=theme_path)
103
    git('push', 'control.sog.geek.net:sftheme-live', 'master', new_tag, git_dir=theme_path)
103
    git('push', 'control.sog.geek.net:sftheme-live', 'master', new_tag, git_dir=theme_path)
104
104
105
    if VERBOSE:
105
    if VERBOSE:
106
        print("Tell SOG we're ready (copy/paste the following text into Jabber)")
106
        print("Tell SOG we're ready (copy/paste the following text into Jabber)")
107
    print('Allura %s is ready for pushing (https://control.sog.geek.net/sog/trac/ticket/%s).' % (new_tag, sog_num))
107
    print('Allura release %s is ready for pushing (https://control.sog.geek.net/sog/trac/ticket/%s).' % (new_tag, sog_num))
108
    CP.write(open(os.path.join(os.environ['HOME'], '.forgepushrc'), 'w'))
108
    CP.write(open(os.path.join(os.environ['HOME'], '.forgepushrc'), 'w'))
109
    if VERBOSE:
109
    if VERBOSE:
110
        print("That's all, folks!")
110
        print("That's all, folks!")
111
111
112
def make_ticket_text(engineer, classic_path, theme_path):
112
def make_ticket_text(engineer, classic_path, theme_path):