def test_default_remote(self):
"""Test default_remote()."""
self.assertEqual(gitcmds.default_remote(config=self.config), None)
self.git('config', 'branch.master.remote', 'test')
self.config.reset()
self.assertEqual(gitcmds.default_remote(config=self.config), 'test')
def __init__(self, model, action, title, parent=None):
"""Customizes the dialog based on the remote action
"""
standard.Dialog.__init__(self, parent=parent)
self.model = model
self.action = action
self.filtered_remote_branches = []
self.selected_remotes = []
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowTitle(title)
if parent is not None:
self.setWindowModality(Qt.WindowModal)
self.task_runner = TaskRunner(self)
self.progress = ProgressDialog(title, N_('Updating'), self)
self.local_label = QtGui.QLabel()
self.local_label.setText(N_('Local Branch'))
self.local_branch = QtGui.QLineEdit()
self.local_branches = QtGui.QListWidget()
self.local_branches.addItems(self.model.local_branches)
self.remote_label = QtGui.QLabel()
self.remote_label.setText(N_('Remote'))
self.remote_name = QtGui.QLineEdit()
self.remotes = QtGui.QListWidget()
if action == PUSH:
self.remotes.setSelectionMode(
QtGui.QAbstractItemView.ExtendedSelection)
self.remotes.addItems(self.model.remotes)
self.remote_branch_label = QtGui.QLabel()
self.remote_branch_label.setText(N_('Remote Branch'))
self.remote_branch = QtGui.QLineEdit()
self.remote_branches = QtGui.QListWidget()
self.remote_branches.addItems(self.model.remote_branches)
self.ffwd_only_checkbox = QtGui.QCheckBox()
self.ffwd_only_checkbox.setText(N_('Fast Forward Only '))
self.ffwd_only_checkbox.setChecked(True)
self.tags_checkbox = QtGui.QCheckBox()
self.tags_checkbox.setText(N_('Include tags '))
self.rebase_checkbox = QtGui.QCheckBox()
self.rebase_checkbox.setText(N_('Rebase '))
self.action_button = QtGui.QPushButton()
self.action_button.setText(title)
self.action_button.setIcon(qtutils.ok_icon())
self.close_button = QtGui.QPushButton()
self.close_button.setText(N_('Close'))
self.close_button.setIcon(qtutils.close_icon())
self.local_branch_layout = qtutils.hbox(defs.small_margin,
defs.spacing, self.local_label,
self.local_branch)
self.remote_branch_layout = qtutils.hbox(defs.small_margin,
defs.spacing,
self.remote_label,
self.remote_name)
self.remote_branches_layout = qtutils.hbox(defs.small_margin,
defs.spacing,
self.remote_branch_label,
self.remote_branch)
self.options_layout = qtutils.hbox(
defs.no_margin, defs.button_spacing, qtutils.STRETCH,
self.ffwd_only_checkbox, self.tags_checkbox, self.rebase_checkbox,
self.action_button, self.close_button)
if action == PUSH:
widgets = (
self.remote_branch_layout,
self.remotes,
self.local_branch_layout,
self.local_branches,
self.remote_branches_layout,
self.remote_branches,
self.options_layout,
)
else: # fetch and pull
widgets = (
self.remote_branch_layout,
self.remotes,
self.remote_branches_layout,
self.remote_branches,
self.local_branch_layout,
self.local_branches,
self.options_layout,
)
self.main_layout = qtutils.vbox(defs.no_margin, defs.spacing, *widgets)
self.setLayout(self.main_layout)
default_remote = gitcmds.default_remote() or 'origin'
remotes = self.model.remotes
if default_remote in remotes:
idx = remotes.index(default_remote)
if self.select_remote(idx):
self.remote_name.setText(default_remote)
else:
if self.select_first_remote():
self.remote_name.setText(remotes[0])
# Trim the remote list to just the default remote
self.update_remotes()
self.set_field_defaults()
# Setup signals and slots
self.connect(self.remotes, SIGNAL('itemSelectionChanged()'),
self.update_remotes)
self.connect(self.local_branches, SIGNAL('itemSelectionChanged()'),
self.update_local_branches)
self.connect(self.remote_branches, SIGNAL('itemSelectionChanged()'),
self.update_remote_branches)
connect_button(self.action_button, self.action_callback)
connect_button(self.close_button, self.close)
qtutils.add_action(self, N_('Close'), self.close,
QtGui.QKeySequence.Close, 'Esc')
if action == PULL:
self.tags_checkbox.hide()
self.ffwd_only_checkbox.hide()
self.local_label.hide()
self.local_branch.hide()
self.local_branches.hide()
self.remote_branch.setFocus()
else:
self.rebase_checkbox.hide()
if not self.restore_state():
self.resize(666, 420)
self.remote_name.setFocus()
def __init__(self, model, action, title, parent=None):
"""Customizes the dialog based on the remote action
"""
standard.Dialog.__init__(self, parent=parent)
self.model = model
self.action = action
self.filtered_remote_branches = []
self.selected_remotes = []
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowTitle(title)
if parent is not None:
self.setWindowModality(Qt.WindowModal)
self.task_runner = TaskRunner(self)
self.progress = ProgressDialog(title, N_('Updating'), self)
self.local_label = QtGui.QLabel()
self.local_label.setText(N_('Local Branch'))
self.local_branch = QtGui.QLineEdit()
self.local_branches = QtGui.QListWidget()
self.local_branches.addItems(self.model.local_branches)
self.remote_label = QtGui.QLabel()
self.remote_label.setText(N_('Remote'))
self.remote_name = QtGui.QLineEdit()
self.remotes = QtGui.QListWidget()
if action == PUSH:
self.remotes.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.remotes.addItems(self.model.remotes)
self.remote_branch_label = QtGui.QLabel()
self.remote_branch_label.setText(N_('Remote Branch'))
self.remote_branch = QtGui.QLineEdit()
self.remote_branches = QtGui.QListWidget()
self.remote_branches.addItems(self.model.remote_branches)
self.ffwd_only_checkbox = QtGui.QCheckBox()
self.ffwd_only_checkbox.setText(N_('Fast Forward Only '))
self.ffwd_only_checkbox.setChecked(True)
self.tags_checkbox = QtGui.QCheckBox()
self.tags_checkbox.setText(N_('Include tags '))
self.rebase_checkbox = QtGui.QCheckBox()
self.rebase_checkbox.setText(N_('Rebase '))
self.action_button = QtGui.QPushButton()
self.action_button.setText(title)
self.action_button.setIcon(qtutils.ok_icon())
self.close_button = QtGui.QPushButton()
self.close_button.setText(N_('Close'))
self.close_button.setIcon(qtutils.close_icon())
self.local_branch_layout = QtGui.QHBoxLayout()
self.local_branch_layout.addWidget(self.local_label)
self.local_branch_layout.addWidget(self.local_branch)
self.remote_branch_layout = QtGui.QHBoxLayout()
self.remote_branch_layout.addWidget(self.remote_label)
self.remote_branch_layout.addWidget(self.remote_name)
self.remote_branches_layout = QtGui.QHBoxLayout()
self.remote_branches_layout.addWidget(self.remote_branch_label)
self.remote_branches_layout.addWidget(self.remote_branch)
self.options_layout = QtGui.QHBoxLayout()
self.options_layout.setSpacing(defs.button_spacing)
self.options_layout.addStretch()
self.options_layout.addWidget(self.ffwd_only_checkbox)
self.options_layout.addWidget(self.tags_checkbox)
self.options_layout.addWidget(self.rebase_checkbox)
self.options_layout.addWidget(self.action_button)
self.options_layout.addWidget(self.close_button)
self.main_layout = QtGui.QVBoxLayout()
self.main_layout.setMargin(defs.margin)
self.main_layout.setSpacing(defs.spacing)
self.main_layout.addLayout(self.remote_branch_layout)
self.main_layout.addWidget(self.remotes)
if action == PUSH:
self.main_layout.addLayout(self.local_branch_layout)
self.main_layout.addWidget(self.local_branches)
self.main_layout.addLayout(self.remote_branches_layout)
self.main_layout.addWidget(self.remote_branches)
else: # fetch and pull
self.main_layout.addLayout(self.remote_branches_layout)
self.main_layout.addWidget(self.remote_branches)
self.main_layout.addLayout(self.local_branch_layout)
self.main_layout.addWidget(self.local_branches)
self.main_layout.addLayout(self.options_layout)
self.setLayout(self.main_layout)
default_remote = gitcmds.default_remote() or 'origin'
remotes = self.model.remotes
if default_remote in remotes:
idx = remotes.index(default_remote)
if self.select_remote(idx):
self.remote_name.setText(default_remote)
else:
if self.select_first_remote():
self.remote_name.setText(remotes[0])
# Trim the remote list to just the default remote
self.update_remotes()
self.set_field_defaults()
# Setup signals and slots
self.connect(self.remotes, SIGNAL('itemSelectionChanged()'),
self.update_remotes)
self.connect(self.local_branches, SIGNAL('itemSelectionChanged()'),
self.update_local_branches)
self.connect(self.remote_branches, SIGNAL('itemSelectionChanged()'),
self.update_remote_branches)
connect_button(self.action_button, self.action_callback)
connect_button(self.close_button, self.close)
qtutils.add_action(self, N_('Close'),
self.close, QtGui.QKeySequence.Close, 'Esc')
if action == PULL:
self.tags_checkbox.hide()
self.ffwd_only_checkbox.hide()
self.local_label.hide()
self.local_branch.hide()
self.local_branches.hide()
self.remote_branch.setFocus()
else:
self.rebase_checkbox.hide()
if not self.restore_state():
self.resize(666, 420)
self.remote_name.setFocus()
def test_default_remote(self):
"""Test default_remote()."""
self.assertEqual(gitcmds.default_remote(config=self.config), None)
self.git('config', 'branch.master.remote', 'test')
self.config.reset()
self.assertEqual(gitcmds.default_remote(config=self.config), 'test')
def __init__(self, model, action, title, parent=None, icon=None):
"""Customizes the dialog based on the remote action
"""
standard.Dialog.__init__(self, parent=parent)
self.model = model
self.action = action
self.filtered_remote_branches = []
self.selected_remotes = []
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowTitle(title)
if parent is not None:
self.setWindowModality(Qt.WindowModal)
self.runtask = qtutils.RunTask(parent=self)
self.progress = ProgressDialog(title, N_('Updating'), self)
self.local_label = QtGui.QLabel()
self.local_label.setText(N_('Local Branch'))
self.local_branch = QtGui.QLineEdit()
self.local_branches = QtGui.QListWidget()
self.local_branches.addItems(self.model.local_branches)
self.remote_label = QtGui.QLabel()
self.remote_label.setText(N_('Remote'))
self.remote_name = QtGui.QLineEdit()
self.remotes = QtGui.QListWidget()
if action == PUSH:
self.remotes.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.remotes.addItems(self.model.remotes)
self.remote_branch_label = QtGui.QLabel()
self.remote_branch_label.setText(N_('Remote Branch'))
self.remote_branch = QtGui.QLineEdit()
self.remote_branches = QtGui.QListWidget()
self.remote_branches.addItems(self.model.remote_branches)
text = N_('Fast Forward Only ')
self.ffwd_only_checkbox = qtutils.checkbox(text=text, checked=True)
self.tags_checkbox = qtutils.checkbox(text=N_('Include tags '))
self.rebase_checkbox = qtutils.checkbox(text=N_('Rebase '))
if icon is None:
icon = icons.ok()
self.action_button = qtutils.create_button(text=title, icon=icon)
self.close_button = qtutils.close_button()
self.buttons = utils.Group(self.action_button, self.close_button)
self.local_branch_layout = qtutils.hbox(defs.small_margin, defs.spacing,
self.local_label,
self.local_branch)
self.remote_branch_layout = qtutils.hbox(defs.small_margin, defs.spacing,
self.remote_label,
self.remote_name)
self.remote_branches_layout = qtutils.hbox(defs.small_margin, defs.spacing,
self.remote_branch_label,
self.remote_branch)
self.options_layout = qtutils.hbox(defs.no_margin, defs.button_spacing,
qtutils.STRETCH,
self.ffwd_only_checkbox,
self.tags_checkbox,
self.rebase_checkbox,
self.action_button,
self.close_button)
if action == PUSH:
widgets = (
self.remote_branch_layout, self.remotes,
self.local_branch_layout, self.local_branches,
self.remote_branches_layout, self.remote_branches,
self.options_layout,
)
else: # fetch and pull
widgets = (
self.remote_branch_layout, self.remotes,
self.remote_branches_layout, self.remote_branches,
self.local_branch_layout, self.local_branches,
self.options_layout,
)
self.main_layout = qtutils.vbox(defs.no_margin, defs.spacing, *widgets)
self.setLayout(self.main_layout)
default_remote = gitcmds.default_remote() or 'origin'
remotes = self.model.remotes
if default_remote in remotes:
idx = remotes.index(default_remote)
if self.select_remote(idx):
self.remote_name.setText(default_remote)
else:
if self.select_first_remote():
self.remote_name.setText(remotes[0])
# Trim the remote list to just the default remote
self.update_remotes()
self.set_field_defaults()
# Setup signals and slots
self.connect(self.remotes, SIGNAL('itemSelectionChanged()'),
self.update_remotes)
self.connect(self.local_branches, SIGNAL('itemSelectionChanged()'),
self.update_local_branches)
self.connect(self.remote_branches, SIGNAL('itemSelectionChanged()'),
self.update_remote_branches)
connect_button(self.action_button, self.action_callback)
connect_button(self.close_button, self.close)
qtutils.add_action(self, N_('Close'), self.close,
QtGui.QKeySequence.Close, 'Esc')
if action == PULL:
self.tags_checkbox.hide()
self.ffwd_only_checkbox.hide()
self.local_label.hide()
self.local_branch.hide()
self.local_branches.hide()
self.remote_branch.setFocus()
else:
self.rebase_checkbox.hide()
if not self.restore_state():
self.resize(666, 420)
self.remote_name.setFocus()
def test_default_remote(self):
"""Test default_remote()."""
self.assertEqual(gitcmds.default_remote(config=self.config), None)
self.shell("git config branch.master.remote test")
self.config.reset()
self.assertEqual(gitcmds.default_remote(config=self.config), "test")
def __init__(self, model, action, parent=None):
"""Customizes the dialog based on the remote action
"""
standard.Dialog.__init__(self, parent=parent)
self.model = model
self.action = action
self.tasks = []
self.filtered_remote_branches = []
self.selected_remotes = []
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowTitle(N_(action))
if parent is not None:
self.setWindowModality(Qt.WindowModal)
self.progress = QtGui.QProgressDialog(self)
self.progress.setFont(qtutils.diff_font())
self.progress.setRange(0, 0)
self.progress.setCancelButton(None)
self.progress.setWindowTitle(action)
self.progress.setWindowModality(Qt.WindowModal)
self.progress.setLabelText(N_('Updating') + '.. ')
self.progress_thread = ProgressAnimationThread(N_('Updating'), self)
self.local_label = QtGui.QLabel()
self.local_label.setText(N_('Local Branch'))
self.local_branch = QtGui.QLineEdit()
self.local_branches = QtGui.QListWidget()
self.local_branches.addItems(self.model.local_branches)
self.remote_label = QtGui.QLabel()
self.remote_label.setText(N_('Remote'))
self.remote_name = QtGui.QLineEdit()
self.remotes = QtGui.QListWidget()
if action == PUSH:
self.remotes.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.remotes.addItems(self.model.remotes)
self.remote_branch_label = QtGui.QLabel()
self.remote_branch_label.setText(N_('Remote Branch'))
self.remote_branch = QtGui.QLineEdit()
self.remote_branches = QtGui.QListWidget()
self.remote_branches.addItems(self.model.remote_branches)
self.ffwd_only_checkbox = QtGui.QCheckBox()
self.ffwd_only_checkbox.setText(N_('Fast Forward Only '))
self.ffwd_only_checkbox.setChecked(True)
self.tags_checkbox = QtGui.QCheckBox()
self.tags_checkbox.setText(N_('Include tags '))
self.rebase_checkbox = QtGui.QCheckBox()
self.rebase_checkbox.setText(N_('Rebase '))
self.action_button = QtGui.QPushButton()
self.action_button.setText(N_(action))
self.action_button.setIcon(qtutils.ok_icon())
self.close_button = QtGui.QPushButton()
self.close_button.setText(N_('Close'))
self.close_button.setIcon(qtutils.close_icon())
self.local_branch_layout = QtGui.QHBoxLayout()
self.local_branch_layout.addWidget(self.local_label)
self.local_branch_layout.addWidget(self.local_branch)
self.remote_branch_layout = QtGui.QHBoxLayout()
self.remote_branch_layout.addWidget(self.remote_label)
self.remote_branch_layout.addWidget(self.remote_name)
self.remote_branches_layout = QtGui.QHBoxLayout()
self.remote_branches_layout.addWidget(self.remote_branch_label)
self.remote_branches_layout.addWidget(self.remote_branch)
self.options_layout = QtGui.QHBoxLayout()
self.options_layout.setSpacing(defs.button_spacing)
self.options_layout.addStretch()
self.options_layout.addWidget(self.ffwd_only_checkbox)
self.options_layout.addWidget(self.tags_checkbox)
self.options_layout.addWidget(self.rebase_checkbox)
self.options_layout.addWidget(self.action_button)
self.options_layout.addWidget(self.close_button)
self.main_layout = QtGui.QVBoxLayout()
self.main_layout.setMargin(defs.margin)
self.main_layout.setSpacing(defs.spacing)
self.main_layout.addLayout(self.remote_branch_layout)
self.main_layout.addWidget(self.remotes)
if action == PUSH:
self.main_layout.addLayout(self.local_branch_layout)
self.main_layout.addWidget(self.local_branches)
self.main_layout.addLayout(self.remote_branches_layout)
self.main_layout.addWidget(self.remote_branches)
else: # fetch and pull
self.main_layout.addLayout(self.remote_branches_layout)
self.main_layout.addWidget(self.remote_branches)
self.main_layout.addLayout(self.local_branch_layout)
self.main_layout.addWidget(self.local_branches)
self.main_layout.addLayout(self.options_layout)
self.setLayout(self.main_layout)
default_remote = gitcmds.default_remote() or 'origin'
remotes = self.model.remotes
if default_remote in remotes:
idx = remotes.index(default_remote)
if self.select_remote(idx):
self.remote_name.setText(default_remote)
else:
if self.select_first_remote():
self.remote_name.setText(remotes[0])
# Trim the remote list to just the default remote
self.update_remotes()
self.set_field_defaults()
# Setup signals and slots
self.connect(self.remotes, SIGNAL('itemSelectionChanged()'),
self.update_remotes)
self.connect(self.local_branches, SIGNAL('itemSelectionChanged()'),
self.update_local_branches)
self.connect(self.remote_branches, SIGNAL('itemSelectionChanged()'),
self.update_remote_branches)
connect_button(self.action_button, self.action_callback)
connect_button(self.close_button, self.close)
qtutils.add_action(self, N_('Close'),
self.close, QtGui.QKeySequence.Close, 'Esc')
self.connect(self, SIGNAL('action_completed'), self.action_completed)
self.connect(self.progress_thread, SIGNAL('str'), self.update_progress)
if action == PULL:
self.tags_checkbox.hide()
self.ffwd_only_checkbox.hide()
self.local_label.hide()
self.local_branch.hide()
self.local_branches.hide()
self.remote_branch.setFocus()
else:
self.rebase_checkbox.hide()
if not self.restore_state():
self.resize(666, 420)
self.remote_name.setFocus()
def test_default_remote(self):
"""Test default_remote()."""
self.assertEqual(gitcmds.default_remote(), None)
self.shell('git config branch.master.remote test')
self.assertEqual(gitcmds.default_remote(), 'test')