History - Kiln » TortoiseHg » TortoiseHg - Kiln

We are currently indexing your data, so search results may be incomplete until we finish.

This is a Mercurial-only repository.

TortoiseHg »

TortoiseHg

Clone URL:

Copy to Clipboard

Pushed to one repository ·

View In Graph Contained in tip

fogcreek wctxactions: properly handle the case where kbfiles is not yet in use

Changeset f1ce494fb484 …

Parent 057a60864ad4 …

by David Golub Jul 7 11 at 8:09 PM

Changes to one file · Browse files at f1ce494fb484 Showing diff from parent 057a60864ad4 Diff from another changeset...

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/wctxactions.py Stacked
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 379 380 381 382 383 384 385 386 387 388 389 390 391 392	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 379 380 381 382 383 384 385 386 387 388 389 390 391 392	`# wctxactions.py - menu and responses for working copy files` `#` `# Copyright 2010 Steve Borho <steve@borho.org>` `#` `# This software may be used and distributed according to the terms of the` `# GNU General Public License version 2, incorporated herein by reference.` `import os` `import re` `from mercurial import util, error, merge, commands, extensions, match` `from tortoisehg.hgqt import qtlib, htmlui, visdiff` `from tortoisehg.util import hglib, shlib` `from tortoisehg.hgqt.i18n import _` `from PyQt4.QtCore import Qt, QObject, QDir` `from PyQt4.QtGui import ` `class WctxActions(QObject):` `'container class for working context actions'` `def __init__(self, repo, parent):` `super(WctxActions, self).__init__(parent)` `self.menu = QMenu(parent)` `self.repo = repo` `allactions = []` `def make(text, func, types, icon=None, keys=None):` `action = QAction(text, parent)` `action._filetypes = types` `action._runfunc = func` `if icon:` `action.setIcon(qtlib.getmenuicon(icon))` `if keys:` `action.setShortcut(QKeySequence(keys))` `action.triggered.connect(self.runAction)` `parent.addAction(action)` `allactions.append(action)` `make(_('&Visual Diff'), vdiff, frozenset('MAR!'), 'visualdiff', 'CTRL+D')` `make(_('Copy patch'), copyPatch, frozenset('MAR!'), 'copy-patch')` `make(_('Edit'), edit, frozenset('MACI?'), 'edit-file', 'SHIFT+CTRL+E')` `make(_('Copy path'), copyPath, frozenset('MARC?!I'), '')` `make(_('View missing'), viewmissing, frozenset('R!'))` `allactions.append(None)` `make(_('&Revert...'), revert, frozenset('MAR!'), 'hg-revert')` `make(_('&Add'), add, frozenset('R'), 'fileadd')` `allactions.append(None)` `make(_('File History'), log, frozenset('MARC!'), 'hg-log')` `make(_('&Annotate'), annotate, frozenset('MARC!'), 'hg-annotate')` `allactions.append(None)` `make(_('&Forget'), forget, frozenset('MAC!'), 'filedelete')` `make(_('&Add'), add, frozenset('I?'), 'fileadd')` `if 'kbfiles' in self.repo.extensions():` `make(_('Add &Bfiles'), addbf, frozenset('I?'))` `make(_('&Detect Renames...'), guessRename, frozenset('A?!'),` `'detect_rename')` `make(_('&Ignore...'), ignore, frozenset('?'), 'ignore')` `make(_('Remove versioned'), remove, frozenset('C'), 'remove')` `make(_('&Delete unversioned...'), delete, frozenset('?I'), 'hg-purge')` `allactions.append(None)` `make(_('Mark unresolved'), unmark, frozenset('r'))` `make(_('Mark resolved'), mark, frozenset('u'))` `self.allactions = allactions` `def updateActionSensitivity(self, selrows):` `'Enable/Disable permanent actions based on current selection'` `self.selrows = selrows` `alltypes = set()` `for types, wfile in selrows:` `alltypes \|= types` `for action in self.allactions:` `if action is not None:` `action.setEnabled(bool(action._filetypes & alltypes))` `def makeMenu(self, selrows):` `self.selrows = selrows` `repo, menu = self.repo, self.menu` `alltypes = set()` `for types, wfile in selrows:` `alltypes \|= types` `menu.clear()` `addedActions = False` `for action in self.allactions:` `if action is None:` `if addedActions:` `menu.addSeparator()` `addedActions = False` `elif action._filetypes & alltypes:` `menu.addAction(action)` `addedActions = True` `def make(text, func, types, icon=None):` `if not types & alltypes:` `return` `action = menu.addAction(text)` `action._filetypes = types` `action._runfunc = func` `if icon:` `action.setIcon(qtlib.getmenuicon(icon))` `action.triggered.connect(self.runAction)` `if len(repo.parents()) > 1:` `make(_('View other'), viewother, frozenset('MA'))` `if len(selrows) == 1:` `menu.addSeparator()` `make(_('&Copy...'), copy, frozenset('MC'), 'edit-copy')` `make(_('Rename...'), rename, frozenset('MC'), 'hg-rename')` `# Add 'was renamed from' actions for unknown files` `t, path = selrows[0]` `wctx = self.repo[None]` `if t & frozenset('?') and wctx.deleted():` `rmenu = QMenu(_('Was renamed from'), self.parent())` `for d in wctx.deleted()[:15]:` `def mkaction(deleted):` `a = rmenu.addAction(hglib.tounicode(deleted))` `a.triggered.connect(lambda: renamefromto(repo, deleted, path))` `mkaction(d)` `menu.addSeparator()` `menu.addMenu(rmenu)` `# Add restart merge actions for resolved files` `if alltypes & frozenset('u'):` `f = make(_('Restart Merge...'), resolve, frozenset('u'))` `files = [f for t, f in selrows if 'u' in t]` `rmenu = QMenu(_('Restart merge with'), self.parent())` `for tool in hglib.mergetools(repo.ui):` `def mkaction(rtool):` `a = rmenu.addAction(hglib.tounicode(rtool))` `a.triggered.connect(lambda: resolve_with(rtool, repo, files))` `mkaction(tool)` `menu.addSeparator()` `menu.addMenu(rmenu)` `return menu` `def runAction(self):` `'run wrapper for all action methods'` `repo, action, parent = self.repo, self.sender(), self.parent()` `func = action._runfunc` `files = [wfile for t, wfile in self.selrows if t & action._filetypes]` `hu = htmlui.htmlui()` `name = func.__name__.title()` `notify = False` `cwd = os.getcwd()` `try:` `os.chdir(repo.root)` `try:` `# All operations should quietly succeed. Any error should` `# result in a message box` `notify = func(parent, hu, repo, files)` `o, e = hu.getdata()` `if e:` `QMessageBox.warning(parent, name + _(' errors'),` `hglib.tounicode(str(e)))` `elif o:` `QMessageBox.information(parent, name + _(' output'),` `hglib.tounicode(str(o)))` `elif notify:` `wfiles = [repo.wjoin(x) for x in files]` `shlib.shell_notify(wfiles)` `except (IOError, OSError), e:` `err = hglib.tounicode(str(e))` `QMessageBox.critical(parent, name + _(' Aborted'), err)` `except util.Abort, e:` `if e.hint:` `err = _('%s (hint: %s)') % (hglib.tounicode(str(e)),` `hglib.tounicode(e.hint))` `else:` `err = hglib.tounicode(str(e))` `QMessageBox.critical(parent, name + _(' Aborted'), err)` `except (error.LookupError), e:` `err = hglib.tounicode(str(e))` `QMessageBox.critical(parent, name + _(' Aborted'), err)` `finally:` `os.chdir(cwd)` `return notify` `def renamefromto(repo, deleted, unknown):` `repo[None].copy(deleted, unknown)` `repo[None].forget([deleted]) # !->R` `def copyPatch(parent, ui, repo, files):` `ui.pushbuffer()` `try:` `commands.diff(ui, repo, files)` `except Exception, e:` `ui.popbuffer()` `if 'THGDEBUG' in os.environ:` `import traceback` `traceback.print_exc()` `return` `output = ui.popbuffer()` `QApplication.clipboard().setText(hglib.tounicode(output))` `def copyPath(parent, ui, repo, files):` `clip = QApplication.clipboard()` `absfiles = [hglib.fromunicode(QDir.toNativeSeparators(repo.wjoin(fname)))` `for fname in files]` `clip.setText(os.linesep.join(absfiles))` `def vdiff(parent, ui, repo, files):` `dlg = visdiff.visualdiff(ui, repo, files, {})` `if dlg:` `dlg.exec_()` `def edit(parent, ui, repo, files, lineno=None, search=None):` `qtlib.editfiles(repo, files, lineno, search, parent)` `def viewmissing(parent, ui, repo, files):` `base, _ = visdiff.snapshot(repo, files, repo['.'])` `edit(parent, ui, repo, [os.path.join(base, f) for f in files])` `def viewother(parent, ui, repo, files):` `wctx = repo[None]` `assert bool(wctx.p2())` `base, _ = visdiff.snapshot(repo, files, wctx.p2())` `edit(parent, ui, repo, [os.path.join(base, f) for f in files])` `def revert(parent, ui, repo, files):` `revertopts = {'date': None, 'rev': '.'}` `if len(repo.parents()) > 1:` `res = qtlib.CustomPrompt(` `_('Uncommited merge - please select a parent revision'),` `_('Revert files to local or other parent?'), parent,` `(_('&Local'), _('&Other'), _('Cancel')), 0, 2, files).run()` `if res == 0:` `revertopts['rev'] = repo[None].p1().rev()` `elif res == 1:` `revertopts['rev'] = repo[None].p2().rev()` `else:` `return` `commands.revert(ui, repo, files, revertopts)` `else:` `res = qtlib.CustomPrompt(` `_('Confirm Revert'),` `_('Revert local file changes?'), parent,` `(_('&Revert with backup'), _('&Discard changes'),` `_('Cancel')), 2, 2, files).run()` `if res == 2:` `return False` `if res == 1:` `revertopts['no_backup'] = True` `commands.revert(ui, repo, files, *revertopts)` `return True` `def log(parent, ui, repo, files):` `from tortoisehg.hgqt.workbench import run` `from tortoisehg.hgqt.run import qtrun` `opts = {'root': repo.root}` `qtrun(run, repo.ui, files, opts)` `return False` `def annotate(parent, ui, repo, files):` `from tortoisehg.hgqt.manifestdialog import run` `from tortoisehg.hgqt.run import qtrun` `opts = {'repo': repo, 'canonpath' : files[0], 'rev' : repo['.'].rev()}` `qtrun(run, repo.ui, opts)` `return False` `def forget(parent, ui, repo, files):` `commands.forget(ui, repo, files)` `return True` `def add(parent, ui, repo, files):` `if 'kbfiles' in repo.extensions():` `bfiles = []`-`minsize = int(ui.config('kilnbfiles', 'size', default=10))`+`usekbf = os.path.exists(repo.wjoin('.kbf'))`+`minsize = int(ui.config('kilnbfiles', 'size', default='10'))` `patterns = ui.config('kilnbfiles', 'patterns', default=())` `if patterns:` `patterns = patterns.split(' ')` `matcher = match.match(repo.root, '', list(patterns))` `else:` `matcher = None`-`if minsize == 0 or minsize >= 10:`-`for wfile in files:`-`if not matcher or not matcher(wfile):`-`filesize = os.path.getsize(repo.wjoin(wfile))`-`if filesize >= 1010241024 and filesize < minsize10241024:`-`bfiles.append(wfile)`+`for wfile in files:`+`if not matcher or not matcher(wfile) or not usekbf:`+`filesize = os.path.getsize(repo.wjoin(wfile))`+`if filesize >= 1010241024 and (filesize < minsize10241024 or not usekbf):`+`bfiles.append(wfile)` `if bfiles:` `ret = qtlib.BfilesPrompt(parent, files).run()` `if ret == 0:` `# add as bfiles` `for bfile in bfiles:` `files.remove(bfile)` `elif ret == 1:` `# add as normal files` `bfiles = []` `elif ret == 2:` `return False` `for name, module in extensions.extensions():` `if name == 'kbfiles':` `override_add = module.bfsetup.override_add` `if files:` `override_add(commands.add, ui, repo, files)` `if bfiles:` `override_add(commands.add, ui, repo, bfiles, bf=1)` `return True` `commands.add(ui, repo, files)` `return True` `def addbf(parent, ui, repo, files):` `for name, module in extensions.extensions():` `if name == 'kbfiles':` `override_add = module.bfsetup.override_add` `override_add(commands.add, ui, repo, files, bf=True)` `return True` `return False` `def guessRename(parent, ui, repo, files):` `from tortoisehg.hgqt.guess import DetectRenameDialog` `dlg = DetectRenameDialog(repo, parent, files)` `def matched():` `ret = True` `ret = False` `dlg.matchAccepted.connect(matched)` `dlg.finished.connect(dlg.deleteLater)` `dlg.exec_()` `return ret` `def ignore(parent, ui, repo, files):` `from tortoisehg.hgqt.hgignore import HgignoreDialog` `dlg = HgignoreDialog(repo, parent, files)` `dlg.finished.connect(dlg.deleteLater)` `return dlg.exec_() == QDialog.Accepted` `def remove(parent, ui, repo, files):` `commands.remove(ui, repo, files)` `return True` `def delete(parent, ui, repo, files):` `res = qtlib.CustomPrompt(` `_('Confirm Delete Unversioned'),` `_('Delete the following unversioned files?'),` `parent, (_('&Delete'), _('Cancel')), 1, 1, files).run()` `if res == 1:` `return` `for wfile in files:` `os.unlink(wfile)` `return True` `def copy(parent, ui, repo, files):` `assert len(files) == 1` `wfile = repo.wjoin(files[0])` `fd = QFileDialog(parent)` `fname = fd.getSaveFileName(parent, _('Copy file to'), wfile)` `if not fname:` `return` `fname = hglib.fromunicode(fname)` `wfiles = [wfile, fname]` `commands.copy(ui, repo, wfiles)` `return True` `def rename(parent, ui, repo, files):` `from tortoisehg.hgqt.rename import RenameDialog` `assert len(files) == 1` `dlg = RenameDialog(ui, files, parent)` `dlg.finished.connect(dlg.deleteLater)` `dlg.exec_()` `return True` `def unmark(parent, ui, repo, files):` `ms = merge.mergestate(repo)` `for wfile in files:` `ms.mark(wfile, 'u')` `ms.commit()` `return True` `def mark(parent, ui, repo, files):` `ms = merge.mergestate(repo)` `for wfile in files:` `ms.mark(wfile, 'r')` `ms.commit()` `return True` `def resolve(parent, ui, repo, files):` `commands.resolve(ui, repo, files)` `return True` `def resolve_with(tool, repo, files):` `opts = {'tool': tool}` `paths = [repo.wjoin(f) for f in files]` `commands.resolve(repo.ui, repo, paths, *opts)` `return True`