History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge with stable

Changeset 85194acab29a …

Parents 1e3719600bfc …

Parents 85ad42406750 …

by Steve Borho Jul 2 09 at 8:17 PM

Changes to 23 files · Browse files at 85194acab29a Showing diff from parent 1e3719600bfc 85ad42406750 Diff from another changeset...

Change 1 of 1 Show Changes Only Show Entire File Loading... .hgignore Stacked
28 29 30	28 29 30 31	@@ -28,3 +28,4 @@ `glob:win32/shellext/x64` `glob:win32/shellext/shellext.vcproj.*` `glob:win32/shellext/Release/`+`glob:.DS_Store`

Change 1 of 1 Show Changes Only Show Entire File Loading... .hgtags Stacked
20 21 22	20 21 22 23	@@ -20,3 +20,4 @@ `ef5ab6bccf5ee5356a0d5f42987f55af0f75330f 0.7.4` `a88261eec1f43d37786bfdb492322bddd94dcf8d 0.7.5` `525469f83de5473ab3d00fd5111ee91020251e62 0.7.6`+`ecf6fc1b0c9fd11e8ffe314c68ee75752371ac5f 0.8`

Change 1 of 1 Show Changes Only Show Entire File Loading... MANIFEST.in Stacked
2 3 4	2 3 4 5	@@ -2,3 +2,4 @@ `include contrib/_hgtk` `include contrib/nautilus-thg.py` `include COPYING.txt ReleaseNotes.txt`+`recursive-include locale *.mo`

