def run():
files = selection.selected_group()
if not files:
return
s = selection.selection()
model = main.model()
launch_with_head(files, bool(s.staged), model.head)
def do(self):
if not self.model.undoable():
return
s = selection.selection()
if s.staged:
items_to_undo = s.staged
else:
items_to_undo = s.modified
if items_to_undo:
if not Interaction.confirm(
N_('Revert Unstaged Changes?'),
N_('This operation drops unstaged changes.\n'
'These changes cannot be recovered.'),
N_('Revert the unstaged changes?'),
N_('Revert Unstaged Changes'),
default=True,
icon=resources.icon('undo.svg')):
return
args = []
if not s.staged and self.model.amending():
args.append(self.model.head)
do(Checkout, args + ['--'] + items_to_undo)
else:
msg = N_('No files selected for checkout from HEAD.')
Interaction.log(msg)
def contextMenuEvent(self, event):
"""Create the context menu for the diff display."""
menu = QtGui.QMenu(self)
s = selection.selection()
if self.model.stageable():
if s.modified and s.modified[0] in main.model().submodules:
action = menu.addAction(qtutils.icon('add.svg'),
cmds.Stage.name(),
cmds.run(cmds.Stage, s.modified))
action.setShortcut(cmds.Stage.SHORTCUT)
menu.addAction(qtutils.git_icon(),
N_('Launch git-cola'),
cmds.run(cmds.OpenRepo,
core.abspath(s.modified[0])))
elif s.modified:
action = menu.addAction(qtutils.icon('add.svg'),
N_('Stage Section'),
self.stage_section)
action.setShortcut(Qt.Key_H)
menu.addAction(self.action_stage_selection)
menu.addSeparator()
menu.addAction(qtutils.icon('undo.svg'),
N_('Revert Section...'),
self.revert_section)
menu.addAction(self.action_revert_selection)
if self.model.unstageable():
if s.staged and s.staged[0] in main.model().submodules:
action = menu.addAction(qtutils.icon('remove.svg'),
cmds.Unstage.name(),
cmds.do(cmds.Unstage, s.staged))
action.setShortcut(cmds.Unstage.SHORTCUT)
menu.addAction(qtutils.git_icon(),
N_('Launch git-cola'),
cmds.do(cmds.OpenRepo,
core.abspath(s.staged[0])))
elif s.staged:
action = menu.addAction(qtutils.icon('remove.svg'),
N_('Unstage Section'),
self.unstage_section)
action.setShortcut(Qt.Key_H)
menu.addAction(self.action_unstage_selection)
if self.model.stageable() or self.model.unstageable():
menu.addSeparator()
menu.addAction(self.launch_editor)
menu.addAction(self.launch_difftool)
menu.addSeparator()
action = menu.addAction(qtutils.icon('edit-copy.svg'),
N_('Copy'), self.copy)
action.setShortcut(QtGui.QKeySequence.Copy)
action = menu.addAction(qtutils.icon('edit-select-all.svg'),
N_('Select All'), self.selectAll)
action.setShortcut(QtGui.QKeySequence.SelectAll)
menu.exec_(self.mapToGlobal(event.pos()))
def contextMenuEvent(self, event):
"""Create the context menu for the diff display."""
menu = QtGui.QMenu(self)
s = selection.selection()
if self.model.stageable():
if s.modified and s.modified[0] in main.model().submodules:
action = menu.addAction(qtutils.icon('add.svg'),
cmds.Stage.name(),
cmds.run(cmds.Stage, s.modified))
action.setShortcut(cmds.Stage.SHORTCUT)
menu.addAction(qtutils.git_icon(),
N_('Launch git-cola'),
cmds.run(cmds.OpenRepo,
core.abspath(s.modified[0])))
elif s.modified:
action = menu.addAction(qtutils.icon('add.svg'),
N_('Stage Section'),
self.stage_section)
action.setShortcut(Qt.Key_H)
menu.addAction(self.action_stage_selection)
menu.addSeparator()
menu.addAction(qtutils.icon('undo.svg'),
N_('Revert Section...'),
self.revert_section)
menu.addAction(self.action_revert_selection)
if self.model.unstageable():
if s.staged and s.staged[0] in main.model().submodules:
action = menu.addAction(qtutils.icon('remove.svg'),
cmds.Unstage.name(),
cmds.do(cmds.Unstage, s.staged))
action.setShortcut(cmds.Unstage.SHORTCUT)
menu.addAction(qtutils.git_icon(),
N_('Launch git-cola'),
cmds.do(cmds.OpenRepo,
core.abspath(s.staged[0])))
elif s.staged:
action = menu.addAction(qtutils.icon('remove.svg'),
N_('Unstage Section'),
self.unstage_section)
action.setShortcut(Qt.Key_H)
menu.addAction(self.action_unstage_selection)
if self.model.stageable() or self.model.unstageable():
menu.addSeparator()
menu.addAction(self.launch_editor)
menu.addAction(self.launch_difftool)
menu.addSeparator()
action = menu.addAction(qtutils.icon('edit-copy.svg'),
N_('Copy'), self.copy)
action.setShortcut(QtGui.QKeySequence.Copy)
action = menu.addAction(qtutils.icon('edit-select-all.svg'),
N_('Select All'), self.selectAll)
action.setShortcut(QtGui.QKeySequence.SelectAll)
menu.exec_(self.mapToGlobal(event.pos()))
def do(self):
s = selection.selection()
if s.unmerged:
paths = s.unmerged
if utils.is_win32():
core.fork(['git', 'mergetool', '--no-prompt', '--'] + paths)
else:
core.fork(['xterm', '-e',
'git', 'mergetool', '--no-prompt', '--'] + paths)
else:
difftool.run()
def do(self):
s = selection.selection()
if s.unmerged:
paths = s.unmerged
if utils.is_win32():
core.fork(['git', 'mergetool', '--no-prompt', '--'] + paths)
else:
core.fork(
['xterm', '-e', 'git', 'mergetool', '--no-prompt', '--'] +
paths)
else:
difftool.run()
def do(self):
s = selection.selection()
if s.unmerged:
paths = s.unmerged
if utils.is_win32():
core.fork(['git', 'mergetool', '--no-prompt', '--'] + paths)
else:
cmd = _config.terminal()
argv = utils.shell_split(cmd)
argv.extend(['git', 'mergetool', '--no-prompt', '--'])
argv.extend(paths)
core.fork(argv)
else:
difftool.run()
def do(self):
s = selection.selection()
if s.unmerged:
paths = s.unmerged
if utils.is_win32():
core.fork(['git', 'mergetool', '--no-prompt', '--'] + paths)
else:
cmd = _config.terminal()
argv = utils.shell_split(cmd)
argv.extend(['git', 'mergetool', '--no-prompt', '--'])
argv.extend(paths)
core.fork(argv)
else:
difftool.run()
def do(self):
s = selection.selection()
if s.staged:
do(Unstage, s.staged)
unstaged = []
if s.unmerged:
unstaged.extend(s.unmerged)
if s.modified:
unstaged.extend(s.modified)
if s.untracked:
unstaged.extend(s.untracked)
if unstaged:
do(Stage, unstaged)
def do(self):
s = selection.selection()
if s.staged:
do(Unstage, s.staged)
unstaged = []
if s.unmerged:
unstaged.extend(s.unmerged)
if s.modified:
unstaged.extend(s.modified)
if s.untracked:
unstaged.extend(s.untracked)
if unstaged:
do(Stage, unstaged)
def checkout_args(self):
args = []
s = selection.selection()
if self.checkout_from_head():
args.append(self.model.head)
args.append('--')
if s.staged:
items = s.staged
else:
items = s.modified
args.extend(items)
return args
def checkout_args(self):
args = []
s = selection.selection()
if self.checkout_from_head():
args.append(self.model.head)
args.append('--')
if s.staged:
items = s.staged
else:
items = s.modified
args.extend(items)
return args
def do(self):
s = selection.selection()
if s.unmerged:
paths = s.unmerged
if utils.is_win32():
core.fork(["git", "mergetool", "--no-prompt", "--"] + paths)
else:
cfg = gitcfg.current()
cmd = cfg.terminal()
argv = utils.shell_split(cmd)
argv.extend(["git", "mergetool", "--no-prompt", "--"])
argv.extend(paths)
core.fork(argv)
else:
difftool.run()
def do(self):
if not self.model.undoable():
return
s = selection.selection()
if s.staged:
items_to_undo = s.staged
else:
items_to_undo = s.modified
if items_to_undo:
if not Interaction.confirm(N_('Revert Unstaged Changes?'),
N_('This operation drops unstaged changes.\n'
'These changes cannot be recovered.'),
N_('Revert the unstaged changes?'),
N_('Revert Unstaged Changes'),
default=True,
icon=resources.icon('undo.svg')):
return
args = []
if not s.staged and self.model.amending():
args.append(self.model.head)
do(Checkout, args + ['--'] + items_to_undo)
else:
msg = N_('No files selected for checkout from HEAD.')
Interaction.log(msg)
def update_actions(self, selected=None):
if selected is None:
selected = selection.selection()
can_revert_unstaged_edits = bool(selected.staged or selected.modified)
self.revert_unstaged_edits_action.setEnabled(can_revert_unstaged_edits)
def __init__(self):
s = selection.selection()
allfiles = s.staged + s.unmerged + s.modified + s.untracked
Edit.__init__(self, allfiles)
def contextMenuEvent(self, event):
"""Create the context menu for the diff display."""
menu = QtGui.QMenu(self)
s = selection.selection()
filename = selection.filename()
if self.model.stageable() or self.model.unstageable():
if self.model.stageable():
self.stage_or_unstage.setText(N_('Stage'))
else:
self.stage_or_unstage.setText(N_('Unstage'))
menu.addAction(self.stage_or_unstage)
if s.modified and self.model.stageable():
if s.modified[0] in main.model().submodules:
action = menu.addAction(icons.add(), cmds.Stage.name(),
cmds.run(cmds.Stage, s.modified))
action.setShortcut(hotkeys.STAGE_SELECTION)
menu.addAction(
icons.cola(), N_('Launch git-cola'),
cmds.run(cmds.OpenRepo, core.abspath(s.modified[0])))
elif s.modified[0] not in main.model().unstaged_deleted:
if self.has_selection():
apply_text = N_('Stage Selected Lines')
revert_text = N_('Revert Selected Lines...')
else:
apply_text = N_('Stage Diff Hunk')
revert_text = N_('Revert Diff Hunk...')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(icons.add())
self.action_revert_selection.setText(revert_text)
menu.addAction(self.action_apply_selection)
menu.addAction(self.action_revert_selection)
if s.staged and self.model.unstageable():
if s.staged[0] in main.model().submodules:
action = menu.addAction(icons.remove(), cmds.Unstage.name(),
cmds.do(cmds.Unstage, s.staged))
action.setShortcut(hotkeys.STAGE_SELECTION)
menu.addAction(
icons.cola(), N_('Launch git-cola'),
cmds.do(cmds.OpenRepo, core.abspath(s.staged[0])))
elif s.staged[0] not in main.model().staged_deleted:
if self.has_selection():
apply_text = N_('Unstage Selected Lines')
else:
apply_text = N_('Unstage Diff Hunk')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(icons.remove())
menu.addAction(self.action_apply_selection)
if self.model.stageable() or self.model.unstageable():
# Do not show the "edit" action when the file does not exist.
# Untracked files exist by definition.
if filename and core.exists(filename):
menu.addSeparator()
menu.addAction(self.launch_editor)
# Removed files can still be diffed.
menu.addAction(self.launch_difftool)
# Add the Previous/Next File actions, which improves discoverability
# of their associated shortcuts
menu.addSeparator()
menu.addAction(self.move_up)
menu.addAction(self.move_down)
menu.addSeparator()
action = menu.addAction(icons.copy(), N_('Copy'), self.copy)
action.setShortcut(QtGui.QKeySequence.Copy)
action = menu.addAction(icons.select_all(), N_('Select All'),
self.selectAll)
action.setShortcut(QtGui.QKeySequence.SelectAll)
menu.exec_(self.mapToGlobal(event.pos()))
def __init__(self):
s = selection.selection()
allfiles = s.staged + s.unmerged + s.modified + s.untracked
Edit.__init__(self, allfiles)
def checkout_from_head(self):
# If we are amending and a modified file is selected
# then we should include "HEAD^" on the command-line.
selected = selection.selection()
return not selected.staged and self.model.amending()
def update_actions(self, selected=None):
if selected is None:
selected = selection.selection()
can_revert_edits = bool(selected.staged or selected.modified)
self.revert_unstaged_edits_action.setEnabled(can_revert_edits)
self.revert_uncommitted_edits_action.setEnabled(can_revert_edits)
def contextMenuEvent(self, event):
"""Create the context menu for the diff display."""
menu = QtGui.QMenu(self)
s = selection.selection()
filename = selection.filename()
if self.model.stageable() or self.model.unstageable():
if self.model.stageable():
self.stage_or_unstage.setText(N_('Stage'))
else:
self.stage_or_unstage.setText(N_('Unstage'))
menu.addAction(self.stage_or_unstage)
if s.modified and self.model.stageable():
if s.modified[0] in main.model().submodules:
action = menu.addAction(icons.add(), cmds.Stage.name(),
cmds.run(cmds.Stage, s.modified))
action.setShortcut(hotkeys.STAGE_SELECTION)
menu.addAction(icons.cola(), N_('Launch git-cola'),
cmds.run(cmds.OpenRepo,
core.abspath(s.modified[0])))
elif s.modified[0] not in main.model().unstaged_deleted:
if self.has_selection():
apply_text = N_('Stage Selected Lines')
revert_text = N_('Revert Selected Lines...')
else:
apply_text = N_('Stage Diff Hunk')
revert_text = N_('Revert Diff Hunk...')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(icons.add())
self.action_revert_selection.setText(revert_text)
menu.addAction(self.action_apply_selection)
menu.addAction(self.action_revert_selection)
if s.staged and self.model.unstageable():
if s.staged[0] in main.model().submodules:
action = menu.addAction(icons.remove(), cmds.Unstage.name(),
cmds.do(cmds.Unstage, s.staged))
action.setShortcut(hotkeys.STAGE_SELECTION)
menu.addAction(icons.cola(), N_('Launch git-cola'),
cmds.do(cmds.OpenRepo,
core.abspath(s.staged[0])))
elif s.staged[0] not in main.model().staged_deleted:
if self.has_selection():
apply_text = N_('Unstage Selected Lines')
else:
apply_text = N_('Unstage Diff Hunk')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(icons.remove())
menu.addAction(self.action_apply_selection)
if self.model.stageable() or self.model.unstageable():
# Do not show the "edit" action when the file does not exist.
# Untracked files exist by definition.
if filename and core.exists(filename):
menu.addSeparator()
menu.addAction(self.launch_editor)
# Removed files can still be diffed.
menu.addAction(self.launch_difftool)
# Add the Previous/Next File actions, which improves discoverability
# of their associated shortcuts
menu.addSeparator()
menu.addAction(self.move_up)
menu.addAction(self.move_down)
menu.addSeparator()
action = menu.addAction(icons.copy(), N_('Copy'), self.copy)
action.setShortcut(QtGui.QKeySequence.Copy)
action = menu.addAction(icons.select_all(), N_('Select All'),
self.selectAll)
action.setShortcut(QtGui.QKeySequence.SelectAll)
menu.exec_(self.mapToGlobal(event.pos()))
def contextMenuEvent(self, event):
"""Create the context menu for the diff display."""
menu = QtGui.QMenu(self)
s = selection.selection()
filename = selection.filename()
if self.model.stageable() and s.modified:
if s.modified[0] in main.model().submodules:
action = menu.addAction(qtutils.icon('add.svg'),
cmds.Stage.name(),
cmds.run(cmds.Stage, s.modified))
action.setShortcut(cmds.Stage.SHORTCUT)
menu.addAction(qtutils.git_icon(),
N_('Launch git-cola'),
cmds.run(cmds.OpenRepo,
core.abspath(s.modified[0])))
else:
if self.has_selection():
apply_text = N_('Stage Selected Lines')
revert_text = N_('Revert Selected Lines...')
else:
apply_text = N_('Stage Diff Hunk')
revert_text = N_('Revert Diff Hunk...')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(qtutils.icon('add.svg'))
self.action_revert_selection.setText(revert_text)
menu.addAction(self.action_apply_selection)
menu.addAction(self.action_revert_selection)
if self.model.unstageable():
if s.staged and s.staged[0] in main.model().submodules:
action = menu.addAction(qtutils.icon('remove.svg'),
cmds.Unstage.name(),
cmds.do(cmds.Unstage, s.staged))
action.setShortcut(cmds.Unstage.SHORTCUT)
menu.addAction(qtutils.git_icon(),
N_('Launch git-cola'),
cmds.do(cmds.OpenRepo,
core.abspath(s.staged[0])))
elif s.staged:
if self.has_selection():
apply_text = N_('Unstage Selected Lines')
else:
apply_text = N_('Unstage Diff Hunk')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(qtutils.icon('remove.svg'))
menu.addAction(self.action_apply_selection)
if self.model.stageable() or self.model.unstageable():
# Do not show the "edit" action when the file does not exist.
# Untracked files exist by definition.
if filename and core.exists(filename):
menu.addSeparator()
menu.addAction(self.launch_editor)
# Removed files can still be diffed.
menu.addAction(self.launch_difftool)
menu.addSeparator()
action = menu.addAction(qtutils.icon('edit-copy.svg'),
N_('Copy'), self.copy)
action.setShortcut(QtGui.QKeySequence.Copy)
action = menu.addAction(qtutils.icon('edit-select-all.svg'),
N_('Select All'), self.selectAll)
action.setShortcut(QtGui.QKeySequence.SelectAll)
menu.exec_(self.mapToGlobal(event.pos()))
def checkout_from_head(self):
# If we are amending and a modified file is selected
# then we should include "HEAD^" on the command-line.
selected = selection.selection()
return not selected.staged and self.model.amending()
def contextMenuEvent(self, event):
"""Create the context menu for the diff display."""
menu = QtGui.QMenu(self)
s = selection.selection()
filename = selection.filename()
if s.modified and self.model.stageable():
if s.modified[0] in main.model().submodules:
action = menu.addAction(qtutils.icon('add.svg'),
cmds.Stage.name(),
cmds.run(cmds.Stage, s.modified))
action.setShortcut(cmds.Stage.SHORTCUT)
menu.addAction(
qtutils.git_icon(), N_('Launch git-cola'),
cmds.run(cmds.OpenRepo, core.abspath(s.modified[0])))
elif s.modified[0] not in main.model().unstaged_deleted:
if self.has_selection():
apply_text = N_('Stage Selected Lines')
revert_text = N_('Revert Selected Lines...')
else:
apply_text = N_('Stage Diff Hunk')
revert_text = N_('Revert Diff Hunk...')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(qtutils.icon('add.svg'))
self.action_revert_selection.setText(revert_text)
menu.addAction(self.action_apply_selection)
menu.addAction(self.action_revert_selection)
if s.staged and self.model.unstageable():
if s.staged[0] in main.model().submodules:
action = menu.addAction(qtutils.icon('remove.svg'),
cmds.Unstage.name(),
cmds.do(cmds.Unstage, s.staged))
action.setShortcut(cmds.Unstage.SHORTCUT)
menu.addAction(
qtutils.git_icon(), N_('Launch git-cola'),
cmds.do(cmds.OpenRepo, core.abspath(s.staged[0])))
elif s.staged[0] not in main.model().staged_deleted:
if self.has_selection():
apply_text = N_('Unstage Selected Lines')
else:
apply_text = N_('Unstage Diff Hunk')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(qtutils.icon('remove.svg'))
menu.addAction(self.action_apply_selection)
if self.model.stageable() or self.model.unstageable():
# Do not show the "edit" action when the file does not exist.
# Untracked files exist by definition.
if filename and core.exists(filename):
menu.addSeparator()
menu.addAction(self.launch_editor)
# Removed files can still be diffed.
menu.addAction(self.launch_difftool)
menu.addSeparator()
action = menu.addAction(qtutils.icon('edit-copy.svg'), N_('Copy'),
self.copy)
action.setShortcut(QtGui.QKeySequence.Copy)
action = menu.addAction(qtutils.icon('edit-select-all.svg'),
N_('Select All'), self.selectAll)
action.setShortcut(QtGui.QKeySequence.SelectAll)
menu.exec_(self.mapToGlobal(event.pos()))