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