Change 1 of 2 Show Changes Only Show Entire File Loading... contrib/win32/config.py Stacked
12 13 14 15 16 17 25 26 27	12 13 14 15 16 17 18 26 27 28 29 30 31 32 33 34 35	@@ -12,6 +12,7 @@ `# current executable to find our package data.` `import os`+`import sys` `import win32api, win32process` `proc = win32api.GetCurrentProcess()`@@ -25,3 +26,10 @@ `license_path = os.path.join(bin_path, 'COPYING.txt')` `locale_path = os.path.join(bin_path, 'locale')` `icon_path = os.path.join(bin_path, 'icons')`++`enc = sys.getfilesystemencoding()`+`if enc:`+`bin_path = bin_path.encode(enc)`+`license_path = license_path.encode(enc)`+`locale_path = locale_path.encode(enc)`+`icon_path = icon_path.encode(enc)`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/gdialog.py Stacked
379 380 381 382 383 384 385	379 380 381 382 383 384 385	@@ -379,7 +379,7 @@ `self.ui.pushbuffer()` `try:` `command()`-`except util.Abort, inst:`+`except (util.Abort, IOError, OSError), inst:` `Prompt(title + _(' Aborted'), str(inst), self).run()` `return False, ''` `finally:`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/synch.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 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666	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 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666	`#` `# Repository synchronization dialog for TortoiseHg` `#` `# Copyright (C) 2007 Steve Borho <steve@borho.org>` `# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>` `#` `import gtk` `import gobject` `import pango` `import Queue` `import os` `import sys` `import urllib` `from mercurial import hg, ui, extensions, url` `from thgutil.i18n import _` `from thgutil import hglib, settings, paths` `from hggtk import dialog, gtklib, hgthread, history, thgconfig, hgemail` `class SynchDialog(gtk.Window):` `def __init__(self, repos=[], pushmode=False, fromlog=False):` `""" Initialize the Dialog. """` `gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)` `gtklib.set_tortoise_icon(self, 'menusynch.ico')` `gtklib.set_tortoise_keys(self)` `self.root = paths.find_root()` `self.selected_path = None` `self.hgthread = None` `self.fromlog = fromlog` `self.notify_func = None` `self.last_drop_time = None` `self.lastcmd = []` `self.saved_stdout = sys.stdout` `self.saved_stderr = sys.stderr` `if os.name == 'nt':` `# Pipe stderr, stdout to self.write` `sys.stdout = self` `sys.stderr = self` `# persistent app data` `self._settings = settings.Settings('synch')` `self.set_default_size(655, 552)` `self.paths = self.get_paths()` `self.origchangecount = len(self.repo)` `name = self.repo.ui.config('web', 'name') or os.path.basename(self.root)` `self.set_title(_('TortoiseHg Synchronize - ') + hglib.toutf(name))` `self.connect('delete-event', self.delete)` `# toolbar` `self.tbar = gtk.Toolbar()` `self.tips = gtk.Tooltips()` `self.stop_button = self.toolbutton(gtk.STOCK_STOP,` `_('Stop'), self.stop_clicked, tip=_('Stop the hg operation'))` `self.stop_button.set_sensitive(False)` `tbuttons = [` `self.toolbutton(gtk.STOCK_GO_DOWN,` `_('Incoming'),` `self.incoming_clicked,` `tip=_('Display changes that can be pulled'` `' from selected repository')),` `self.toolbutton(gtk.STOCK_GOTO_BOTTOM,` `_(' Pull '),` `self.pull_clicked,` `tip=_('Pull changes from selected'` `' repository')),` `gtk.SeparatorToolItem(),` `self.toolbutton(gtk.STOCK_GO_UP,` `_('Outgoing'),` `self.outgoing_clicked,` `tip=_('Display local changes that will be '` `' pushed to selected repository')),` `self.toolbutton(gtk.STOCK_GOTO_TOP,` `_('Push'),` `self.push_clicked,` `tip=_('Push local changes to selected'` `' repository')),` `self.toolbutton(gtk.STOCK_GOTO_LAST,` `_('Email'),` `self.email_clicked,` `tip=_('Email local outgoing changes to'` `' one or more recipients')),` `gtk.SeparatorToolItem(),` `self.stop_button,` `gtk.SeparatorToolItem(),` `self.toolbutton(gtk.STOCK_PREFERENCES,` `_('Configure'),` `self.conf_clicked,` `tip=_('Configure peer repository paths')),` `gtk.SeparatorToolItem(),` `]` `for btn in tbuttons:` `self.tbar.insert(btn, -1)` `vbox = gtk.VBox()` `self.add(vbox)` `vbox.pack_start(self.tbar, False, False, 2)` `# sync target info` `targethbox = gtk.HBox()` `lbl = gtk.Button(_('Repo:'))` `lbl.unset_flags(gtk.CAN_FOCUS)` `lbl.connect('clicked', self.btn_remotepath_clicked)` `targethbox.pack_start(lbl, False, False)` `lbl = gtk.Button(_('Bundle:'))` `lbl.unset_flags(gtk.CAN_FOCUS)` `lbl.connect('clicked', self.btn_bundlepath_clicked)` `targethbox.pack_start(lbl, False, False)` `# revisions combo box` `self.pathlist = gtk.ListStore(str, str)` `self.pathbox = gtk.ComboBoxEntry(self.pathlist, 0)` `self.pathtext = self.pathbox.get_child()` `cell = gtk.CellRendererText()` `self.pathbox.pack_end(cell, False)` `self.pathbox.add_attribute(cell, 'text', 1)` `targethbox.pack_start(self.pathbox, True, True)` `self.fill_path_combo()` `defrow = None` `defpushrow = None` `for i, (path, alias) in enumerate(self.pathlist):` `if alias == 'default':` `defrow = i` `if defpushrow is None:` `defpushrow = i` `elif alias == 'default-push':` `defpushrow = i` `if repos:` `self.pathtext.set_text(hglib.toutf(repos[0]))` `elif defpushrow is not None and pushmode:` `self.pathbox.set_active(defpushrow)` `elif defrow is not None:` `self.pathbox.set_active(defrow)` `# support dropping of repos or bundle files` `self.drag_dest_set(gtk.DEST_DEFAULT_ALL,` `[("text/uri-list", 0, 1)], gtk.gdk.ACTION_COPY)` `self.connect('drag_data_received', self._drag_receive)` `# create checkbox to disable proxy` `self.use_proxy = gtk.CheckButton(_('use proxy server'))` `if ui.ui().config('http_proxy', 'host', ''):` `self.use_proxy.set_active(True)` `else:` `self.use_proxy.set_sensitive(False)` `frame = gtk.Frame(_('Post pull operation'))` `ppvbox = gtk.VBox()` `self.nothingradio = gtk.RadioButton(None, _('Nothing'))` `self.updateradio = gtk.RadioButton(self.nothingradio, _('Update'))` `self.fetchradio = gtk.RadioButton(self.nothingradio, _('Fetch'))` `self.rebaseradio = gtk.RadioButton(self.nothingradio, _('Rebase'))` `ppvbox.pack_start(self.nothingradio, True, True, 2)` `ppvbox.pack_start(self.updateradio, True, True, 2)` `ppvbox.pack_start(self.fetchradio, True, True, 2)` `ppvbox.pack_start(self.rebaseradio, True, True, 2)` `frame.add(ppvbox)` `frame.set_border_width(2)` `self.expander = expander = gtk.Expander(_('Advanced Options'))` `expander.set_expanded(False)` `expander.connect_after('activate', self.expanded)` `hbox = gtk.HBox()` `expander.add(hbox)` `leftvbox = gtk.VBox()` `leftvbox.pack_start(frame, False, False, 2)` `leftvbox.pack_start(self.use_proxy, False, False, 3)` `rightvbox = gtk.VBox()` `rightvbox.pack_start(targethbox, False, False, 2)` `rightvbox.pack_start(expander, True, True, 2)` `tophbox = gtk.HBox()` `tophbox.pack_start(rightvbox, True, True, 2)` `tophbox.pack_start(leftvbox, False, False, 2)` `vbox.pack_start(tophbox, False, False, 2)` `revvbox = gtk.VBox()` `self.reventry = gtk.Entry()` `self.cmdentry = gtk.Entry()` `self.force = gtk.CheckButton(_('Force pull or push'))` `self.tips.set_tip(self.force, _('Run even when remote repository'` `' is unrelated.'))` `revhbox = gtk.HBox()` `revhbox.pack_start(gtk.Label(_('Target Revision:')), False, False, 2)` `revhbox.pack_start(self.reventry, True, True, 2)` `reveventbox = gtk.EventBox()` `reveventbox.add(revhbox)` `self.tips.set_tip(reveventbox, _('A specific revision up to which you'` `' would like to push or pull.'))` `cmdhbox = gtk.HBox()` `cmdhbox.pack_start(gtk.Label(_('Remote Command:')), False, False, 2)` `cmdhbox.pack_start(self.cmdentry, True, True, 2)` `cmdeventbox = gtk.EventBox()` `cmdeventbox.add(cmdhbox)` `self.tips.set_tip(cmdeventbox, _('Name of hg executable on remote'` `' machine.'))` `revvbox.pack_start(self.force, False, False, 8)` `revvbox.pack_start(reveventbox, True, True, 2)` `revvbox.pack_start(cmdeventbox, True, True, 2)` `hbox.pack_start(revvbox, True, True, 4)` `frame = gtk.Frame(_('Incoming/Outgoing'))` `hbox.pack_start(frame, False, False, 2)` `self.showpatch = gtk.CheckButton(_('Show Patches'))` `self.newestfirst = gtk.CheckButton(_('Show Newest First'))` `self.nomerge = gtk.CheckButton(_('Show No Merges'))` `iovbox = gtk.VBox()` `iovbox.pack_start(self.showpatch, False, False, 2)` `iovbox.pack_start(self.newestfirst, False, False, 2)` `iovbox.pack_start(self.nomerge, False, False, 2)` `frame.add(iovbox)` `# hg output window` `scrolledwindow = gtk.ScrolledWindow()` `scrolledwindow.set_shadow_type(gtk.SHADOW_ETCHED_IN)` `scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)` `self.textview = gtk.TextView(buffer=None)` `self.textview.set_editable(False)` `self.textview.modify_font(pango.FontDescription('Monospace'))` `scrolledwindow.add(self.textview)` `self.textview.connect('populate-popup', self.add_to_popup)` `self.textbuffer = self.textview.get_buffer()` `self.textbuffer.create_tag('error', weight=pango.WEIGHT_HEAVY,` `foreground='#900000')` `vbox.pack_start(scrolledwindow, True, True)` `self.buttonhbox = gtk.HBox()` `self.viewpulled = gtk.Button(_('View pulled revisions'))` `self.viewpulled.connect('clicked', self._view_pulled_changes)` `self.updatetip = gtk.Button(_('Update to branch tip'))` `self.updatetip.connect('clicked', self._update_to_tip)` `self.buttonhbox.pack_start(self.viewpulled, False, False, 2)` `self.buttonhbox.pack_start(self.updatetip, False, False, 2)` `vbox.pack_start(self.buttonhbox, False, False, 2)` `self.stbar = gtklib.StatusBar()` `vbox.pack_start(self.stbar, False, False, 2)` `self.load_settings()` `self.update_pull_setting()` `gobject.idle_add(self.update_buttons)` `def update_pull_setting(self):` `ppull = self.repo.ui.config('tortoisehg', 'postpull', 'None')` `self.nothingradio.set_active(True)` `if ppull == 'update':` `self.updateradio.set_active(True)` `elif ppull == 'fetch':` `self.fetchradio.set_active(True)` `elif ppull == 'rebase':` `self.rebaseradio.set_active(True)` `def fill_path_combo(self):` `self.pathlist.clear()` `for alias, path in self.paths:` `path = url.hidepassword(path)` `self.pathlist.append([hglib.toutf(path), hglib.toutf(alias)])` `def _drag_receive(self, widget, context, x, y, selection, targetType, time):` `if time != self.last_drop_time:` `files = selection.get_uris()` `gobject.idle_add(self._set_path, files[0])` `self.last_drop_time = time` `def _set_path(self, uri):` `if not uri.startswith('file://'):` `return` `path = urllib.unquote(uri[7:])` `if paths.find_root(path) == path:` `self.pathtext.set_text(hglib.toutf(path))` `elif not os.path.isdir(path) and path.endswith('.hg'):` `self.pathtext.set_text(hglib.toutf(path))` `def update_buttons(self, args):` `self.buttonhbox.hide()` `try:` `# open a new repo, rebase can confuse cached repo` `repo = hg.repository(ui.ui(), path=self.root)` `except hglib.RepoError:` `return` `tip = len(repo)` `if ' '.join(self.lastcmd[:2]) == 'pull --rebase':` `# if last operation was a rebase, do not show 'viewpulled'` `# and reset our remembered tip changeset` `self.origchangecount = tip` `self.viewpulled.hide()` `elif self.origchangecount == tip or self.fromlog:` `self.viewpulled.hide()` `else:` `self.buttonhbox.show()` `self.viewpulled.show()` `wc = repo[None]` `branchhead = repo.branchtags().get(wc.branch())` `parents = repo.parents()` `if len(parents) > 1 or parents[0].node() == branchhead or not branchhead:` `self.updatetip.hide()` `else:` `self.buttonhbox.show()` `self.updatetip.show()` `self.repo = repo` `def _view_pulled_changes(self, button):` `opts = {'orig-tip' : self.origchangecount, 'from-synch' : True}` `dlg = history.GLog(self.ui, None, None, [], opts)` `dlg.display()` `def _update_to_tip(self, button):` `# execute command and show output on text widget` `gobject.timeout_add(10, self.process_queue)` `self.write("", False)` `cmdline = ['update', '-v']` `self.hgthread = hgthread.HgThread(cmdline)` `self.hgthread.start()` `self.stbar.begin()` `self.stbar.set_status_text('hg ' + ' '.join(cmdline))` `def get_paths(self, sort="value"):` `""" retrieve symbolic paths """` `try:` `self.ui = ui.ui()` `self.repo = hg.repository(self.ui, path=self.root)` `uipaths = self.repo.ui.configitems('paths')` `if sort:` `if sort == "value":` `sortfunc = lambda a,b: cmp(a[1], b[1])` `elif sort == "name":` `sortfunc = lambda a,b: cmp(a[0], b[0])` `else:` `raise _("unknown sort key '%s'") % sort` `uipaths.sort(sortfunc)` `return uipaths` `except hglib.RepoError:` `return None` `def btn_remotepath_clicked(self, button):` `""" select source folder to clone """` `response = gtklib.NativeFolderSelectDialog(` `initial=self.root,` `title=_('Select Repository')).run()` `if response:` `self.pathtext.set_text(response)` `def btn_bundlepath_clicked(self, button):` `""" select bundle to read from """` `response = gtklib.NativeSaveFileDialogWrapper(` `InitialDir=self.root,` `Title=_('Select Bundle'),` `Filter=((_('Bundle (.hg)'), '.hg'),` `(_('Bundle ()'), '.')),` `Open=True).run()` `if response:` `self.pathtext.set_text(response)` `def should_live(self):` `if self.cmd_running():` `dialog.error_dialog(self, _('Cannot close now'),` `_('command is running'))` `return True` `else:` `self.update_settings()` `self._settings.write()` `sys.stdout = self.saved_stdout` `sys.stderr = self.saved_stderr` `return False` `def delete(self, widget, event):` `if not self.should_live():` `self.destroy()` `def toolbutton(self, stock, label, handler,` `menu=None, userdata=None, tip=None):` `if menu:` `tbutton = gtk.MenuToolButton(stock)` `tbutton.set_menu(menu)` `else:` `tbutton = gtk.ToolButton(stock)` `tbutton.set_label(label)` `if tip:` `tbutton.set_tooltip(self.tips, tip)` `tbutton.connect('clicked', handler, userdata)` `return tbutton` `def get_advanced_options(self):` `opts = {}` `if self.showpatch.get_active():` `opts['patch'] = ['--patch']` `if self.nomerge.get_active():` `opts['no-merges'] = ['--no-merges']` `if self.force.get_active():` `opts['force'] = ['--force']` `if self.newestfirst.get_active():` `opts['newest-first'] = ['--newest-first']` `remotecmd = self.cmdentry.get_text().strip()` `if remotecmd != "":` `opts['remotecmd'] = ['--remotecmd', remotecmd]` `target_rev = self.reventry.get_text().strip()` `if target_rev != "":` `opts['rev'] = ['--rev', target_rev]` `return opts` `def pull_clicked(self, toolbutton, data=None):` `aopts = self.get_advanced_options()` `if self.fetchradio.get_active():` `cmd = ['fetch', '--message', 'merge']` `# load the fetch extensions explicitly` `extensions.load(self.ui, 'fetch', None)` `else:` `cmd = ['pull']` `cmd += aopts.get('force', [])` `cmd += aopts.get('remotecmd', [])` `if self.updateradio.get_active():` `cmd.append('--update')` `elif self.rebaseradio.get_active():` `cmd.append('--rebase')` `# load the rebase extensions explicitly` `extensions.load(self.ui, 'rebase', None)` `cmd += aopts.get('rev', [])` `self.exec_cmd(cmd)` `def push_clicked(self, toolbutton, data=None):` `aopts = self.get_advanced_options()` `cmd = ['push']` `cmd += aopts.get('rev', [])` `cmd += aopts.get('force', [])` `cmd += aopts.get('remotecmd', [])` `self.exec_cmd(cmd)` `def conf_clicked(self, toolbutton, data=None):` `newpath = hglib.fromutf(self.pathtext.get_text()).strip()` `for alias, path in self.paths:` `if newpath in (path, url.hidepassword(path)):` `newpath = None` `break` `dlg = thgconfig.ConfigDialog(True)` `dlg.show_all()` `if newpath:` `dlg.new_path(newpath)` `else:` `dlg.focus_field('tortoisehg.postpull')` `dlg.run()` `dlg.hide()` `self.paths = self.get_paths()` `self.fill_path_combo()` `self.update_pull_setting()` `def email_clicked(self, toolbutton, data=None):` `opts = []` `path = hglib.fromutf(self.pathtext.get_text()).strip()` `rev = self.get_advanced_options().get('rev')` `if path:` `opts.extend(['--outgoing', path])` `elif not rev:` `dialog.info_dialog(self, _('No repository selected'),` `_('Select a peer repository to compare with'))` `self.pathbox.grab_focus()` `return` `if rev:` `opts.extend(rev)` `dlg = hgemail.EmailDialog(self.root, opts)` `dlg.set_transient_for(self)` `dlg.show_all()` `dlg.present()` `dlg.set_transient_for(None)` `def incoming_clicked(self, toolbutton, data=None):` `aopts = self.get_advanced_options()` `cmd = ['incoming']` `cmd += aopts.get('rev', [])` `cmd += aopts.get('patch', [])` `cmd += aopts.get('no-merges', [])` `cmd += aopts.get('force', [])` `cmd += aopts.get('newest-first', [])` `cmd += aopts.get('remotecmd', [])` `self.exec_cmd(cmd)` `def outgoing_clicked(self, toolbutton, data=None):` `aopts = self.get_advanced_options()` `cmd = ['outgoing']` `cmd += aopts.get('rev', [])` `cmd += aopts.get('patch', [])` `cmd += aopts.get('no-merges', [])` `cmd += aopts.get('force', [])` `cmd += aopts.get('newest-first', [])` `cmd += aopts.get('remotecmd', [])` `self.exec_cmd(cmd)` `def stop_clicked(self, toolbutton, data=None):` `if self.cmd_running():` `self.hgthread.terminate()` `self.stop_button.set_sensitive(False)` `def exec_cmd(self, cmd):` `if self.cmd_running():` `dialog.error_dialog(self, _('Cannot run now'),` `_('Please try again after the previous command is completed'))` `return` `self.stop_button.set_sensitive(True)` `proxy_host = ui.ui().config('http_proxy', 'host', '')` `use_proxy = self.use_proxy.get_active()` `text_entry = self.pathbox.get_child()` `remote_path = hglib.fromutf(text_entry.get_text()).strip()` `for alias, path in self.paths:` `if remote_path == alias:` `remote_path = path` `elif remote_path == url.hidepassword(path):` `remote_path = path` `cmdline = cmd[:]` `cmdline += ['--verbose']` `if proxy_host and not use_proxy:` `cmdline += ["--config", "http_proxy.host="]` `cmdline += [remote_path]` `self.lastcmd = cmdline` `# show command to be executed` `self.write("", False)` `# execute command and show output on text widget` `gobject.timeout_add(10, self.process_queue)` `self.hgthread = hgthread.HgThread(cmdline, parent=self)` `self.hgthread.start()` `self.stbar.begin()`-`self.stbar.set_status_text('hg ' + ' '.join(cmd + [remote_path]))`+`self.stbar.set_status_text('hg ' + ' '.join(cmd))` `self.add_src_to_recent(remote_path)` `def cmd_running(self):` `if self.hgthread and self.hgthread.isAlive():` `return True` `else:` `return False` `def add_src_to_recent(self, src):` `if os.path.exists(src):` `src = os.path.abspath(src)` `# save src path to recent list in history (read by clone tool)` `self._settings.mrul('src_paths').add(src)` `self._settings.write()` `# update drop-down list` `self.fill_path_combo()` `def flush(self, args):` `pass` `def write(self, msg, append=True):` `msg = hglib.toutf(msg)` `if append:` `enditer = self.textbuffer.get_end_iter()` `self.textbuffer.insert(enditer, msg)` `self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0)` `else:` `self.textbuffer.set_text(msg)` `def write_err(self, msg):` `enditer = self.textbuffer.get_end_iter()` `self.textbuffer.insert_with_tags_by_name(enditer, msg, 'error')` `self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0)` `def process_queue(self):` `"""` `Handle all the messages currently in the queue (if any).` `"""` `self.hgthread.process_dialogs()` `while self.hgthread.getqueue().qsize():` `try:` `msg = self.hgthread.getqueue().get(0)` `self.write(msg)` `except Queue.Empty:` `pass` `while self.hgthread.geterrqueue().qsize():` `try:` `msg = self.hgthread.geterrqueue().get(0)` `self.write_err(msg)` `except Queue.Empty:` `pass` `if self.cmd_running():` `return True` `else:` `# Update button states` `self.update_buttons()` `self.stbar.end()` `self.stop_button.set_sensitive(False)` `if self.hgthread.return_code() is None:` `self.write_err(_('[command interrupted]'))` `if self.notify_func and self.lastcmd[0] == 'pull':` `self.notify_func(self.notify_args)` `return False # Stop polling this function` `AdvancedDefaults = {` `'expander.expanded': False,` `'reventry.text': '',` `'cmdentry.text': '',` `'force.active': False,` `'showpatch.active': False,` `'newestfirst.active': False,` `'nomerge.active': False,}` `def expanded(self, expander):` `if not expander.get_expanded():` `self.load_settings(SynchDialog.AdvancedDefaults.get)` `def load_settings(self, get_value = None):` `get_value = get_value or self._settings.get_value` `for key, default in SynchDialog.AdvancedDefaults.iteritems():` `member, attr = key.split('.')` `value = get_value(key, default)` `getattr(getattr(self, member), 'set_%s'%attr)(value)` `def update_settings(self, set_value = None):` `set_value = set_value or self._settings.set_value` `for key, default in SynchDialog.AdvancedDefaults.iteritems():` `member, attr = key.split('.')` `value = getattr(getattr(self, member), 'get_%s'%attr)()` `set_value(key, value)` `def add_to_popup(self, textview, menu):` `menu_items = (('----', None),` `(_('Toggle _Wordwrap'), self.toggle_wordwrap),` `)` `for label, handler in menu_items:` `if label == '----':` `menuitem = gtk.SeparatorMenuItem()` `else:` `menuitem = gtk.MenuItem(label)` `if handler:` `menuitem.connect('activate', handler)` `menu.append(menuitem)` `menu.show_all()` `def toggle_wordwrap(self, sender):` `if self.textview.get_wrap_mode() != gtk.WRAP_NONE:` `self.textview.set_wrap_mode(gtk.WRAP_NONE)` `else:` `self.textview.set_wrap_mode(gtk.WRAP_WORD)` `def set_notify_func(self, func, args):` `self.notify_func = func` `self.notify_args = args` `def run(ui, pats, *opts):` `return SynchDialog(pats, opts.get('pushmode'))`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/thgconfig.py Stacked
649 650 651 652 653 654 655 786 787 788 789 790 791	649 650 651 652 653 654 655 786 787 788 789 790 791 792	@@ -649,7 +649,7 @@ `_('Path testing cannot work without a repository'))` `return` `model, path = selection.get_selected()`-`testpath = hglib.fromutf(model[path][1])`+`testpath = hglib.fromutf(model[path][2])` `if not testpath:` `return` `if testpath[0] == '~':`@@ -786,6 +786,7 @@ `scrolledwindow = gtk.ScrolledWindow()` `scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)` `scrolledwindow.add(desctext)`+`scrolledwindow.set_border_width(4)` `descframe.add(scrolledwindow)` `vbox = gtk.VBox()`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg-cs.po Stacked
14 15 16 17 18 19 20	14 15 16 17 18 19 20	@@ -14,7 +14,7 @@ `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\changeset.py:147`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg-da.po Stacked
14 15 16 17 18 19 20	14 15 16 17 18 19 20	@@ -14,7 +14,7 @@ `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\about.py:52`

