def __init__(self, parent=None):
hint = N_('Commit summary')
HintedLineEdit.__init__(self, hint, parent)
self.extra_actions = []
comment_char = prefs.comment_char()
re_comment_char = re.escape(comment_char)
regex = QtCore.QRegExp(r'^[^%s \t].*' % re_comment_char)
self._validator = QtGui.QRegExpValidator(regex, self)
self.setValidator(self._validator)
def __init__(self, parent=None):
hint = N_('Commit summary')
HintedLineEdit.__init__(self, hint, parent)
self.extra_actions = []
comment_char = prefs.comment_char()
re_comment_char = re.escape(comment_char)
regex = QtCore.QRegExp(r'^[^%s \t].*' % re_comment_char)
self._validator = QtGui.QRegExpValidator(regex, self)
self.setValidator(self._validator)
def do(self):
# Create the commit message file
comment_char = prefs.comment_char()
msg = self.strip_comments(self.msg, comment_char=comment_char)
tmpfile = utils.tmp_filename("commit-message")
try:
core.write(tmpfile, msg)
# Run 'git commit'
status, out, err = self.model.git.commit(
F=tmpfile, v=True, gpg_sign=self.sign, amend=self.amend, no_verify=self.no_verify
)
finally:
core.unlink(tmpfile)
if status == 0:
ResetMode.do(self)
self.model.set_commitmsg(self.new_commitmsg)
msg = N_("Created commit: %s") % out
else:
msg = N_("Commit failed: %s") % out
Interaction.log_status(status, msg, err)
return status, out, err
def __init__(self, context, filename, parent=None):
super(Editor, self).__init__(parent)
self.widget_version = 1
self.status = 1
self.context = context
self.filename = filename
self.comment_char = comment_char = prefs.comment_char(context)
self.cancel_action = core.getenv('GIT_COLA_SEQ_EDITOR_CANCEL_ACTION',
'abort')
self.diff = diff.DiffWidget(context, self)
self.tree = RebaseTreeWidget(context, comment_char, self)
self.filewidget = filelist.FileWidget(context, self)
self.setFocusProxy(self.tree)
self.rebase_button = qtutils.create_button(
text=core.getenv('GIT_COLA_SEQ_EDITOR_ACTION', N_('Rebase')),
tooltip=N_('Accept changes and rebase\n'
'Shortcut: Ctrl+Enter'),
icon=icons.ok(),
default=True,
)
self.extdiff_button = qtutils.create_button(
text=N_('Launch Diff Tool'),
tooltip=N_('Launch external diff tool\n'
'Shortcut: Ctrl+D'),
)
self.extdiff_button.setEnabled(False)
self.help_button = qtutils.create_button(
text=N_('Help'),
tooltip=N_('Show help\nShortcut: ?'),
icon=icons.question())
self.cancel_button = qtutils.create_button(
text=N_('Cancel'),
tooltip=N_('Cancel rebase\nShortcut: Ctrl+Q'),
icon=icons.close(),
)
top = qtutils.splitter(Qt.Horizontal, self.tree, self.filewidget)
top.setSizes([75, 25])
main_split = qtutils.splitter(Qt.Vertical, top, self.diff)
main_split.setSizes([25, 75])
controls_layout = qtutils.hbox(
defs.no_margin,
defs.button_spacing,
self.cancel_button,
qtutils.STRETCH,
self.help_button,
self.extdiff_button,
self.rebase_button,
)
layout = qtutils.vbox(defs.no_margin, defs.spacing, main_split,
controls_layout)
self.setLayout(layout)
self.action_rebase = qtutils.add_action(self, N_('Rebase'),
self.rebase,
hotkeys.CTRL_RETURN,
hotkeys.CTRL_ENTER)
self.tree.commits_selected.connect(self.commits_selected)
self.tree.commits_selected.connect(self.filewidget.commits_selected)
self.tree.commits_selected.connect(self.diff.commits_selected)
self.tree.external_diff.connect(self.external_diff)
self.filewidget.files_selected.connect(self.diff.files_selected)
qtutils.connect_button(self.rebase_button, self.rebase)
qtutils.connect_button(self.extdiff_button, self.external_diff)
qtutils.connect_button(self.help_button, partial(show_help, context))
qtutils.connect_button(self.cancel_button, self.cancel)
