Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
- branch
- Py2 comp.
- changeset 3058
- 0a02c433f52d
- parent 3057
- 10516539f238
- parent 3025
- 67064c71df21
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3057:10516539f238 | 3058:0a02c433f52d |
|---|---|
| 205 font = act.font() | 205 font = act.font() |
| 206 font.setBold(True) | 206 font.setBold(True) |
| 207 act.setFont(font) | 207 act.setFont(font) |
| 208 menu.addSeparator() | 208 menu.addSeparator() |
| 209 | 209 |
| 210 act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), | 210 act = menu.addAction( |
| 211 UI.PixmapCache.getIcon("vcsUpdate.png"), | |
| 211 self.trUtf8('Update from repository'), self._VCSUpdate) | 212 self.trUtf8('Update from repository'), self._VCSUpdate) |
| 212 self.vcsMenuActions.append(act) | 213 self.vcsMenuActions.append(act) |
| 213 act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), | 214 act = menu.addAction( |
| 215 UI.PixmapCache.getIcon("vcsCommit.png"), | |
| 214 self.trUtf8('Commit changes to repository...'), | 216 self.trUtf8('Commit changes to repository...'), |
| 215 self._VCSCommit) | 217 self._VCSCommit) |
| 216 self.vcsMenuActions.append(act) | 218 self.vcsMenuActions.append(act) |
| 217 menu.addSeparator() | 219 menu.addSeparator() |
| 218 act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), | 220 act = menu.addAction( |
| 221 UI.PixmapCache.getIcon("vcsAdd.png"), | |
| 219 self.trUtf8('Add to repository'), | 222 self.trUtf8('Add to repository'), |
| 220 self._VCSAdd) | 223 self._VCSAdd) |
| 221 self.vcsAddMenuActions.append(act) | 224 self.vcsAddMenuActions.append(act) |
| 222 if 1 in self.browser.specialMenuEntries: | 225 if 1 in self.browser.specialMenuEntries: |
| 223 self.vcsMenuAddTree = menu.addAction( | 226 self.vcsMenuAddTree = menu.addAction( |
| 224 UI.PixmapCache.getIcon("vcsAdd.png"), | 227 UI.PixmapCache.getIcon("vcsAdd.png"), |
| 225 self.trUtf8('Add tree to repository'), | 228 self.trUtf8('Add tree to repository'), |
| 226 self._VCSAddTree) | 229 self._VCSAddTree) |
| 227 self.vcsAddMenuActions.append(self.vcsMenuAddTree) | 230 self.vcsAddMenuActions.append(self.vcsMenuAddTree) |
| 228 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), | 231 act = menu.addAction( |
| 232 UI.PixmapCache.getIcon("vcsRemove.png"), | |
| 229 self.trUtf8('Remove from repository (and disk)'), | 233 self.trUtf8('Remove from repository (and disk)'), |
| 230 self._VCSRemove) | 234 self._VCSRemove) |
| 231 self.vcsMenuActions.append(act) | 235 self.vcsMenuActions.append(act) |
| 232 menu.addSeparator() | 236 menu.addSeparator() |
| 233 act = menu.addAction(self.trUtf8('Copy'), self.__SVNCopy) | 237 act = menu.addAction(self.trUtf8('Copy'), self.__SVNCopy) |
| 234 self.vcsMenuActions.append(act) | 238 self.vcsMenuActions.append(act) |
| 235 act = menu.addAction(self.trUtf8('Move'), self.__SVNMove) | 239 act = menu.addAction(self.trUtf8('Move'), self.__SVNMove) |
| 236 self.vcsMenuActions.append(act) | 240 self.vcsMenuActions.append(act) |
| 237 if self.vcs.version >= (1, 5, 0): | 241 if self.vcs.version >= (1, 5, 0): |
| 238 menu.addSeparator() | 242 menu.addSeparator() |
| 239 act = menu.addAction(self.trUtf8("Add to Changelist"), | 243 act = menu.addAction( |
| 244 self.trUtf8("Add to Changelist"), | |
| 240 self.__SVNAddToChangelist) | 245 self.__SVNAddToChangelist) |
| 241 self.vcsMenuActions.append(act) | 246 self.vcsMenuActions.append(act) |
| 242 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 247 act = menu.addAction( |
| 248 self.trUtf8("Remove from Changelist"), | |
| 243 self.__SVNRemoveFromChangelist) | 249 self.__SVNRemoveFromChangelist) |
| 244 self.vcsMenuActions.append(act) | 250 self.vcsMenuActions.append(act) |
| 245 menu.addSeparator() | 251 menu.addSeparator() |
| 246 act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), | 252 act = menu.addAction( |
| 253 UI.PixmapCache.getIcon("vcsLog.png"), | |
| 247 self.trUtf8('Show log'), self._VCSLog) | 254 self.trUtf8('Show log'), self._VCSLog) |
| 248 self.vcsMenuActions.append(act) | 255 self.vcsMenuActions.append(act) |
| 249 act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), | 256 act = menu.addAction( |
| 257 UI.PixmapCache.getIcon("vcsLog.png"), | |
| 250 self.trUtf8('Show log browser'), self.__SVNLogBrowser) | 258 self.trUtf8('Show log browser'), self.__SVNLogBrowser) |
| 251 self.vcsMenuActions.append(act) | 259 self.vcsMenuActions.append(act) |
| 252 menu.addSeparator() | 260 menu.addSeparator() |
| 253 act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), | 261 act = menu.addAction( |
| 262 UI.PixmapCache.getIcon("vcsStatus.png"), | |
| 254 self.trUtf8('Show status'), self._VCSStatus) | 263 self.trUtf8('Show status'), self._VCSStatus) |
| 255 self.vcsMenuActions.append(act) | 264 self.vcsMenuActions.append(act) |
| 256 menu.addSeparator() | 265 menu.addSeparator() |
| 257 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 266 act = menu.addAction( |
| 267 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 258 self.trUtf8('Show difference'), self._VCSDiff) | 268 self.trUtf8('Show difference'), self._VCSDiff) |
| 259 self.vcsMenuActions.append(act) | 269 self.vcsMenuActions.append(act) |
| 260 act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 270 act = menu.addAction( |
| 271 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | |
| 261 self.trUtf8('Show difference side-by-side'), self.__SVNSbsDiff) | 272 self.trUtf8('Show difference side-by-side'), self.__SVNSbsDiff) |
| 262 self.vcsMenuActions.append(act) | 273 self.vcsMenuActions.append(act) |
| 263 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 274 act = menu.addAction( |
| 275 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 264 self.trUtf8('Show difference (extended)'), | 276 self.trUtf8('Show difference (extended)'), |
| 265 self.__SVNExtendedDiff) | 277 self.__SVNExtendedDiff) |
| 266 self.vcsMenuActions.append(act) | 278 self.vcsMenuActions.append(act) |
| 267 act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 279 act = menu.addAction( |
| 280 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | |
| 268 self.trUtf8('Show difference side-by-side (extended)'), | 281 self.trUtf8('Show difference side-by-side (extended)'), |
| 269 self.__SVNSbsExtendedDiff) | 282 self.__SVNSbsExtendedDiff) |
| 270 self.vcsMenuActions.append(act) | 283 self.vcsMenuActions.append(act) |
| 271 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 284 act = menu.addAction( |
| 285 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 272 self.trUtf8('Show difference (URLs)'), | 286 self.trUtf8('Show difference (URLs)'), |
| 273 self.__SVNUrlDiff) | 287 self.__SVNUrlDiff) |
| 274 self.vcsMenuActions.append(act) | 288 self.vcsMenuActions.append(act) |
| 275 self.blameAct = menu.addAction(self.trUtf8('Show annotated file'), | 289 self.blameAct = menu.addAction( |
| 290 self.trUtf8('Show annotated file'), | |
| 276 self.__SVNBlame) | 291 self.__SVNBlame) |
| 277 self.vcsMenuActions.append(self.blameAct) | 292 self.vcsMenuActions.append(self.blameAct) |
| 278 menu.addSeparator() | 293 menu.addSeparator() |
| 279 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 294 act = menu.addAction( |
| 295 UI.PixmapCache.getIcon("vcsRevert.png"), | |
| 280 self.trUtf8('Revert changes'), self._VCSRevert) | 296 self.trUtf8('Revert changes'), self._VCSRevert) |
| 281 self.vcsMenuActions.append(act) | 297 self.vcsMenuActions.append(act) |
| 282 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), | 298 act = menu.addAction( |
| 299 UI.PixmapCache.getIcon("vcsMerge.png"), | |
| 283 self.trUtf8('Merge changes'), self._VCSMerge) | 300 self.trUtf8('Merge changes'), self._VCSMerge) |
| 284 self.vcsMenuActions.append(act) | 301 self.vcsMenuActions.append(act) |
| 285 act = menu.addAction( | 302 act = menu.addAction( |
| 286 self.trUtf8('Conflict resolved'), self.__SVNResolve) | 303 self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 287 self.vcsMenuActions.append(act) | 304 self.vcsMenuActions.append(act) |
| 288 if self.vcs.version >= (1, 2, 0): | 305 if self.vcs.version >= (1, 2, 0): |
| 289 menu.addSeparator() | 306 menu.addSeparator() |
| 290 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), | 307 act = menu.addAction( |
| 308 UI.PixmapCache.getIcon("vcsLock.png"), | |
| 291 self.trUtf8('Lock'), self.__SVNLock) | 309 self.trUtf8('Lock'), self.__SVNLock) |
| 292 self.vcsMenuActions.append(act) | 310 self.vcsMenuActions.append(act) |
| 293 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), | 311 act = menu.addAction( |
| 312 UI.PixmapCache.getIcon("vcsUnlock.png"), | |
| 294 self.trUtf8('Unlock'), self.__SVNUnlock) | 313 self.trUtf8('Unlock'), self.__SVNUnlock) |
| 295 self.vcsMenuActions.append(act) | 314 self.vcsMenuActions.append(act) |
| 296 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), | 315 act = menu.addAction( |
| 316 UI.PixmapCache.getIcon("vcsUnlock.png"), | |
| 297 self.trUtf8('Break Lock'), self.__SVNBreakLock) | 317 self.trUtf8('Break Lock'), self.__SVNBreakLock) |
| 298 self.vcsMenuActions.append(act) | 318 self.vcsMenuActions.append(act) |
| 299 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), | 319 act = menu.addAction( |
| 320 UI.PixmapCache.getIcon("vcsUnlock.png"), | |
| 300 self.trUtf8('Steal Lock'), self.__SVNStealLock) | 321 self.trUtf8('Steal Lock'), self.__SVNStealLock) |
| 301 self.vcsMenuActions.append(act) | 322 self.vcsMenuActions.append(act) |
| 302 menu.addSeparator() | 323 menu.addSeparator() |
| 303 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) | 324 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) |
| 304 self.vcsMenuActions.append(act) | 325 self.vcsMenuActions.append(act) |
| 307 self.vcsMenuActions.append(act) | 328 self.vcsMenuActions.append(act) |
| 308 act = menu.addAction(self.trUtf8('Delete Property'), self.__SVNDelProp) | 329 act = menu.addAction(self.trUtf8('Delete Property'), self.__SVNDelProp) |
| 309 self.vcsMenuActions.append(act) | 330 self.vcsMenuActions.append(act) |
| 310 menu.addSeparator() | 331 menu.addSeparator() |
| 311 menu.addAction(self.trUtf8('Select all local file entries'), | 332 menu.addAction(self.trUtf8('Select all local file entries'), |
| 312 self.browser.selectLocalEntries) | 333 self.browser.selectLocalEntries) |
| 313 menu.addAction(self.trUtf8('Select all versioned file entries'), | 334 menu.addAction(self.trUtf8('Select all versioned file entries'), |
| 314 self.browser.selectVCSEntries) | 335 self.browser.selectVCSEntries) |
| 315 menu.addAction(self.trUtf8('Select all local directory entries'), | 336 menu.addAction(self.trUtf8('Select all local directory entries'), |
| 316 self.browser.selectLocalDirEntries) | 337 self.browser.selectLocalDirEntries) |
| 317 menu.addAction(self.trUtf8('Select all versioned directory entries'), | 338 menu.addAction(self.trUtf8('Select all versioned directory entries'), |
| 318 self.browser.selectVCSDirEntries) | 339 self.browser.selectVCSDirEntries) |
| 319 menu.addSeparator() | 340 menu.addSeparator() |
| 320 menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) | 341 menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) |
| 321 | 342 |
| 322 mainMenu.addSeparator() | 343 mainMenu.addSeparator() |
| 323 mainMenu.addMenu(menu) | 344 mainMenu.addMenu(menu) |
| 343 font = act.font() | 364 font = act.font() |
| 344 font.setBold(True) | 365 font.setBold(True) |
| 345 act.setFont(font) | 366 act.setFont(font) |
| 346 menu.addSeparator() | 367 menu.addSeparator() |
| 347 | 368 |
| 348 act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), | 369 act = menu.addAction( |
| 370 UI.PixmapCache.getIcon("vcsUpdate.png"), | |
| 349 self.trUtf8('Update from repository'), self._VCSUpdate) | 371 self.trUtf8('Update from repository'), self._VCSUpdate) |
| 350 self.vcsMultiMenuActions.append(act) | 372 self.vcsMultiMenuActions.append(act) |
| 351 act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), | 373 act = menu.addAction( |
| 374 UI.PixmapCache.getIcon("vcsCommit.png"), | |
| 352 self.trUtf8('Commit changes to repository...'), | 375 self.trUtf8('Commit changes to repository...'), |
| 353 self._VCSCommit) | 376 self._VCSCommit) |
| 354 self.vcsMultiMenuActions.append(act) | 377 self.vcsMultiMenuActions.append(act) |
| 355 menu.addSeparator() | 378 menu.addSeparator() |
| 356 act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), | 379 act = menu.addAction( |
| 380 UI.PixmapCache.getIcon("vcsAdd.png"), | |
| 357 self.trUtf8('Add to repository'), self._VCSAdd) | 381 self.trUtf8('Add to repository'), self._VCSAdd) |
| 358 self.vcsAddMultiMenuActions.append(act) | 382 self.vcsAddMultiMenuActions.append(act) |
| 359 if 1 in self.browser.specialMenuEntries: | 383 if 1 in self.browser.specialMenuEntries: |
| 360 self.vcsMultiMenuAddTree = \ | 384 self.vcsMultiMenuAddTree = menu.addAction( |
| 361 menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), | 385 UI.PixmapCache.getIcon("vcsAdd.png"), |
| 362 self.trUtf8('Add tree to repository'), self._VCSAddTree) | 386 self.trUtf8('Add tree to repository'), self._VCSAddTree) |
| 363 self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) | 387 self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) |
| 364 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), | 388 act = menu.addAction( |
| 389 UI.PixmapCache.getIcon("vcsRemove.png"), | |
| 365 self.trUtf8('Remove from repository (and disk)'), | 390 self.trUtf8('Remove from repository (and disk)'), |
| 366 self._VCSRemove) | 391 self._VCSRemove) |
| 367 self.vcsMultiMenuActions.append(act) | 392 self.vcsMultiMenuActions.append(act) |
| 368 if self.vcs.version >= (1, 5, 0): | 393 if self.vcs.version >= (1, 5, 0): |
| 369 menu.addSeparator() | 394 menu.addSeparator() |
| 370 act = menu.addAction(self.trUtf8("Add to Changelist"), | 395 act = menu.addAction( |
| 396 self.trUtf8("Add to Changelist"), | |
| 371 self.__SVNAddToChangelist) | 397 self.__SVNAddToChangelist) |
| 372 self.vcsMenuActions.append(act) | 398 self.vcsMenuActions.append(act) |
| 373 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 399 act = menu.addAction( |
| 400 self.trUtf8("Remove from Changelist"), | |
| 374 self.__SVNRemoveFromChangelist) | 401 self.__SVNRemoveFromChangelist) |
| 375 self.vcsMenuActions.append(act) | 402 self.vcsMenuActions.append(act) |
| 376 menu.addSeparator() | 403 menu.addSeparator() |
| 377 act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), | 404 act = menu.addAction( |
| 405 UI.PixmapCache.getIcon("vcsStatus.png"), | |
| 378 self.trUtf8('Show status'), self._VCSStatus) | 406 self.trUtf8('Show status'), self._VCSStatus) |
| 379 self.vcsMultiMenuActions.append(act) | 407 self.vcsMultiMenuActions.append(act) |
| 380 menu.addSeparator() | 408 menu.addSeparator() |
| 381 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 409 act = menu.addAction( |
| 410 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 382 self.trUtf8('Show difference'), self._VCSDiff) | 411 self.trUtf8('Show difference'), self._VCSDiff) |
| 383 self.vcsMultiMenuActions.append(act) | 412 self.vcsMultiMenuActions.append(act) |
| 384 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 413 act = menu.addAction( |
| 414 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 385 self.trUtf8('Show difference (extended)'), | 415 self.trUtf8('Show difference (extended)'), |
| 386 self.__SVNExtendedDiff) | 416 self.__SVNExtendedDiff) |
| 387 self.vcsMultiMenuActions.append(act) | 417 self.vcsMultiMenuActions.append(act) |
| 388 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 418 act = menu.addAction( |
| 419 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 389 self.trUtf8('Show difference (URLs)'), | 420 self.trUtf8('Show difference (URLs)'), |
| 390 self.__SVNUrlDiff) | 421 self.__SVNUrlDiff) |
| 391 self.vcsMultiMenuActions.append(act) | 422 self.vcsMultiMenuActions.append(act) |
| 392 menu.addSeparator() | 423 menu.addSeparator() |
| 393 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 424 act = menu.addAction( |
| 425 UI.PixmapCache.getIcon("vcsRevert.png"), | |
| 394 self.trUtf8('Revert changes'), self._VCSRevert) | 426 self.trUtf8('Revert changes'), self._VCSRevert) |
| 395 self.vcsMultiMenuActions.append(act) | 427 self.vcsMultiMenuActions.append(act) |
| 396 act = menu.addAction( | 428 act = menu.addAction( |
| 397 self.trUtf8('Conflict resolved'), self.__SVNResolve) | 429 self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 398 self.vcsMultiMenuActions.append(act) | 430 self.vcsMultiMenuActions.append(act) |
| 399 if self.vcs.version >= (1, 2, 0): | 431 if self.vcs.version >= (1, 2, 0): |
| 400 menu.addSeparator() | 432 menu.addSeparator() |
| 401 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), | 433 act = menu.addAction( |
| 434 UI.PixmapCache.getIcon("vcsLock.png"), | |
| 402 self.trUtf8('Lock'), self.__SVNLock) | 435 self.trUtf8('Lock'), self.__SVNLock) |
| 403 self.vcsMultiMenuActions.append(act) | 436 self.vcsMultiMenuActions.append(act) |
| 404 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), | 437 act = menu.addAction( |
| 438 UI.PixmapCache.getIcon("vcsUnlock.png"), | |
| 405 self.trUtf8('Unlock'), self.__SVNUnlock) | 439 self.trUtf8('Unlock'), self.__SVNUnlock) |
| 406 self.vcsMultiMenuActions.append(act) | 440 self.vcsMultiMenuActions.append(act) |
| 407 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), | 441 act = menu.addAction( |
| 442 UI.PixmapCache.getIcon("vcsUnlock.png"), | |
| 408 self.trUtf8('Break Lock'), self.__SVNBreakLock) | 443 self.trUtf8('Break Lock'), self.__SVNBreakLock) |
| 409 self.vcsMultiMenuActions.append(act) | 444 self.vcsMultiMenuActions.append(act) |
| 410 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), | 445 act = menu.addAction( |
| 446 UI.PixmapCache.getIcon("vcsUnlock.png"), | |
| 411 self.trUtf8('Steal Lock'), self.__SVNStealLock) | 447 self.trUtf8('Steal Lock'), self.__SVNStealLock) |
| 412 self.vcsMultiMenuActions.append(act) | 448 self.vcsMultiMenuActions.append(act) |
| 413 menu.addSeparator() | 449 menu.addSeparator() |
| 414 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) | 450 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) |
| 415 self.vcsMultiMenuActions.append(act) | 451 self.vcsMultiMenuActions.append(act) |
| 418 self.vcsMultiMenuActions.append(act) | 454 self.vcsMultiMenuActions.append(act) |
| 419 act = menu.addAction(self.trUtf8('Delete Property'), self.__SVNDelProp) | 455 act = menu.addAction(self.trUtf8('Delete Property'), self.__SVNDelProp) |
| 420 self.vcsMultiMenuActions.append(act) | 456 self.vcsMultiMenuActions.append(act) |
| 421 menu.addSeparator() | 457 menu.addSeparator() |
| 422 menu.addAction(self.trUtf8('Select all local file entries'), | 458 menu.addAction(self.trUtf8('Select all local file entries'), |
| 423 self.browser.selectLocalEntries) | 459 self.browser.selectLocalEntries) |
| 424 menu.addAction(self.trUtf8('Select all versioned file entries'), | 460 menu.addAction(self.trUtf8('Select all versioned file entries'), |
| 425 self.browser.selectVCSEntries) | 461 self.browser.selectVCSEntries) |
| 426 menu.addAction(self.trUtf8('Select all local directory entries'), | 462 menu.addAction(self.trUtf8('Select all local directory entries'), |
| 427 self.browser.selectLocalDirEntries) | 463 self.browser.selectLocalDirEntries) |
| 428 menu.addAction(self.trUtf8('Select all versioned directory entries'), | 464 menu.addAction(self.trUtf8('Select all versioned directory entries'), |
| 429 self.browser.selectVCSDirEntries) | 465 self.browser.selectVCSDirEntries) |
| 430 menu.addSeparator() | 466 menu.addSeparator() |
| 431 menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) | 467 menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) |
| 432 | 468 |
| 433 mainMenu.addSeparator() | 469 mainMenu.addSeparator() |
| 434 mainMenu.addMenu(menu) | 470 mainMenu.addMenu(menu) |
| 451 font.setBold(True) | 487 font.setBold(True) |
| 452 act.setFont(font) | 488 act.setFont(font) |
| 453 menu.addSeparator() | 489 menu.addSeparator() |
| 454 | 490 |
| 455 menu.addAction(self.trUtf8('Select all local file entries'), | 491 menu.addAction(self.trUtf8('Select all local file entries'), |
| 456 self.browser.selectLocalEntries) | 492 self.browser.selectLocalEntries) |
| 457 menu.addAction(self.trUtf8('Select all versioned file entries'), | 493 menu.addAction(self.trUtf8('Select all versioned file entries'), |
| 458 self.browser.selectVCSEntries) | 494 self.browser.selectVCSEntries) |
| 459 menu.addAction(self.trUtf8('Select all local directory entries'), | 495 menu.addAction(self.trUtf8('Select all local directory entries'), |
| 460 self.browser.selectLocalDirEntries) | 496 self.browser.selectLocalDirEntries) |
| 461 menu.addAction(self.trUtf8('Select all versioned directory entries'), | 497 menu.addAction(self.trUtf8('Select all versioned directory entries'), |
| 462 self.browser.selectVCSDirEntries) | 498 self.browser.selectVCSDirEntries) |
| 463 menu.addSeparator() | 499 menu.addSeparator() |
| 464 menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) | 500 menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) |
| 465 | 501 |
| 466 mainMenu.addSeparator() | 502 mainMenu.addSeparator() |
| 467 mainMenu.addMenu(menu) | 503 mainMenu.addMenu(menu) |
| 489 font = act.font() | 525 font = act.font() |
| 490 font.setBold(True) | 526 font.setBold(True) |
| 491 act.setFont(font) | 527 act.setFont(font) |
| 492 menu.addSeparator() | 528 menu.addSeparator() |
| 493 | 529 |
| 494 act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), | 530 act = menu.addAction( |
| 531 UI.PixmapCache.getIcon("vcsUpdate.png"), | |
| 495 self.trUtf8('Update from repository'), self._VCSUpdate) | 532 self.trUtf8('Update from repository'), self._VCSUpdate) |
| 496 self.vcsDirMenuActions.append(act) | 533 self.vcsDirMenuActions.append(act) |
| 497 act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), | 534 act = menu.addAction( |
| 535 UI.PixmapCache.getIcon("vcsCommit.png"), | |
| 498 self.trUtf8('Commit changes to repository...'), | 536 self.trUtf8('Commit changes to repository...'), |
| 499 self._VCSCommit) | 537 self._VCSCommit) |
| 500 self.vcsDirMenuActions.append(act) | 538 self.vcsDirMenuActions.append(act) |
| 501 menu.addSeparator() | 539 menu.addSeparator() |
| 502 act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), | 540 act = menu.addAction( |
| 541 UI.PixmapCache.getIcon("vcsAdd.png"), | |
| 503 self.trUtf8('Add to repository'), self._VCSAdd) | 542 self.trUtf8('Add to repository'), self._VCSAdd) |
| 504 self.vcsAddDirMenuActions.append(act) | 543 self.vcsAddDirMenuActions.append(act) |
| 505 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), | 544 act = menu.addAction( |
| 545 UI.PixmapCache.getIcon("vcsRemove.png"), | |
| 506 self.trUtf8('Remove from repository (and disk)'), | 546 self.trUtf8('Remove from repository (and disk)'), |
| 507 self._VCSRemove) | 547 self._VCSRemove) |
| 508 self.vcsDirMenuActions.append(act) | 548 self.vcsDirMenuActions.append(act) |
| 509 menu.addSeparator() | 549 menu.addSeparator() |
| 510 act = menu.addAction(self.trUtf8('Copy'), self.__SVNCopy) | 550 act = menu.addAction(self.trUtf8('Copy'), self.__SVNCopy) |
| 511 self.vcsDirMenuActions.append(act) | 551 self.vcsDirMenuActions.append(act) |
| 512 act = menu.addAction(self.trUtf8('Move'), self.__SVNMove) | 552 act = menu.addAction(self.trUtf8('Move'), self.__SVNMove) |
| 513 self.vcsDirMenuActions.append(act) | 553 self.vcsDirMenuActions.append(act) |
| 514 if self.vcs.version >= (1, 5, 0): | 554 if self.vcs.version >= (1, 5, 0): |
| 515 menu.addSeparator() | 555 menu.addSeparator() |
| 516 act = menu.addAction(self.trUtf8("Add to Changelist"), | 556 act = menu.addAction( |
| 557 self.trUtf8("Add to Changelist"), | |
| 517 self.__SVNAddToChangelist) | 558 self.__SVNAddToChangelist) |
| 518 self.vcsMenuActions.append(act) | 559 self.vcsMenuActions.append(act) |
| 519 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 560 act = menu.addAction( |
| 561 self.trUtf8("Remove from Changelist"), | |
| 520 self.__SVNRemoveFromChangelist) | 562 self.__SVNRemoveFromChangelist) |
| 521 self.vcsMenuActions.append(act) | 563 self.vcsMenuActions.append(act) |
| 522 menu.addSeparator() | 564 menu.addSeparator() |
| 523 act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), | 565 act = menu.addAction( |
| 566 UI.PixmapCache.getIcon("vcsLog.png"), | |
| 524 self.trUtf8('Show log'), self._VCSLog) | 567 self.trUtf8('Show log'), self._VCSLog) |
| 525 self.vcsDirMenuActions.append(act) | 568 self.vcsDirMenuActions.append(act) |
| 526 act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), | 569 act = menu.addAction( |
| 570 UI.PixmapCache.getIcon("vcsLog.png"), | |
| 527 self.trUtf8('Show log browser'), self.__SVNLogBrowser) | 571 self.trUtf8('Show log browser'), self.__SVNLogBrowser) |
| 528 self.vcsDirMenuActions.append(act) | 572 self.vcsDirMenuActions.append(act) |
| 529 menu.addSeparator() | 573 menu.addSeparator() |
| 530 act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), | 574 act = menu.addAction( |
| 575 UI.PixmapCache.getIcon("vcsStatus.png"), | |
| 531 self.trUtf8('Show status'), self._VCSStatus) | 576 self.trUtf8('Show status'), self._VCSStatus) |
| 532 self.vcsDirMenuActions.append(act) | 577 self.vcsDirMenuActions.append(act) |
| 533 menu.addSeparator() | 578 menu.addSeparator() |
| 534 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 579 act = menu.addAction( |
| 580 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 535 self.trUtf8('Show difference'), self._VCSDiff) | 581 self.trUtf8('Show difference'), self._VCSDiff) |
| 536 self.vcsDirMenuActions.append(act) | 582 self.vcsDirMenuActions.append(act) |
| 537 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 583 act = menu.addAction( |
| 584 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 538 self.trUtf8('Show difference (extended)'), | 585 self.trUtf8('Show difference (extended)'), |
| 539 self.__SVNExtendedDiff) | 586 self.__SVNExtendedDiff) |
| 540 self.vcsDirMenuActions.append(act) | 587 self.vcsDirMenuActions.append(act) |
| 541 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 588 act = menu.addAction( |
| 589 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 542 self.trUtf8('Show difference (URLs)'), | 590 self.trUtf8('Show difference (URLs)'), |
| 543 self.__SVNUrlDiff) | 591 self.__SVNUrlDiff) |
| 544 self.vcsDirMenuActions.append(act) | 592 self.vcsDirMenuActions.append(act) |
| 545 menu.addSeparator() | 593 menu.addSeparator() |
| 546 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 594 act = menu.addAction( |
| 595 UI.PixmapCache.getIcon("vcsRevert.png"), | |
| 547 self.trUtf8('Revert changes'), self._VCSRevert) | 596 self.trUtf8('Revert changes'), self._VCSRevert) |
| 548 self.vcsDirMenuActions.append(act) | 597 self.vcsDirMenuActions.append(act) |
| 549 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), | 598 act = menu.addAction( |
| 599 UI.PixmapCache.getIcon("vcsMerge.png"), | |
| 550 self.trUtf8('Merge changes'), self._VCSMerge) | 600 self.trUtf8('Merge changes'), self._VCSMerge) |
| 551 self.vcsDirMenuActions.append(act) | 601 self.vcsDirMenuActions.append(act) |
| 552 act = menu.addAction( | 602 act = menu.addAction( |
| 553 self.trUtf8('Conflict resolved'), self.__SVNResolve) | 603 self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 554 self.vcsDirMenuActions.append(act) | 604 self.vcsDirMenuActions.append(act) |
| 560 self.vcsDirMenuActions.append(act) | 610 self.vcsDirMenuActions.append(act) |
| 561 act = menu.addAction(self.trUtf8('Delete Property'), self.__SVNDelProp) | 611 act = menu.addAction(self.trUtf8('Delete Property'), self.__SVNDelProp) |
| 562 self.vcsDirMenuActions.append(act) | 612 self.vcsDirMenuActions.append(act) |
| 563 menu.addSeparator() | 613 menu.addSeparator() |
| 564 menu.addAction(self.trUtf8('Select all local file entries'), | 614 menu.addAction(self.trUtf8('Select all local file entries'), |
| 565 self.browser.selectLocalEntries) | 615 self.browser.selectLocalEntries) |
| 566 menu.addAction(self.trUtf8('Select all versioned file entries'), | 616 menu.addAction(self.trUtf8('Select all versioned file entries'), |
| 567 self.browser.selectVCSEntries) | 617 self.browser.selectVCSEntries) |
| 568 menu.addAction(self.trUtf8('Select all local directory entries'), | 618 menu.addAction(self.trUtf8('Select all local directory entries'), |
| 569 self.browser.selectLocalDirEntries) | 619 self.browser.selectLocalDirEntries) |
| 570 menu.addAction(self.trUtf8('Select all versioned directory entries'), | 620 menu.addAction(self.trUtf8('Select all versioned directory entries'), |
| 571 self.browser.selectVCSDirEntries) | 621 self.browser.selectVCSDirEntries) |
| 572 menu.addSeparator() | 622 menu.addSeparator() |
| 573 menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) | 623 menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) |
| 574 | 624 |
| 575 mainMenu.addSeparator() | 625 mainMenu.addSeparator() |
| 576 mainMenu.addMenu(menu) | 626 mainMenu.addMenu(menu) |
| 598 font = act.font() | 648 font = act.font() |
| 599 font.setBold(True) | 649 font.setBold(True) |
| 600 act.setFont(font) | 650 act.setFont(font) |
| 601 menu.addSeparator() | 651 menu.addSeparator() |
| 602 | 652 |
| 603 act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), | 653 act = menu.addAction( |
| 654 UI.PixmapCache.getIcon("vcsUpdate.png"), | |
| 604 self.trUtf8('Update from repository'), self._VCSUpdate) | 655 self.trUtf8('Update from repository'), self._VCSUpdate) |
| 605 self.vcsDirMultiMenuActions.append(act) | 656 self.vcsDirMultiMenuActions.append(act) |
| 606 act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), | 657 act = menu.addAction( |
| 658 UI.PixmapCache.getIcon("vcsCommit.png"), | |
| 607 self.trUtf8('Commit changes to repository...'), | 659 self.trUtf8('Commit changes to repository...'), |
| 608 self._VCSCommit) | 660 self._VCSCommit) |
| 609 self.vcsDirMultiMenuActions.append(act) | 661 self.vcsDirMultiMenuActions.append(act) |
| 610 menu.addSeparator() | 662 menu.addSeparator() |
| 611 act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), | 663 act = menu.addAction( |
| 664 UI.PixmapCache.getIcon("vcsAdd.png"), | |
| 612 self.trUtf8('Add to repository'), self._VCSAdd) | 665 self.trUtf8('Add to repository'), self._VCSAdd) |
| 613 self.vcsAddDirMultiMenuActions.append(act) | 666 self.vcsAddDirMultiMenuActions.append(act) |
| 614 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), | 667 act = menu.addAction( |
| 668 UI.PixmapCache.getIcon("vcsRemove.png"), | |
| 615 self.trUtf8('Remove from repository (and disk)'), | 669 self.trUtf8('Remove from repository (and disk)'), |
| 616 self._VCSRemove) | 670 self._VCSRemove) |
| 617 self.vcsDirMultiMenuActions.append(act) | 671 self.vcsDirMultiMenuActions.append(act) |
| 618 if self.vcs.version >= (1, 5, 0): | 672 if self.vcs.version >= (1, 5, 0): |
| 619 menu.addSeparator() | 673 menu.addSeparator() |
| 620 act = menu.addAction(self.trUtf8("Add to Changelist"), | 674 act = menu.addAction( |
| 675 self.trUtf8("Add to Changelist"), | |
| 621 self.__SVNAddToChangelist) | 676 self.__SVNAddToChangelist) |
| 622 self.vcsMenuActions.append(act) | 677 self.vcsMenuActions.append(act) |
| 623 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 678 act = menu.addAction( |
| 679 self.trUtf8("Remove from Changelist"), | |
| 624 self.__SVNRemoveFromChangelist) | 680 self.__SVNRemoveFromChangelist) |
| 625 self.vcsMenuActions.append(act) | 681 self.vcsMenuActions.append(act) |
| 626 menu.addSeparator() | 682 menu.addSeparator() |
| 627 act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), | 683 act = menu.addAction( |
| 684 UI.PixmapCache.getIcon("vcsStatus.png"), | |
| 628 self.trUtf8('Show status'), self._VCSStatus) | 685 self.trUtf8('Show status'), self._VCSStatus) |
| 629 self.vcsDirMultiMenuActions.append(act) | 686 self.vcsDirMultiMenuActions.append(act) |
| 630 menu.addSeparator() | 687 menu.addSeparator() |
| 631 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 688 act = menu.addAction( |
| 689 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 632 self.trUtf8('Show difference'), self._VCSDiff) | 690 self.trUtf8('Show difference'), self._VCSDiff) |
| 633 self.vcsDirMultiMenuActions.append(act) | 691 self.vcsDirMultiMenuActions.append(act) |
| 634 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 692 act = menu.addAction( |
| 693 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 635 self.trUtf8('Show difference (extended)'), | 694 self.trUtf8('Show difference (extended)'), |
| 636 self.__SVNExtendedDiff) | 695 self.__SVNExtendedDiff) |
| 637 self.vcsDirMultiMenuActions.append(act) | 696 self.vcsDirMultiMenuActions.append(act) |
| 638 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 697 act = menu.addAction( |
| 698 UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 639 self.trUtf8('Show difference (URLs)'), | 699 self.trUtf8('Show difference (URLs)'), |
| 640 self.__SVNUrlDiff) | 700 self.__SVNUrlDiff) |
| 641 self.vcsDirMultiMenuActions.append(act) | 701 self.vcsDirMultiMenuActions.append(act) |
| 642 menu.addSeparator() | 702 menu.addSeparator() |
| 643 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 703 act = menu.addAction( |
| 704 UI.PixmapCache.getIcon("vcsRevert.png"), | |
| 644 self.trUtf8('Revert changes'), self._VCSRevert) | 705 self.trUtf8('Revert changes'), self._VCSRevert) |
| 645 self.vcsDirMultiMenuActions.append(act) | 706 self.vcsDirMultiMenuActions.append(act) |
| 646 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), | 707 act = menu.addAction( |
| 708 UI.PixmapCache.getIcon("vcsMerge.png"), | |
| 647 self.trUtf8('Merge changes'), self._VCSMerge) | 709 self.trUtf8('Merge changes'), self._VCSMerge) |
| 648 self.vcsDirMultiMenuActions.append(act) | 710 self.vcsDirMultiMenuActions.append(act) |
| 649 act = menu.addAction( | 711 act = menu.addAction( |
| 650 self.trUtf8('Conflict resolved'), self.__SVNResolve) | 712 self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 651 self.vcsDirMultiMenuActions.append(act) | 713 self.vcsDirMultiMenuActions.append(act) |
| 657 self.vcsDirMultiMenuActions.append(act) | 719 self.vcsDirMultiMenuActions.append(act) |
| 658 act = menu.addAction(self.trUtf8('Delete Property'), self.__SVNDelProp) | 720 act = menu.addAction(self.trUtf8('Delete Property'), self.__SVNDelProp) |
| 659 self.vcsDirMultiMenuActions.append(act) | 721 self.vcsDirMultiMenuActions.append(act) |
| 660 menu.addSeparator() | 722 menu.addSeparator() |
| 661 menu.addAction(self.trUtf8('Select all local file entries'), | 723 menu.addAction(self.trUtf8('Select all local file entries'), |
| 662 self.browser.selectLocalEntries) | 724 self.browser.selectLocalEntries) |
| 663 menu.addAction(self.trUtf8('Select all versioned file entries'), | 725 menu.addAction(self.trUtf8('Select all versioned file entries'), |
| 664 self.browser.selectVCSEntries) | 726 self.browser.selectVCSEntries) |
| 665 menu.addAction(self.trUtf8('Select all local directory entries'), | 727 menu.addAction(self.trUtf8('Select all local directory entries'), |
| 666 self.browser.selectLocalDirEntries) | 728 self.browser.selectLocalDirEntries) |
| 667 menu.addAction(self.trUtf8('Select all versioned directory entries'), | 729 menu.addAction(self.trUtf8('Select all versioned directory entries'), |
| 668 self.browser.selectVCSDirEntries) | 730 self.browser.selectVCSDirEntries) |
| 669 menu.addSeparator() | 731 menu.addSeparator() |
| 670 menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) | 732 menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) |
| 671 | 733 |
| 672 mainMenu.addSeparator() | 734 mainMenu.addSeparator() |
| 673 mainMenu.addMenu(menu) | 735 mainMenu.addMenu(menu) |
| 830 self.vcs.svnBlame(fn) | 892 self.vcs.svnBlame(fn) |
| 831 | 893 |
| 832 def __SVNLock(self): | 894 def __SVNLock(self): |
| 833 """ | 895 """ |
| 834 Private slot called by the context menu to lock files in the | 896 Private slot called by the context menu to lock files in the |
| 835 repository. """ | 897 repository. |
| 898 """ | |
| 836 names = [] | 899 names = [] |
| 837 for itm in self.browser.getSelectedItems(): | 900 for itm in self.browser.getSelectedItems(): |
| 838 try: | 901 try: |
| 839 names.append(itm.fileName()) | 902 names.append(itm.fileName()) |
| 840 except AttributeError: | 903 except AttributeError: |