Change 1 of 54 Show Changes Only Show Entire File Loading... i18n/tortoisehg-de.po Stacked
8 9 10 11 12 13 14 15 16 17 18 19 20 39 40 41 42 43 44 45 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 169 170 171 172 173 174 275 276 277 278 279 280 281 367 368 369 370 371 372 373 415 416 417 418 419 420 421 518 519 520 521 522 523 524 752 753 754 755 756 757 758 816 817 818 819 820 821 822 852 853 854 855 856 857 858 859 860 861 862 984 985 986 987 988 989 990 1064 1065 1066 1067 1068 1069 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1221 1222 1223 1224 1225 1226 1227 1229 1230 1231 1232 1233 1234 1235 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1269 1270 1271 1272 1273 1274 1275 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1550 1551 1552 1553 1554 1555 1556 1594 1595 1596 1597 1598 1599 1600 1786 1787 1788 1789 1790 1791 1792 1810 1811 1812 1813 1814 1815 1816 1857 1858 1859 1860 1861 1862 1863 1926 1927 1928 1929 1930 1931 1932 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1954 1955 1956 1957 1958 1959 1960 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 2278 2279 2280 2281 2282 2283 2284 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2725 2726 2727 2728 2729 2730 2866 2867 2868 2869 2870 2871 2872 2883 2884 2885 2886 2887 2888 2947 2948 2949 2950 2951 2952 2953 2992 2993 2994 2995 2996 2997 3037 3038 3039 3040 3041 3042 3043 3092 3093 3094 3095 3096 3097 3098 3100 3101 3102 3103 3104 3105 3106 3172 3173 3174 3175 3176 3177 3180 3181 3182 3183 3184 3185 3212 3213 3214 3215 3216 3217 3218 3274 3275 3276 3277 3278 3279 3280 3286 3287 3288 3289 3290 3291 3292 3363 3364 3365 3366 3367 3368 3369 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3420 3421 3422 3423 3424 3425 3426 3429 3430 3431 3432 3433 3434 3435 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3613 3614 3615 3616 3617 3618 3619	8 9 10 11 12 13 14 15 16 17 18 19 20 39 40 41 42 43 44 45 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 169 170 171 172 173 174 175 176 277 278 279 280 281 282 283 369 370 371 372 373 374 375 417 418 419 420 421 422 423 520 521 522 523 524 525 526 754 755 756 757 758 759 760 818 819 820 821 822 823 824 854 855 856 857 858 859 860 861 862 863 864 986 987 988 989 990 991 992 1066 1067 1068 1069 1070 1071 1072 1073 1074 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1228 1229 1230 1231 1232 1233 1234 1236 1237 1238 1239 1240 1241 1242 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1278 1279 1280 1281 1282 1283 1284 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1559 1560 1561 1562 1563 1564 1565 1603 1604 1605 1606 1607 1608 1609 1795 1796 1797 1798 1799 1800 1801 1819 1820 1821 1822 1823 1824 1825 1866 1867 1868 1869 1870 1871 1872 1935 1936 1937 1938 1939 1940 1941 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1963 1964 1965 1966 1967 1968 1969 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 2287 2288 2289 2290 2291 2292 2293 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2881 2882 2883 2884 2885 2886 2887 2898 2899 2900 2901 2902 2903 2904 2905 2964 2965 2966 2967 2968 2969 2970 3009 3010 3011 3012 3013 3014 3015 3055 3056 3057 3058 3059 3060 3061 3110 3111 3112 3113 3114 3115 3116 3118 3119 3120 3121 3122 3123 3124 3190 3191 3192 3193 3194 3195 3196 3197 3200 3201 3202 3203 3204 3205 3206 3207 3234 3235 3236 3237 3238 3239 3240 3296 3297 3298 3299 3300 3301 3302 3308 3309 3310 3311 3312 3313 3314 3385 3386 3387 3388 3389 3390 3391 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3442 3443 3444 3445 3446 3447 3448 3451 3452 3453 3454 3455 3456 3457 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3635 3636 3637 3638 3639 3640 3641	@@ -8,13 +8,13 @@ `"Project-Id-Version: tortoisehg\n"` `"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"` `"POT-Creation-Date: 2009-06-28 05:54+0000\n"`-`"PO-Revision-Date: 2009-06-29 18:59+0000\n"`+`"PO-Revision-Date: 2009-06-30 19:53+0000\n"` `"Last-Translator: simohe <Unknown>\n"` `"Language-Team: German <de@li.org>\n"` `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-30 04:36+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\changeset.py:147`@@ -39,7 +39,7 @@ `#: hggtk\hgshelve.py:148` `msgid "%d hunks, %d lines changed\n"`-`msgstr "%d Brocken, %d Zeilen geändert\n"`+`msgstr "%d Blöcke, %d Zeilen geändert\n"` `#: hggtk\hgshelve.py:320` `msgid " [Ynsfdaq?] "`@@ -55,19 +55,19 @@ `#: hggtk\hgshelve.py:361` `msgid "shelve this change to %r?"`-`msgstr "Diese Änderung zurückstellen auf: %r ?"`+`msgstr "Diese Änderung an %r zwischenlagern?"` `#: hggtk\hgshelve.py:433` `msgid "shelve can only be run interactively"`-`msgstr "zurückstellen ist nur inter-aktiv möglich"`+`msgstr "Zwischenlagern ist nur interaktiv möglich"` `#: hggtk\hgshelve.py:437` `msgid "shelve data already exists"`-`msgstr "zurückstellungs daten existieren bereits"`+`msgstr "Bereits daten zwischengelagert"` `#: hggtk\hgshelve.py:468` `msgid "no changes to shelve\n"`-`msgstr "keine Änderungen zum Zurückstellen\n"`+`msgstr "keine Änderungen zum Zwischenlagern\n"` `#: hggtk\hgshelve.py:502` `msgid "applying patch\n"`@@ -169,6 +169,8 @@ `#: hggtk\about.py:52` `msgid "Several icons are courtesy of the TortoiseSVN project"` `msgstr ""`+`"Verschiedene Icons wurden freundlicherweise durch das TortoiseSVN-Projekt "`+`"zur Verfügung gestellt."` `#: hggtk\backout.py:24` `msgid "Backout changeset - "`@@ -275,7 +277,7 @@ `#: hggtk\changeset.py:197` `msgid " %s is larger than the specified max diff size"`-`msgstr ""`+`msgstr " %s ist grösser als die maximal konfigurierte Vergleich-Grösse"` `#: hggtk\changeset.py:292` `msgid "_visual diff"`@@ -367,7 +369,7 @@ `#: hggtk\clone.py:143` `msgid "Remote Cmd:"`-`msgstr ""`+`msgstr "Entfernter Bef.:"` `#: hggtk\clone.py:157 hggtk\thgshelve.py:151` `msgid "Cancel"`@@ -415,7 +417,7 @@ `#: hggtk\commit.py:37` `msgid "Changes take effect on next commit"`-`msgstr ""`+`msgstr "Änderungen werden bei der nächsten Übernahme aktiv"` `#: hggtk\commit.py:38` `msgid "No branch changes"`@@ -518,7 +520,7 @@ `#: hggtk\commit.py:407` `msgid "No committable files selected"`-`msgstr ""`+`msgstr "Keine gewählte Datei kann übernommen werden"` `#: hggtk\commit.py:424 hggtk\commit.py:479 hggtk\merge.py:83` `#: hggtk\thgconfig.py:465`@@ -752,7 +754,7 @@ `#: hggtk\datamine.py:225` `msgid "Regular expression search pattern"`-`msgstr ""`+`msgstr "Suchmuster (Regulärer Ausdruck)"` `#: hggtk\datamine.py:226` `msgid ""`@@ -816,7 +818,7 @@ `#: hggtk\datamine.py:473` `msgid "File is unrevisioned"`-`msgstr ""`+`msgstr "Datei wird nicht verwaltet"` `#: hggtk\datamine.py:474` `msgid "Unable to annotate "`@@ -852,11 +854,11 @@ `#: hggtk\gdialog.py:399` `msgid "No visual diff configured"`-`msgstr ""`+`msgstr "kein Vergleichswerkzeug konfiguriert"` `#: hggtk\gdialog.py:400` `msgid "Please select a visual diff application."`-`msgstr ""`+`msgstr "Bitte konfigurieren Sie ein visuelles Vergleichswerkzeug"` `#: hggtk\gdialog.py:459` `msgid "making snapshot of %d files from rev %s\n"`@@ -984,7 +986,7 @@ `#: hggtk\hgemail.py:64` `msgid "Envelope"`-`msgstr ""`+`msgstr "Umschlag"` `#: hggtk\hgemail.py:65 hggtk\taskbarui.py:45` `msgid "Options"`@@ -1064,6 +1066,9 @@ `"from them. This is the safest way to send changes to recipient Mercurial "` `"users."` `msgstr ""`+`"Bündeldateien enthalten ganze Änderungssätze in binärem Format. Ein Import "`+`"erfolgt mit herunterladen (pull). Dies ist die sicherste Art um Änderungen "`+`"an andere Benutzer von Mercurial zu senden."` `#: hggtk\hgemail.py:155` `msgid "attach"`@@ -1075,15 +1080,15 @@ `#: hggtk\hgemail.py:158` `msgid "inline"`-`msgstr ""`+`msgstr "eingebettet"` `#: hggtk\hgemail.py:160` `msgid "send patches as inline attachments"`-`msgstr ""`+`msgstr "Sende Patches als eingebettete Anhänge"` `#: hggtk\hgemail.py:161` `msgid "diffstat"`-`msgstr ""`+`msgstr "diffstat"` `#: hggtk\hgemail.py:163` `msgid "add diffstat output to messages"`@@ -1206,14 +1211,16 @@ `msgid ""` `"total: %d hunks (%d changed lines); selected: %d hunks (%d changed lines)"` `msgstr ""`+`"Total: %d Blöcke (%d geänderte Zeilen); gewählt: %d Blöcke (%d geänderte "`+`"Zeilen)"` `#: hggtk\hgshelve.py:294` `msgid "unhandled transition: %s -> %s"`-`msgstr ""`+`msgstr "Unbehandelter Übergang: %s -> %s"` `#: hggtk\hgshelve.py:350` `msgid "shelve changes to %s?"`-`msgstr ""`+`msgstr "Änderungen an %s zwischenlagern?"` `#: hggtk\hgshelve.py:400` `msgid "backup %r as %r\n"`@@ -1221,7 +1228,7 @@ `#: hggtk\hgshelve.py:514` `msgid "saving patch to shelve\n"`-`msgstr ""`+`msgstr "Patch zwichenlagern\n"` `#: hggtk\hgshelve.py:525 hggtk\hgshelve.py:576` `msgid "restoring %r to %r\n"`@@ -1229,7 +1236,7 @@ `#: hggtk\hgshelve.py:527` `msgid "removing shelve file\n"`-`msgstr ""`+`msgstr "Datei zum zwischenlagern entfernen\n"` `#: hggtk\hgshelve.py:536` `msgid "removing backup for %r : %r\n"`@@ -1253,15 +1260,17 @@ `#: hggtk\hgshelve.py:589` `msgid "unshelve completed\n"`-`msgstr ""`+`msgstr "entlagern abgeschlossen\n"` `#: hggtk\hgshelve.py:591` `msgid "nothing to unshelve\n"`-`msgstr ""`+`msgstr "nichts zum entlagern\n"` `#: hggtk\hgshelve.py:597` `msgid "mark new/missing files as added/removed before shelving"` `msgstr ""`+`"Vor dem zwischenlagern neue und fehlende Dateien als hinzugefügt, respektive "`+`"entfernt, markieren"` `#: hggtk\hgshelve.py:599` `msgid "overwrite existing shelve data"`@@ -1269,7 +1278,7 @@ `#: hggtk\hgshelve.py:601` `msgid "append to existing shelve data"`-`msgstr "an existierende zurückgestellte Daten anhängen"`+`msgstr "an vorhandene zurückgestellte Daten anhängen"` `#: hggtk\hgshelve.py:603` `msgid "hg shelve [OPTION]... [FILE]..."`@@ -1277,11 +1286,11 @@ `#: hggtk\hgshelve.py:606` `msgid "inspect shelved changes only"`-`msgstr "Zurückgestellte Änderungen nur ansehen"`+`msgstr "Zwischengelagerte Änderungen nur ansehen"` `#: hggtk\hgshelve.py:608` `msgid "proceed even if patches do not unshelve cleanly"`-`msgstr ""`+`msgstr "Fortfahren auch wenn Patches nicht korrekt entlagert werden konnten"` `#: hggtk\hgthread.py:176` `msgid "[command returned code %d]\n"`@@ -1550,7 +1559,7 @@ `#: hggtk\hgtk.py:636` `msgid "revisions to view in diff tool"`-`msgstr ""`+`msgstr "Revisionen, die mit dem Vergleichswerkzeug angezeigt werden"` `#: hggtk\hgtk.py:637` `msgid "launch visual diff tool"`@@ -1594,7 +1603,7 @@ `#: hggtk\history.py:64` `msgid "_DataMine"`-`msgstr ""`+`msgstr "_DataMine"` `#: hggtk\history.py:66` `msgid "Search Repository History"`@@ -1786,7 +1795,7 @@ `#: hggtk\logfilter.py:31` `msgid "Log Filter - %s"`-`msgstr ""`+`msgstr "Log Filter - %s"` `#: hggtk\logfilter.py:46 hggtk\logview\treeview.py:398` `msgid "Branch"`@@ -1810,7 +1819,7 @@ `#: hggtk\logfilter.py:82` `msgid "Search repository changelog with criteria"`-`msgstr ""`+`msgstr "Historie des Projektverzeichnisses mit Kriterien durchsuchen"` `#: hggtk\logfilter.py:94` `msgid "File(s):"`@@ -1857,7 +1866,7 @@ `#: hggtk\logview\treeview.py:357` `msgid "Graph"`-`msgstr ""`+`msgstr "Graph"` `#: hggtk\logview\treeview.py:385` `msgid "ID"`@@ -1926,7 +1935,7 @@ `#: hggtk\recovery.py:47` `msgid "Clean"`-`msgstr ""`+`msgstr "Bereinigen"` `#: hggtk\recovery.py:49` `msgid "Clean checkout, undo all changes"`@@ -1934,11 +1943,11 @@ `#: hggtk\recovery.py:52` `msgid "Rollback"`-`msgstr ""`+`msgstr "Zurückrollen"` `#: hggtk\recovery.py:54` `msgid "Rollback (undo) last transaction to repository (pull, commit, etc)"`-`msgstr ""`+`msgstr "Letzte Übermittlung zum Projektverzeichnis zurückrollen"` `#: hggtk\recovery.py:58` `msgid "Recover"`@@ -1954,7 +1963,7 @@ `#: hggtk\recovery.py:65` `msgid "Validate repository consistency"`-`msgstr ""`+`msgstr "Überprüft das Projektarchiv auf Korrektheit"` `#: hggtk\recovery.py:99 hggtk\synch.py:367` `msgid "Cannot close now"`@@ -1978,11 +1987,11 @@ `#: hggtk\recovery.py:137` `msgid "Confirm rollback repository"`-`msgstr ""`+`msgstr "Zurückrollen bestätigen"` `#: hggtk\recovery.py:138` `msgid "Rollback repository '%s' ?"`-`msgstr ""`+`msgstr "Projektverzeichnis '%s' zurückrollen?"` `#: hggtk\recovery.py:159 hggtk\synch.py:507` `msgid "Cannot run now"`@@ -2278,7 +2287,7 @@ `#: hggtk\status.py:911` `msgid "Hunk selection is disabled for this file.\n"`-`msgstr ""`+`msgstr "Die Auswahl von Blöcken ist in dieser Datei nicht möglich.\n"` `#: hggtk\status.py:1081 hggtk\status.py:1102` `msgid "Nothing Reverted"`@@ -2424,11 +2433,11 @@ `#: hggtk\synch.py:106` `msgid "Repo:"`-`msgstr ""`+`msgstr "Proj.arch.:"` `#: hggtk\synch.py:111` `msgid "Bundle:"`-`msgstr ""`+`msgstr "Bündel:"` `#: hggtk\synch.py:155` `msgid "Post pull operation"`@@ -2709,15 +2718,16 @@ `#: hggtk\thgconfig.py:34` `msgid "Visual Diff Command"`-`msgstr ""`+`msgstr "Befehl zum visuellen Vergleichen"` `#: hggtk\thgconfig.py:35` `msgid "Specify visual diff tool; must be an extdiff command"` `msgstr ""`+`"Visuelles Vergleichswerkzeug angeben; muss ein Befehl von extiff sein"` `#: hggtk\thgconfig.py:36` `msgid "Skip Diff Window"`-`msgstr ""`+`msgstr "Vergleichsfenster überspringen"` `#: hggtk\thgconfig.py:37` `msgid ""`@@ -2725,6 +2735,11 @@ `"tool's directory diff feature. Only enable this feature if you know your "` `"diff tool has a valid extdiff configuration. Default: False"` `msgstr ""`+`"Überspringe den eingebauten visuellen Vergleichsdialog und benutze direkt "`+`"die Möglichkeit des Vergleichswerkzeugs um Verzeichnisse zu vergleichen. "`+`"Schalten Sie diese Option nur ein, wenn sie wissen, dass ihr "`+`"Vergleichswerkzeug eine gültige Konfiguration für extdiff hat. "`+`"Voreinstellung: False"` `#: hggtk\thgconfig.py:41` `msgid "Visual Editor"`@@ -2866,7 +2881,7 @@ `#: hggtk\thgconfig.py:89` `msgid "Log Batch Size"`-`msgstr ""`+`msgstr "Log-Stapel-Grösse"` `#: hggtk\thgconfig.py:90` `msgid ""`@@ -2883,6 +2898,8 @@ `"Allow the changelog viewer to copy the changeset hash of the currently "` `"selected changeset into the clipboard. Default: False"` `msgstr ""`+`"Die Historieanzeige kopiert den Hash vom ausgewählten Änderungssatz in die "`+`"Zwischenablage. Voreinstellung: False"` `#: hggtk\thgconfig.py:99` `msgid "After pull operation"`@@ -2947,7 +2964,7 @@ `#: hggtk\thgconfig.py:121` `msgid "Port to listen on"`-`msgstr ""`+`msgstr "Port auf dem gehorcht werden soll"` `#: hggtk\thgconfig.py:121 hggtk\thgconfig.py:231` `msgid "Port"`@@ -2992,6 +3009,7 @@ `#: hggtk\thgconfig.py:131` `msgid "Maximum number of changes to list on the changelog."` `msgstr ""`+`"Maximale Anzahl Änderungssätze, die in der Historieanzeige angezeigt werden"` `#: hggtk\thgconfig.py:132` `msgid "Allow Push"`@@ -3037,7 +3055,7 @@ `#: hggtk\thgconfig.py:151 hggtk\thgconfig.py:232` `msgid "Host"`-`msgstr ""`+`msgstr "Rechner"` `#: hggtk\thgconfig.py:152` `msgid ""`@@ -3092,7 +3110,7 @@ `#: hggtk\thgconfig.py:170` `msgid "Comma-separated list of carbon copy recipient email addresses"`-`msgstr ""`+`msgstr "Kommagetrennte Liste der Empfänger von Kopien"` `#: hggtk\thgconfig.py:172` `msgid "Bcc"`@@ -3100,7 +3118,7 @@ `#: hggtk\thgconfig.py:173` `msgid "Comma-separated list of blind carbon copy recipient email addresses"`-`msgstr ""`+`msgstr "Kommagetrennte Liste der Empfänger von Blindkopien"` `#: hggtk\thgconfig.py:175` `msgid "method"`@@ -3172,6 +3190,8 @@ `#: hggtk\thgconfig.py:193` `msgid "Hostname the sender can use to identify itself to the mail server."` `msgstr ""`+`"Rechnernamen, den der Computer verwende kann, um sich beim Mailserver zu "`+`"identifizieren."` `#: hggtk\thgconfig.py:196` `msgid "Git Format"`@@ -3180,6 +3200,8 @@ `#: hggtk\thgconfig.py:197` `msgid "Use git extended diff header format. Default: False"` `msgstr ""`+`"Nutze das erweiterte (git) Format in den Kopfdaten von Vergleichen. "`+`"Voreinstellung: False"` `#: hggtk\thgconfig.py:199` `msgid "No Dates"`@@ -3212,7 +3234,7 @@ `#: hggtk\thgconfig.py:208` `msgid "Ignore WS Amount"`-`msgstr ""`+`msgstr "ign. Leeränderungen"` `#: hggtk\thgconfig.py:209` `msgid "Ignore changes in the amount of white space. Default: False"`@@ -3274,7 +3296,7 @@ `#: hggtk\thgconfig.py:471` `msgid "Sync"`-`msgstr ""`+`msgstr "Synch."` `#: hggtk\thgconfig.py:475` `msgid "Web"`@@ -3286,7 +3308,7 @@ `#: hggtk\thgconfig.py:484` `msgid "Diff"`-`msgstr ""`+`msgstr "Vergleich"` `#: hggtk\thgconfig.py:497` `msgid "Unapplied changes"`@@ -3363,7 +3385,7 @@ `#: hggtk\thgshelve.py:71 hggtk\thgshelve.py:133 hggtk\thgshelve.py:139` `#: hggtk\thgshelve.py:147` `msgid "Shelve"`-`msgstr ""`+`msgstr "Zwischenlagern"` `#: hggtk\thgshelve.py:72` `msgid "set aside selected changes"`@@ -3371,28 +3393,28 @@ `#: hggtk\thgshelve.py:73` `msgid "Unshelve"`-`msgstr ""`+`msgstr "Entlagern"` `#: hggtk\thgshelve.py:74` `msgid "restore shelved changes"`-`msgstr ""`+`msgstr "zwischengelagerte Änderungen wiederherstellen"` `#: hggtk\thgshelve.py:97 hggtk\thgshelve.py:98 hggtk\thgshelve.py:99` `#: hggtk\thgshelve.py:102` `msgid "_shelve"`-`msgstr ""`+`msgstr "_zwischenlagern"` `#: hggtk\thgshelve.py:134` `msgid "No changes to shelve"`-`msgstr ""`+`msgstr "Keine Änderungen zum zwischenlagern"` `#: hggtk\thgshelve.py:140` `msgid "Please select diff chunks to shelve"`-`msgstr ""`+`msgstr "Bitte wählen Sie die Blöcke, die zwischengelagert werden sollen"` `#: hggtk\thgshelve.py:148` `msgid "<b>Shelve file exists!</b>"`-`msgstr "<b>Shelve-Datei existiert!</b>"`+`msgstr "<b>Zwischanlager-Datei (shelve) existiert!>/b>"` `#: hggtk\thgshelve.py:149` `msgid "Overwrite"`@@ -3420,7 +3442,7 @@ `#: hggtk\visdiff.py:61` `msgid "Visual Diffs"`-`msgstr ""`+`msgstr "Visuelle Vergleiche"` `#: hggtk\visdiff.py:64` `msgid "Temporary files are removed when this dialog is closed"`@@ -3429,7 +3451,7 @@ `#: hggtk\visdiff.py:82` `msgid "Always launch single files"`-`msgstr ""`+`msgstr "Einzelne Dateien direkt öffnen"` `#: hggtk\visdiff.py:108` `msgid "No repository"`@@ -3441,15 +3463,15 @@ `#: hggtk\visdiff.py:116` `msgid "Select diff tool"`-`msgstr ""`+`msgstr "Vergleichswerkzeug wählen"` `#: hggtk\visdiff.py:135` `msgid "No visual diff tool"`-`msgstr ""`+`msgstr "kein Vergleichswerkzeug"` `#: hggtk\visdiff.py:136` `msgid "No visual diff tool has been configured"`-`msgstr ""`+`msgstr "Es ist kein visuelles Vergleichswerkzeug konfiguriert"` `#: hggtk\visdiff.py:155` `msgid "changeset "`@@ -3461,11 +3483,11 @@ `#: hggtk\visdiff.py:162` `msgid "working changes"`-`msgstr ""`+`msgstr "aktuelle Ändrungen"` `#: hggtk\visdiff.py:165` `msgid "Visual Diffs - "`-`msgstr ""`+`msgstr "visuelle Vergleiche - "` `#: hggtk\visdiff.py:173` `msgid "No file changes"`@@ -3477,15 +3499,15 @@ `#: hggtk\visdiff.py:242` `msgid "Tool launch failure"`-`msgstr ""`+`msgstr "Werkzeug konnte nicht gestartet werden"` `#: hggtk\visdiff.py:243` `msgid "%s : %s"`-`msgstr ""`+`msgstr "%s : %s"` `#: thgutil\menuthg.py:168 thgutil\menuthg.py:303` `msgid "Create Clone"`-`msgstr ""`+`msgstr "Klon erstellen"` `#: thgutil\menuthg.py:169` `msgid "Create clone here from source"`@@ -3549,19 +3571,19 @@ `#: thgutil\menuthg.py:238` `msgid "Shelve Changes"`-`msgstr ""`+`msgstr "Änderungen zwischenlagern"` `#: thgutil\menuthg.py:239` `msgid "Shelve or unshelve repository changes"`-`msgstr ""`+`msgstr "Änderungen vom Projektverzeichnis zwischenlagern oder entlagern"` `#: thgutil\menuthg.py:245` `msgid "Visual Diff"`-`msgstr ""`+`msgstr "Vergleichen"` `#: thgutil\menuthg.py:246` `msgid "View changes using GUI diff tool"`-`msgstr ""`+`msgstr "Änderungen mit visuellem Vergleichswerkzeug anzeigen"` `#: thgutil\menuthg.py:250` `msgid "Guess Renames"`@@ -3613,7 +3635,7 @@ `#: thgutil\menuthg.py:280` `msgid "View Changelog"`-`msgstr ""`+`msgstr "Historie anzeigen"` `#: thgutil\menuthg.py:281` `msgid "View revision history"`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg-es.po Stacked
14 15 16 17 18 19 20	14 15 16 17 18 19 20	@@ -14,7 +14,7 @@ `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\about.py:52`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg-fr.po Stacked
8 9 10 11 12 13 14 15 16 17 18 19 20	8 9 10 11 12 13 14 15 16 17 18 19 20	@@ -8,13 +8,13 @@ `"Project-Id-Version: tortoisehg\n"` `"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"` `"POT-Creation-Date: 2009-06-28 05:54+0000\n"`-`"PO-Revision-Date: 2009-05-23 11:04+0000\n"`-`"Last-Translator: Yoan Blanc <Unknown>\n"`+`"PO-Revision-Date: 2009-06-29 15:37+0000\n"`+`"Last-Translator: simohe <Unknown>\n"` `"Language-Team: French <fr@li.org>\n"` `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\about.py:52`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg-it.po Stacked
14 15 16 17 18 19 20	14 15 16 17 18 19 20	@@ -14,7 +14,7 @@ `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\about.py:52`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg-ja.po Stacked
14 15 16 17 18 19 20	14 15 16 17 18 19 20	@@ -14,7 +14,7 @@ `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\about.py:52`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg-pl.po Stacked
14 15 16 17 18 19 20	14 15 16 17 18 19 20	@@ -14,7 +14,7 @@ `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\hgthread.py:84`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg-pt.po Stacked
14 15 16 17 18 19 20	14 15 16 17 18 19 20	@@ -14,7 +14,7 @@ `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\about.py:52`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg-pt_BR.po Stacked
14 15 16 17 18 19 20	14 15 16 17 18 19 20	@@ -14,7 +14,7 @@ `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\about.py:52`

