1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378
|
"""A widget for searching git commits"""
import time
from qtpy import QtCore
from qtpy import QtWidgets
from qtpy.QtCore import Qt
from ..i18n import N_
from ..interaction import Interaction
from ..git import STDOUT
from ..qtutils import connect_button
from ..qtutils import create_toolbutton
from ..qtutils import get
from .. import core
from .. import gitcmds
from .. import icons
from .. import utils
from .. import qtutils
from . import diff
from . import defs
from . import standard
def mkdate(timespec):
return '%04d-%02d-%02d' % time.localtime(timespec)[:3]
class SearchOptions:
def __init__(self):
self.query = ''
self.max_count = 500
self.start_date = ''
self.end_date = ''
class SearchWidget(standard.Dialog):
def __init__(self, context, parent):
standard.Dialog.__init__(self, parent)
self.context = context
self.setWindowTitle(N_('Search'))
self.mode_combo = QtWidgets.QComboBox()
self.browse_button = create_toolbutton(
icon=icons.folder(), tooltip=N_('Browse...')
)
self.query = QtWidgets.QLineEdit()
self.start_date = QtWidgets.QDateEdit()
self.start_date.setCurrentSection(QtWidgets.QDateTimeEdit.YearSection)
self.start_date.setCalendarPopup(True)
self.start_date.setDisplayFormat(N_('yyyy-MM-dd'))
self.end_date = QtWidgets.QDateEdit()
self.end_date.setCurrentSection(QtWidgets.QDateTimeEdit.YearSection)
self.end_date.setCalendarPopup(True)
self.end_date.setDisplayFormat(N_('yyyy-MM-dd'))
icon = icons.search()
self.search_button = qtutils.create_button(
text=N_('Search'), icon=icon, default=True
)
self.max_count = standard.SpinBox(value=500, mini=5, maxi=9995, step=5)
self.commit_list = QtWidgets.QListWidget()
self.commit_list.setMinimumSize(QtCore.QSize(10, 10))
self.commit_list.setAlternatingRowColors(True)
selection_mode = QtWidgets.QAbstractItemView.SingleSelection
self.commit_list.setSelectionMode(selection_mode)
self.commit_text = diff.DiffTextEdit(context, self, whitespace=False)
self.button_export = qtutils.create_button(
text=N_('Export Patches'), icon=icons.diff()
)
self.button_cherrypick = qtutils.create_button(
text=N_('Cherry Pick'), icon=icons.cherry_pick()
)
self.button_close = qtutils.close_button()
self.top_layout = qtutils.hbox(
defs.no_margin,
defs.button_spacing,
self.query,
self.start_date,
self.end_date,
self.browse_button,
self.search_button,
qtutils.STRETCH,
self.mode_combo,
self.max_count,
)
self.splitter = qtutils.splitter(
Qt.Vertical, self.commit_list, self.commit_text
)
self.bottom_layout = qtutils.hbox(
defs.no_margin,
defs.spacing,
qtutils.STRETCH,
self.button_close,
self.button_export,
self.button_cherrypick,
)
self.main_layout = qtutils.vbox(
defs.margin,
defs.spacing,
self.top_layout,
self.splitter,
self.bottom_layout,
)
self.setLayout(self.main_layout)
self.init_size(parent=parent)
def search(context):
"""Return a callback to handle various search actions."""
return search_commits(context, qtutils.active_window())
class SearchEngine:
def __init__(self, context, model):
self.context = context
self.model = model
def rev_args(self):
max_count = self.model.max_count
return {
'no_color': True,
'max-count': max_count,
'pretty': 'format:%H %aN - %s - %ar',
}
def common_args(self):
return (self.model.query, self.rev_args())
def search(self):
if self.validate():
return self.results()
return []
def validate(self):
return len(self.model.query) > 1
def revisions(self, *args, **kwargs):
git = self.context.git
revlist = git.log(*args, **kwargs)[STDOUT]
return gitcmds.parse_rev_list(revlist)
def results(self):
pass
class RevisionSearch(SearchEngine):
def results(self):
query, opts = self.common_args()
args = utils.shell_split(query)
return self.revisions(*args, **opts)
class PathSearch(SearchEngine):
def results(self):
query, args = self.common_args()
paths = ['--'] + utils.shell_split(query)
return self.revisions(all=True, *paths, **args)
class MessageSearch(SearchEngine):
def results(self):
query, kwargs = self.common_args()
return self.revisions(all=True, grep=query, **kwargs)
class AuthorSearch(SearchEngine):
def results(self):
query, kwargs = self.common_args()
return self.revisions(all=True, author=query, **kwargs)
class CommitterSearch(SearchEngine):
def results(self):
query, kwargs = self.common_args()
return self.revisions(all=True, committer=query, **kwargs)
class DiffSearch(SearchEngine):
def results(self):
git = self.context.git
query, kwargs = self.common_args()
return gitcmds.parse_rev_list(git.log('-S' + query, all=True, **kwargs)[STDOUT])
class DateRangeSearch(SearchEngine):
def validate(self):
return self.model.start_date < self.model.end_date
def results(self):
kwargs = self.rev_args()
start_date = self.model.start_date
end_date = self.model.end_date
return self.revisions(
date='iso', all=True, after=start_date, before=end_date, **kwargs
)
class Search(SearchWidget):
def __init__(self, context, model, parent):
"""
Search diffs and commit logs
:param model: SearchOptions instance
"""
SearchWidget.__init__(self, context, parent)
self.model = model
self.EXPR = N_('Search by Expression')
self.PATH = N_('Search by Path')
self.MESSAGE = N_('Search Commit Messages')
self.DIFF = N_('Search Diffs')
self.AUTHOR = N_('Search Authors')
self.COMMITTER = N_('Search Committers')
self.DATE_RANGE = N_('Search Date Range')
self.results = []
# Each search type is handled by a distinct SearchEngine subclass
self.engines = {
self.EXPR: RevisionSearch,
self.PATH: PathSearch,
self.MESSAGE: MessageSearch,
self.DIFF: DiffSearch,
self.AUTHOR: AuthorSearch,
self.COMMITTER: CommitterSearch,
self.DATE_RANGE: DateRangeSearch,
}
self.modes = (
self.EXPR,
self.PATH,
self.DATE_RANGE,
self.DIFF,
self.MESSAGE,
self.AUTHOR,
self.COMMITTER,
)
self.mode_combo.addItems(self.modes)
connect_button(self.search_button, self.search_callback)
connect_button(self.browse_button, self.browse_callback)
connect_button(self.button_export, self.export_patch)
connect_button(self.button_cherrypick, self.cherry_pick)
connect_button(self.button_close, self.accept)
self.mode_combo.currentIndexChanged.connect(self.mode_changed)
self.commit_list.itemSelectionChanged.connect(self.display)
self.set_start_date(mkdate(time.time() - (87640 * 31)))
self.set_end_date(mkdate(time.time() + 87640))
self.set_mode(self.EXPR)
self.query.setFocus()
def mode_changed(self, _idx):
mode = self.mode()
self.update_shown_widgets(mode)
if mode == self.PATH:
self.browse_callback()
def set_commits(self, commits):
widget = self.commit_list
widget.clear()
widget.addItems(commits)
def set_start_date(self, datestr):
set_date(self.start_date, datestr)
def set_end_date(self, datestr):
set_date(self.end_date, datestr)
def set_mode(self, mode):
idx = self.modes.index(mode)
self.mode_combo.setCurrentIndex(idx)
self.update_shown_widgets(mode)
def update_shown_widgets(self, mode):
date_shown = mode == self.DATE_RANGE
browse_shown = mode == self.PATH
self.query.setVisible(not date_shown)
self.browse_button.setVisible(browse_shown)
self.start_date.setVisible(date_shown)
self.end_date.setVisible(date_shown)
def mode(self):
return self.mode_combo.currentText()
def search_callback(self, *args):
engineclass = self.engines[self.mode()]
self.model.query = get(self.query)
self.model.max_count = get(self.max_count)
self.model.start_date = get(self.start_date)
self.model.end_date = get(self.end_date)
self.results = engineclass(self.context, self.model).search()
if self.results:
self.display_results()
else:
self.commit_list.clear()
self.commit_text.setText('')
def browse_callback(self):
paths = qtutils.open_files(N_('Choose Paths'))
if not paths:
return
filepaths = []
curdir = core.getcwd()
prefix_len = len(curdir) + 1
for path in paths:
if not path.startswith(curdir):
continue
relpath = path[prefix_len:]
if relpath:
filepaths.append(relpath)
query = core.list2cmdline(filepaths)
self.query.setText(query)
if query:
self.search_callback()
def display_results(self):
commits = [result[1] for result in self.results]
self.set_commits(commits)
def selected_revision(self):
result = qtutils.selected_item(self.commit_list, self.results)
return result[0] if result else None
def display(self, *args):
context = self.context
revision = self.selected_revision()
if revision is None:
self.commit_text.setText('')
else:
qtutils.set_clipboard(revision)
diff_text = gitcmds.commit_diff(context, revision)
self.commit_text.setText(diff_text)
def export_patch(self):
context = self.context
revision = self.selected_revision()
if revision is not None:
Interaction.log_status(
*gitcmds.export_patchset(context, revision, revision)
)
def cherry_pick(self):
git = self.context.git
revision = self.selected_revision()
if revision is not None:
Interaction.log_status(*git.cherry_pick(revision))
def set_date(widget, datestr):
fmt = Qt.ISODate
date = QtCore.QDate.fromString(datestr, fmt)
if date:
widget.setDate(date)
def search_commits(context, parent):
opts = SearchOptions()
widget = Search(context, opts, parent)
widget.show()
return widget
|