Change 1 of 5 Show Changes Only Show Entire File Loading... i18n/tortoisehg-ru.po Stacked
8 9 10 11 12 13 14 15 16 17 18 19 20 81 82 83 84 85 86 87 102 103 104 105 106 107 108 130 131 132 133 134 135 136 178 179 180 181 182 183 184	8 9 10 11 12 13 14 15 16 17 18 19 20 81 82 83 84 85 86 87 102 103 104 105 106 107 108 130 131 132 133 134 135 136 178 179 180 181 182 183 184	@@ -8,13 +8,13 @@ `"Project-Id-Version: tortoisehg\n"` `"Report-Msgid-Bugs-To: Alil Adamov <diagiman@gmail.com>\n"` `"POT-Creation-Date: 2009-06-28 05:54+0000\n"`-`"PO-Revision-Date: 2009-06-27 05:23+0000\n"`+`"PO-Revision-Date: 2009-07-01 10:03+0000\n"` `"Last-Translator: Alil Adamov <diagiman@gmail.com>\n"` `"Language-Team: Russian <ru@li.org>\n"` `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\about.py:52`@@ -81,7 +81,7 @@ `#: hggtk\bugreport.py:23` `msgid "TortoiseHg Bug Report"`-`msgstr "TortoiseHg Отчет Об Ошибке"`+`msgstr "Отчет об ошибке TortoiseHg"` `#: hggtk\bugreport.py:48` `msgid ""`@@ -102,7 +102,7 @@ `#: hggtk\changeset.py:104` `msgid "[All Files]"`-`msgstr "[Все Файлы]"`+`msgstr "[Все файлы]"` `#: hggtk\changeset.py:147` `msgid "changeset:"`@@ -130,7 +130,7 @@ `#: hggtk\changeset.py:197` `msgid " %s is larger than the specified max diff size"`-`msgstr " %s больше, чем указанный максимальный размер файла различий"`+`msgstr " %s превышает указанный максимальный размер файла различий"` `#: hggtk\changeset.py:292` `msgid "_visual diff"`@@ -178,7 +178,7 @@ `#: hggtk\changeset.py:548` `msgid "Revert %s to contents at revision %d?"`-`msgstr "Возвратить содержимое %s к ревизии %d?"`+`msgstr "Вернуть содержимое %s к ревизии %d?"` `#: hggtk\changeset.py:560 hggtk\synch.py:635` `msgid "Toggle _Wordwrap"`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg-zh_CN.po Stacked
14 15 16 17 18 19 20	14 15 16 17 18 19 20	@@ -14,7 +14,7 @@ `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\about.py:52`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg-zh_TW.po Stacked
14 15 16 17 18 19 20	14 15 16 17 18 19 20	@@ -14,7 +14,7 @@ `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-06-29 04:32+0000\n"`+`"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: hggtk\gdialog.py:492`

icons/refresh_overlays.ico

Change 1 of 1 Show Entire File icons/svg/refresh_overlays.svg 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	@@ -0,0 +1,190 @@ +`<?xml version="1.0" encoding="UTF-8" standalone="no"?>`+`<!-- Created with Inkscape (http://www.inkscape.org/) -->`+`<svg`+`xmlns:dc="http://purl.org/dc/elements/1.1/"`+`xmlns:cc="http://creativecommons.org/ns#"`+`xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"`+`xmlns:svg="http://www.w3.org/2000/svg"`+`xmlns="http://www.w3.org/2000/svg"`+`xmlns:xlink="http://www.w3.org/1999/xlink"`+`xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"`+`xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"`+`width="16"`+`height="16"`+`id="svg2183"`+`sodipodi:version="0.32"`+`inkscape:version="0.46"`+`version="1.0"`+`sodipodi:docbase="D:\Development\SVN\TortoiseSVN\src\Resources\svg\Overlays"`+`sodipodi:docname="refresh_overlays.svg"`+`inkscape:output_extension="org.inkscape.output.svg.inkscape"`+`inkscape:export-filename="E:\src\mercurial\thg\thg-icons\icons\tortoise\refresh_overlays.ico.png"`+`inkscape:export-xdpi="90"`+`inkscape:export-ydpi="90">`+`<defs`+`id="defs2185">`+`<linearGradient`+`id="linearGradient3608">`+`<stop`+`id="stop3610"`+`offset="0"`+`style="stop-color:#2c7cbf;stop-opacity:0" />`+`<stop`+`id="stop3612"`+`offset="1"`+`style="stop-color:#173561;stop-opacity:1;" />`+`</linearGradient>`+`<linearGradient`+`id="linearGradient3592">`+`<stop`+`style="stop-color:#2c7cbf;stop-opacity:1;"`+`offset="0"`+`id="stop3594" />`+`<stop`+`style="stop-color:#173561;stop-opacity:1;"`+`offset="1"`+`id="stop3596" />`+`</linearGradient>`+`<inkscape:perspective`+`sodipodi:type="inkscape:persp3d"`+`inkscape:vp_x="0 : 128 : 1"`+`inkscape:vp_y="0 : 1000 : 0"`+`inkscape:vp_z="256 : 128 : 1"`+`inkscape:persp3d-origin="128 : 85.333333 : 1"`+`id="perspective2780" />`+`<linearGradient`+`id="linearGradient4154">`+`<stop`+`style="stop-color:#20f500;stop-opacity:0.56470591;"`+`offset="0"`+`id="stop4156" />`+`<stop`+`style="stop-color:#207e00;stop-opacity:1;"`+`offset="1"`+`id="stop4158" />`+`</linearGradient>`+`<radialGradient`+`inkscape:collect="always"`+`xlink:href="#linearGradient4154"`+`id="radialGradient2814"`+`gradientUnits="userSpaceOnUse"`+`cx="47.119026"`+`cy="208.49529"`+`fx="47.119026"`+`fy="208.49529"`+`r="47.490459" />`+`<linearGradient`+`inkscape:collect="always"`+`xlink:href="#linearGradient3592"`+`id="linearGradient3598"`+`x1="3"`+`y1="2"`+`x2="13"`+`y2="14"`+`gradientUnits="userSpaceOnUse" />`+`<linearGradient`+`inkscape:collect="always"`+`xlink:href="#linearGradient3592"`+`id="linearGradient3616"`+`x1="4"`+`y1="1"`+`x2="8"`+`y2="3"`+`gradientUnits="userSpaceOnUse" />`+`</defs>`+`<sodipodi:namedview`+`id="base"`+`pagecolor="#ffffff"`+`bordercolor="#666666"`+`borderopacity="1.0"`+`inkscape:pageopacity="0.0"`+`inkscape:pageshadow="2"`+`inkscape:zoom="38.125"`+`inkscape:cx="8"`+`inkscape:cy="8.0862674"`+`inkscape:current-layer="layer1"`+`showgrid="true"`+`inkscape:document-units="px"`+`inkscape:grid-bbox="true"`+`width="256px"`+`height="256px"`+`showguides="true"`+`inkscape:guide-bbox="true"`+`inkscape:window-width="1058"`+`inkscape:window-height="809"`+`inkscape:window-x="334"`+`inkscape:window-y="32"`+`inkscape:snap-bbox="true"`+`gridtolerance="21">`+`<inkscape:grid`+`type="xygrid"`+`id="grid2782"`+`visible="true"`+`enabled="true"`+`spacingx="0.5px"`+`spacingy="0.5px"`+`empspacing="2" />`+`</sodipodi:namedview>`+`<metadata`+`id="metadata2188">`+`<rdf:RDF>`+`<cc:Work`+`rdf:about="">`+`<dc:format>image/svg+xml</dc:format>`+`<dc:type`+`rdf:resource="http://purl.org/dc/dcmitype/StillImage" />`+`<dc:title>Refresh Overlay Icons</dc:title>`+`<dc:date>2009-05-31</dc:date>`+`<dc:creator>`+`<cc:Agent>`+`<dc:title>Peer Sommerlund</dc:title>`+`</cc:Agent>`+`</dc:creator>`+`<dc:description>TortoiseHg menu icon for refreshing overlay icons</dc:description>`+`<cc:license`+`rdf:resource="" />`+`</cc:Work>`+`</rdf:RDF>`+`</metadata>`+`<g`+`id="layer1"`+`inkscape:label="Layer 1"`+`inkscape:groupmode="layer">`+`<g`+`id="g2810"`+`transform="translate(2.9687137,-2.9698314)">`+`<path`+`transform="matrix(0.1064046,0,0,0.1064046,1.7606244e-2,-11.215025)"`+`d="M 94.109486,208.49529 A 46.990459,46.990459 0 1 1 0.12856674,208.49529 A 46.990459,46.990459 0 1 1 94.109486,208.49529 z"`+`sodipodi:ry="46.990459"`+`sodipodi:rx="46.990459"`+`sodipodi:cy="208.49529"`+`sodipodi:cx="47.119026"`+`id="path3183"`+`style="fill:url(#radialGradient2814);fill-opacity:1;stroke:none;stroke-opacity:0.76394851"`+`sodipodi:type="arc" />`+`<path`+`sodipodi:nodetypes="cccccc"`+`id="path4164"`+`d="M 1.5640694,11.714511 L 0.91706738,12.484433 C 1.5304267,13.567543 2.0001634,14.263755 3.2721548,15.005818 C 5.5252665,13.185393 7.136925,10.367866 8.4611106,7.7818781 C 7.6319875,7.8904219 5.4428114,11.474402 3.1427545,13.094874 C 2.7117009,13.470142 1.9030483,12.586926 1.5640694,11.714511 z"`+`style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.10192677px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />`+`</g>`+`<path`+`sodipodi:type="arc"`+`style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient3598);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.11828219999999990;stroke-opacity:1"`+`id="path2816"`+`sodipodi:cx="8"`+`sodipodi:cy="8"`+`sodipodi:rx="7"`+`sodipodi:ry="7"`+`d="M 10.36215,1.4105957 A 7,7 0 1 1 6.416358,1.1814901"`+`sodipodi:start="5.0565956"`+`sodipodi:end="10.767364"`+`sodipodi:open="true" />`+`<path`+`style="fill:#729fcf;fill-rule:evenodd;stroke:url(#linearGradient3616);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"`+`d="M 4,1 C 6,1 6,1 7,1 C 6,2 6,2 5,3"`+`id="path3588"`+`sodipodi:nodetypes="ccc" />`+`</g>`+`</svg>`

Change 1 of 3 Show Changes Only Show Entire File Loading... win32/shellext/ContextMenu.cpp Stacked
64 65 66 67 68 69 70 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600	64 65 66 67 68 69 70 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631	@@ -64,7 +64,7 @@ `"general.ico", 0},` `{"thgstatus", "Update Icons",` `"Update icons for this repository",`-`"menumerge.ico", 0},`+`"refresh_overlays.ico", 0},` `{"userconf", "Global Settings",` `"Configure user wide settings",` `"settings_user.ico", 0},`@@ -456,35 +456,59 @@ `UINT_PTR idCmd, UINT uFlags, UINT FAR reserved,` `LPSTR pszName, UINT cchMax)` `{`-`pszName = 0;`-`char psz;`+`const char psz = "";` `TDEBUG_TRACE(` `"CShellExt::GetCommandString: idCmd = " << idCmd` `<< ", uFlags = " << uFlags` `);`+ `MenuIdCmdMap::iterator iter = MenuIdMap.find(static_cast<UINT>(idCmd));` `if (iter != MenuIdMap.end())` `{` `TDEBUG_TRACE(` `"CShellExt::GetCommandString: name = " << iter->second.name);`-`psz = (char)iter->second.helpText.c_str();`+`psz = iter->second.helpText.c_str();` `}` `else` `{` `TDEBUG_TRACE(` `"CShellExt::GetCommandString: can't find idCmd " << idCmd);`-`psz = "";` `}` +`bool copied = false;`+`size_t size = 0;`+ `if (uFlags & GCS_UNICODE)` `{`-`wcscpy((wchar_t)pszName, _WCSTR(psz));`+`wchar_t* const dest = reinterpret_cast<wchar_t>(pszName);`+`dest = 0;`+`const wchar_t* const src = _WCSTR(psz);`+`size = wcslen(src);`+`if (size < cchMax)`+`{`+`wcscpy(dest, src);`+`copied = true;`+`}` `}` `else` `{`-`strcpy((char)pszName, psz);`+`pszName = 0;`+`size = strlen(psz);`+`if (size < cchMax)`+`{`+`strcpy(pszName, psz);`+`copied = true;`+`}` `}`++`if (!copied)`+`{`+`TDEBUG_TRACE(`+`"CShellExt::GetCommandString: error: source string length ("`+`<< size << ") exceeds target buffer size (" << cchMax << ")");`+`}`+ `return NOERROR;` `}` @@ -584,17 +608,24 @@ `cwd = IsDirectory(myFiles[0])? myFiles[0] : DirName(myFiles[0]);` `const std::string tempfile = GetTemporaryFile();`-`SECURITY_ATTRIBUTES sa;`-`memset(&sa, 0, sizeof(sa));`-`sa.nLength = sizeof(sa);`-`sa.bInheritHandle = TRUE;`+`if (tempfile.empty())`+`{`+`TDEBUG_TRACE("DoHgtk: error: GetTemporaryFile returned empty string");`+`return;`+`}` `TDEBUG_TRACE("DoHgtk: temp file = " << tempfile);` `HANDLE tempfileHandle = CreateFileA(` `tempfile.c_str(), GENERIC_WRITE,`-`FILE_SHARE_READ, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0`+`FILE_SHARE_READ, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0` `);` +`if (tempfileHandle == INVALID_HANDLE_VALUE)`+`{`+`TDEBUG_TRACE("DoHgtk: error: failed to create file " << tempfile);`+`return;`+`}`+ `typedef std::vector<std::string>::size_type ST;` `for (ST i = 0; i < myFiles.size(); i++)` `{`

Diff Options

merge with stable

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

merge with stable

Diff to 85194acab29a

Attach a Trello Card

Add a tag

Your session has expired