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 5a1aad3c0092 …

Parents ca98dcc20b29 …

Parents 34bb27cc3a6e …

by Steve Borho Aug 14 09 at 3:51 AM

Changes to 6 files · Browse files at 5a1aad3c0092 Showing diff from parent ca98dcc20b29 34bb27cc3a6e Diff from another changeset...

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/changeset.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	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	`# changeset.py - Changeset dialog for TortoiseHg` `#` `# Copyright 2008 Steve Borho <steve@borho.org>` `#` `# This software may be used and distributed according to the terms of the` `# GNU General Public License version 2, incorporated herein by reference.` `import os` `import gtk` `import gobject` `import pango` `import Queue` `from mercurial import cmdutil, context, util, ui, hg, patch, mdiff` `from thgutil.i18n import _` `from thgutil.hglib import ` `from thgutil import shlib` `from hggtk import gdialog, gtklib, hgcmd` `class ChangeSet(gdialog.GDialog):` `'GTK+ based dialog for displaying repository logs'` `def __init__(self, ui, repo, cwd, pats, opts, stbar=None):` `gdialog.GDialog.__init__(self, ui, repo, cwd, pats, opts)` `self.stbar = stbar` `self.glog_parent = None` `def get_title(self):` `title = toutf(os.path.basename(self.repo.root)) + ' changeset '` `rev = self.opts['rev']` `if isinstance(rev, str):` `title += rev` `else:` `title += rev[0]` `return title` `def get_icon(self):` `return 'menushowchanged.ico'` `def get_tbbuttons(self):` `self.parent_toggle = gtk.ToggleToolButton(gtk.STOCK_UNDO)` `self.parent_toggle.set_use_underline(True)` `self.parent_toggle.set_label(_('_Other parent'))` `self.parent_toggle.set_tooltip(self.tooltips, _('diff other parent'))` `self.parent_toggle.set_sensitive(False)` `self.parent_toggle.set_active(False)` `self.parent_toggle.connect('toggled', self.parent_toggled)` `return [self.parent_toggle]` `def parent_toggled(self, button):` `self.load_details(self.currev)` `def prepare_display(self):` `self.currow = None` `self.graphview = None` `self.glog_parent = None` `node0, node1 = cmdutil.revpair(self.repo, self.opts.get('rev'))` `self.load_details(self.repo.changelog.rev(node0))` `def save_settings(self):` `settings = gdialog.GDialog.save_settings(self)` `settings['changeset'] = self._hpaned.get_position()` `return settings` `def load_settings(self, settings):` `gdialog.GDialog.load_settings(self, settings)` `if settings and 'changeset' in settings:` `self._setting_hpos = settings['changeset']` `else:` `self._setting_hpos = -1` `def load_details(self, rev):` `'Load selected changeset details into buffer and filelist'` `self.currev = rev` `ctx = self.repo[rev]` `if not ctx:` `return` `parents = ctx.parents()` `title = self.get_title()` `if len(parents) == 2:` `self.parent_toggle.set_sensitive(True)` `if self.parent_toggle.get_active():` `title += ':' + str(parents[1].rev())` `else:` `title += ':' + str(parents[0].rev())` `else:` `self.parent_toggle.set_sensitive(False)` `if self.parent_toggle.get_active():` `# Parent button must be pushed out, but this` `# will cause load_details to be called again` `# so we exit out to prevent recursion.` `self.parent_toggle.set_active(False)` `return` `if self.clipboard:` `self.clipboard.set_text(str(ctx))` `self.set_title(title)` `if self.parent_toggle.get_active():` `parent = parents[1].node()` `elif parents:` `parent = parents[0].node()` `else:` `parent = self.repo[-1]` `self._filelist.clear()` `self._filelist.append(('', _('[All Files]'), ''))` `modified, added, removed = self.repo.status(parent, ctx.node())[:3]` `for f in modified:` `self._filelist.append(('M', toutf(f), f))` `for f in added:` `self._filelist.append(('A', toutf(f), f))` `for f in removed:` `self._filelist.append(('R', toutf(f), f))` `self.curnodes = (parent, ctx.node())` `if len(self._filelist) > 1:` `self._filesel.select_path((1,))` `else:` `self._filesel.select_path((0,))` `def filelist_rowchanged(self, sel):` `model, path = sel.get_selected()` `if not path:` `return` `status, file_utf8, self.curfile = model[path]` `self.generate_change_header()` `if self.curfile:` `self.append_diff(self.curfile)` `else:` `for _, _, f in model:` `self.append_diff(f)` `def generate_change_header(self):` `buf, rev = self._buffer, self.currev` `def title_line(title, text, tag):` `pad = ' ' * (12 - len(title))` `utext = toutf(title + pad + text)` `buf.insert_with_tags_by_name(eob, utext, tag)` `buf.insert(eob, "\n")` `buf.set_text('')` `ctx = self.repo[rev]` `eob = buf.get_end_iter()` `date = displaytime(ctx.date())` `change = str(rev) + ' (' + str(ctx) + ')'` `tags = ' '.join(ctx.tags())` `title_line(_('changeset:'), change, 'changeset')` `if ctx.branch() != 'default':` `title_line(_('branch:'), ctx.branch(), 'greybg')` `title_line(_('user/date:'), ctx.user() + '\t' + date, 'changeset')` `if len(ctx.parents()) == 2 and self.parent_toggle.get_active():` `parentindex = 1` `else:` `parentindex = 0` `for pctx in ctx.parents():` `try:` `summary = pctx.description().splitlines()[0]` `summary = toutf(summary)` `except:` `summary = ""` `change = str(pctx.rev()) + ' (' + str(pctx) + ')'` `if pctx.branch() != ctx.branch():` `change += ' [' + toutf(pctx.branch()) + ']'` `title = _('parent:')` `title += ' ' * (12 - len(title))` `if len(ctx.parents()) == 2 and pctx == ctx.parents()[parentindex]:` `buf.insert_with_tags_by_name(eob, title, 'parenthl')` `buf.insert_with_tags_by_name(eob, change, 'linkhl')` `buf.insert_with_tags_by_name(eob, ' ' + summary, 'parenthl')` `else:` `buf.insert_with_tags_by_name(eob, title, 'parent')` `buf.insert_with_tags_by_name(eob, change, 'link')` `buf.insert_with_tags_by_name(eob, ' ' + summary, 'parent')` `buf.insert(eob, "\n")` `for cctx in ctx.children():` `try:` `summary = cctx.description().splitlines()[0]` `summary = toutf(summary)` `except:` `summary = ""` `change = str(cctx.rev()) + ' (' + str(cctx) + ')'` `if cctx.branch() != ctx.branch():` `change += ' [' + toutf(cctx.branch()) + ']'` `title = _('child:')` `title += ' ' * (12 - len(title))` `buf.insert_with_tags_by_name(eob, title, 'parent')` `buf.insert_with_tags_by_name(eob, change, 'link')` `buf.insert_with_tags_by_name(eob, ' ' + summary, 'parent')` `buf.insert(eob, "\n")` `if tags: title_line(_('tags:'), tags, 'tag')` `log = toutf(ctx.description())` `buf.insert(eob, '\n' + log + '\n\n')` `def append_diff(self, wfile):` `if not wfile:` `return` `buf, rev = self._buffer, self.currev` `n1, n2 = self.curnodes` `eob = buf.get_end_iter()` `offset = eob.get_offset()` `try:` `fctx = self.repo[rev].filectx(wfile)` `except LookupError:` `fctx = None` `if fctx and fctx.size() > getmaxdiffsize(self.ui):` `lines = ['diff', '', '',` `_(' %s is larger than the specified max diff size') % wfile]` `else:` `lines = []` `matcher = cmdutil.matchfiles(self.repo, [wfile])` `opts = mdiff.diffopts(git=True, nodates=True)` `for s in patch.diff(self.repo, n1, n2, match=matcher, opts=opts):` `lines.extend(s.splitlines())` `tags, lines = self.prepare_diff(lines, offset, wfile)` `for l in lines:` `buf.insert(eob, l)` `# inserts the tags` `for name, p0, p1 in tags:` `i0 = buf.get_iter_at_offset(p0)` `i1 = buf.get_iter_at_offset(p1)` `buf.apply_tag_by_name(name, i0, i1)` `sob, eob = buf.get_bounds()` `pos = buf.get_iter_at_offset(offset)` `buf.apply_tag_by_name('mono', pos, eob)` `return True` `def prepare_diff(self, difflines, offset, fname):` `'Borrowed from hgview; parses changeset diffs'` `def addtag( name, offset, length ):` `if tags and tags[-1][0] == name and tags[-1][2]==offset:` `tags[-1][2] += length` `else:` `tags.append( [name, offset, offset+length] )` `add, rem = 0, 0` `for l in difflines[3:]:` `if l.startswith('+'):` `add += 1` `elif l.startswith('-'):` `rem += 1` `outlines = []` `tags = []` `txt = toutf('=== (+%d,-%d) %s ===\n' % (add, rem, fname))` `addtag( 'greybg', offset, len(txt) )` `outlines.append(txt)` `offset += len(txt.decode('utf-8'))` `for l1 in difflines[3:]:` `l = toutf(l1)` `if l.startswith('@@'):` `tag = 'blue'` `elif l.startswith('+'):` `tag = 'green'` `l = diffexpand(l)` `elif l.startswith('-'):` `tag = 'red'` `l = diffexpand(l)` `else:` `tag = 'black'` `l = diffexpand(l)` `l = l+"\n"` `length = len(l.decode('utf-8'))` `addtag( tag, offset, length )` `outlines.append( l )` `offset += length` `return tags, outlines` `def link_event(self, tag, widget, event, liter):` `if event.type != gtk.gdk.BUTTON_RELEASE:` `return` `text = self.get_link_text(tag, widget, liter)` `if not text:` `return` `linkrev = long(text.split(' ')[0])` `if self.graphview:` `self.graphview.set_revision_id(linkrev, load=True)` `else:` `self.load_details(linkrev)` `def get_link_text(self, tag, widget, liter):` `'handle clicking on a link in a textview'` `text_buffer = widget.get_buffer()` `beg = liter.copy()` `while not beg.begins_tag(tag):` `beg.backward_char()` `end = liter.copy()` `while not end.ends_tag(tag):` `end.forward_char()` `text = text_buffer.get_text(beg, end)` `return text` `def file_context_menu(self):` `def create_menu(label, callback):` `menuitem = gtk.MenuItem(label, True)` `menuitem.connect('activate', callback)` `menuitem.set_border_width(1)` `return menuitem` `menu = gtk.Menu()` `menu.append(create_menu(_('_visual diff'), self.diff_file_rev))` `menu.append(create_menu(_('diff to _local'), self.diff_to_local))` `menu.append(create_menu(_('_view at revision'), self.view_file_rev))` `self.save_menu = create_menu(_('_save at revision'), self.save_file_rev)` `menu.append(self.save_menu)` `menu.append(create_menu(_('_file history'), self.file_history))` `self.ann_menu = create_menu(_('_annotate file'), self.ann_file)` `menu.append(self.ann_menu)` `menu.append(create_menu(_('_revert file contents'), self.revert_file))` `menu.show_all()` `return menu` `def get_body(self):` `self.curfile = ''` `if self.repo.ui.configbool('tortoisehg', 'copyhash'):` `sel = (os.name == 'nt') and 'CLIPBOARD' or 'PRIMARY'` `self.clipboard = gtk.Clipboard(selection=sel)` `else:` `self.clipboard = None` `self.filemenu = self.file_context_menu()` `details_frame = gtk.Frame()` `details_frame.set_shadow_type(gtk.SHADOW_ETCHED_IN)` `scroller = gtk.ScrolledWindow()` `scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)` `details_frame.add(scroller)` `details_text = gtk.TextView()` `details_text.set_wrap_mode(gtk.WRAP_NONE)` `details_text.connect('populate-popup', self.add_to_popup)` `details_text.set_editable(False)` `details_text.modify_font(pango.FontDescription(self.fontcomment))` `scroller.add(details_text)` `self._buffer = gtk.TextBuffer()` `self.setup_tags()` `details_text.set_buffer(self._buffer)` `self.textview = details_text` `filelist_tree = gtk.TreeView()` `filesel = filelist_tree.get_selection()` `filesel.connect('changed', self.filelist_rowchanged)` `self._filesel = filesel` `filelist_tree.connect('button-release-event',` `self.file_button_release)` `filelist_tree.connect('popup-menu', self.file_popup_menu)` `filelist_tree.connect('row-activated', self.file_row_act)` `filelist_tree.set_search_equal_func(self.search_filelist)` `accelgroup = gtk.AccelGroup()` `if self.glog_parent:` `self.glog_parent.add_accel_group(accelgroup)` `else:` `self.add_accel_group(accelgroup)` `mod = gtklib.get_thg_modifier()` `key, modifier = gtk.accelerator_parse(mod+'d')` `filelist_tree.add_accelerator('thg-diff', accelgroup, key,` `modifier, gtk.ACCEL_VISIBLE)` `filelist_tree.connect('thg-diff', self.thgdiff)` `self._filelist = gtk.ListStore(` `gobject.TYPE_STRING, # MAR status` `gobject.TYPE_STRING, # filename (utf-8 encoded)` `gobject.TYPE_STRING, # filename` `)` `filelist_tree.set_model(self._filelist)` `column = gtk.TreeViewColumn(_('Stat'), gtk.CellRendererText(), text=0)` `filelist_tree.append_column(column)` `column = gtk.TreeViewColumn(_('Files'), gtk.CellRendererText(), text=1)` `filelist_tree.append_column(column)` `list_frame = gtk.Frame()` `list_frame.set_shadow_type(gtk.SHADOW_ETCHED_IN)` `scroller = gtk.ScrolledWindow()` `scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)` `scroller.add(filelist_tree)` `list_frame.add(scroller)` `self._hpaned = gtk.HPaned()` `self._hpaned.pack1(list_frame, True, True)` `self._hpaned.pack2(details_frame, True, True)` `self._hpaned.set_position(self._setting_hpos)` `if self.stbar:` `# embedded by changelog browser` `return self._hpaned` `else:` `# add status bar for main app` `vbox = gtk.VBox()` `vbox.pack_start(self._hpaned, True, True)` `self.stbar = gtklib.StatusBar()` `self.stbar.show()` `vbox.pack_start(gtk.HSeparator(), False, False)` `vbox.pack_start(self.stbar, False, False)` `return vbox` `def search_filelist(self, model, column, key, iter):` `'case insensitive filename search'` `key = key.lower()` `if key in model.get_value(iter, 1).lower():` `return False` `return True` `def setup_tags(self):` `'Creates the tags to be used inside the TextView'` `def make_texttag( name, kwargs ):` `'Helper function generating a TextTag'` `tag = gtk.TextTag(name)` `for key, value in kwargs.iteritems():` `key = key.replace("_","-")` `try:` `tag.set_property( key, value )` `except TypeError:` `print "Warning the property %s is unsupported in" % key` `print "this version of pygtk"` `return tag` `tag_table = self._buffer.get_tag_table()` `tag_table.add( make_texttag('changeset', foreground='#000090',` `paragraph_background='#F0F0F0'))` `tag_table.add(make_texttag('date', foreground='#000090',` `paragraph_background='#F0F0F0'))` `tag_table.add(make_texttag('tag', foreground='#000090',` `paragraph_background='#F0F0F0'))` `tag_table.add(make_texttag('files', foreground='#5C5C5C',` `paragraph_background='#F0F0F0'))` `tag_table.add(make_texttag('parent', foreground='#000090',` `paragraph_background='#F0F0F0'))` `tag_table.add(make_texttag('parenthl', foreground='#000090',` `paragraph_background='#F0F0F0',` `weight=pango.WEIGHT_BOLD ))` `tag_table.add( make_texttag( 'mono', family='Monospace' ))` `tag_table.add( make_texttag( 'blue', foreground='blue' ))` `tag_table.add( make_texttag( 'red', foreground='red' ))` `tag_table.add( make_texttag( 'green', foreground='darkgreen' ))` `tag_table.add( make_texttag( 'black', foreground='black' ))` `tag_table.add( make_texttag( 'greybg',` `paragraph_background='grey',` `weight=pango.WEIGHT_BOLD ))` `tag_table.add( make_texttag( 'yellowbg', background='yellow' ))` `link_tag = make_texttag( 'link', foreground='blue',` `underline=pango.UNDERLINE_SINGLE )` `linkhl_tag = make_texttag( 'linkhl', foreground='blue',` `underline=pango.UNDERLINE_SINGLE,` `weight=pango.WEIGHT_BOLD )` `link_tag.connect('event', self.link_event )` `linkhl_tag.connect('event', self.link_event )` `tag_table.add( link_tag )` `tag_table.add( linkhl_tag )` `def file_button_release(self, widget, event):` `if event.button == 3 and not (event.state & (gtk.gdk.SHIFT_MASK \|` `gtk.gdk.CONTROL_MASK)):` `self.file_popup_menu(widget, event.button, event.time)` `return False` `def file_popup_menu(self, treeview, button=0, time=0):` `if not self.curfile:` `return` `self.filemenu.popup(None, None, None, button, time)` `# If the filelog entry this changeset references does not link` `# back to this changeset, it means this changeset did not` `# actually change the contents of this file, and thus the file` `# cannot be annotated at this revision (since this changeset` `# does not appear in the filelog)` `ctx = self.repo[self.currev]` `try:` `fctx = ctx.filectx(self.curfile)` `has_filelog = fctx.filelog().linkrev(fctx.filerev()) == ctx.rev()` `except LookupError:` `has_filelog = False` `self.ann_menu.set_sensitive(has_filelog)` `self.save_menu.set_sensitive(has_filelog)` `return True` `def thgdiff(self, treeview):` `# Do not steal ctrl-d from changelog treeview` `if not treeview.is_focus() and self.glog_parent:` `w = self.glog_parent.get_focus()` `if isinstance(w, gtk.TreeView):` `w.emit('thg-diff')` `return False` `if not self.curfile:` `return False`-`self._diff_file('M', self.curfile)`+`self._do_diff([self.curfile], {'change' : self.currev})` `def file_row_act(self, tree, path, column) :` `'Default action is the first entry in the context menu'` `self.filemenu.get_children()[0].activate()` `return True` `def save_file_rev(self, menuitem):` `wfile = util.localpath(self.curfile)` `wfile, ext = os.path.splitext(os.path.basename(wfile))` `filename = "%s@%d%s" % (wfile, self.currev, ext)` `result = gtklib.NativeSaveFileDialogWrapper(Title=_("Save file to"),` `InitialDir=self.cwd,` `FileName=filename).run()` `if result:` `if os.path.exists(result):` `res = gdialog.Confirm(_('Confirm Overwrite'), [], self,` `_('The file "%s" already exists!\n\n'` `'Do you want to overwrite it?') % result).run()` `if res != gtk.RESPONSE_YES:` `return` `os.remove(result)` `q = Queue.Queue()` `hgcmd_toq(self.repo.root, q, 'cat', '--rev',` `str(self.currev), '--output', fromutf(result), self.curfile)` `def diff_to_local(self, menuitem):` `if not self.curfile:` `return`-`self.opts['rev'] = [str(self.currev)]`-`self._diff_file('M', self.curfile)`+`self._do_diff([self.curfile], {'rev' : str(self.currev)})` `def diff_file_rev(self, menuitem):` `'User selected visual diff file from the file list context menu'` `if not self.curfile:` `return`-`self.opts['change'] = str(self.currev)`-`self._diff_file('M', self.curfile)`-`del self.opts['change']`+`self._do_diff([self.curfile], {'change' : str(self.currev)})` `def view_file_rev(self, menuitem):` `'User selected view file revision from the file list context menu'` `if not self.curfile:` `return` `rev = self.currev` `parents = [x.rev() for x in self.repo[rev].parents()]` `if len(parents) == 0:` `parent = rev-1` `else:` `parent = parents[0]` `pair = '%u:%u' % (parent, rev)` `self._node1, self._node2 = cmdutil.revpair(self.repo, [pair])` `self._view_files([self.curfile], False)` `def ann_file(self, menuitem):` `'User selected annotate file from the file list context menu'` `from hggtk import datamine` `rev = self.currev` `dialog = datamine.DataMineDialog(self.ui, self.repo, self.cwd, [], {})` `dialog.display()` `dialog.add_annotate_page(self.curfile, str(rev))` `def file_history(self, menuitem):` `'User selected file history from file list context menu'` `if self.glog_parent:` `# If this changeset browser is embedded in glog, send` `# send this event to the main app` `opts = {'pats' : [self.curfile]}` `self.glog_parent.custombutton.set_active(True)` `self.glog_parent.reload_log(opts)` `else:` `# Else launch our own glog instance` `from hggtk import history` `dlg = history.run(self.ui, filehist=self.curfile)` `dlg.display()` `def revert_file(self, menuitem):` `'User selected file revert from the file list context menu'` `rev = self.currev` `dialog = gdialog.Confirm(_('Confirm revert file to old revision'),` `[], self, _('Revert %s to contents at revision %d?') %` `(self.curfile, rev))` `if dialog.run() == gtk.RESPONSE_NO:` `return` `cmdline = ['hg', 'revert', '--verbose', '--rev', str(rev), self.curfile]` `dlg = hgcmd.CmdDialog(cmdline)` `dlg.run()` `dlg.hide()` `shlib.shell_notify([self.repo.wjoin(self.curfile)])` `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)`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/datamine.py Stacked
165 166 167 168 169 170 171 615 616 617 618 619 620 621	165 166 167 168 169 170 171 615 616 617 618 619 620 621	@@ -165,7 +165,7 @@ `return True` `def grep_thgdiff(self, treeview):`-`self._do_diff([], {'change' : self.currev}, modal=True)`+`self._do_diff([], {'change' : self.currev})` `def grep_row_act(self, tree, path, column):` `'Default action is the first entry in the context menu'`@@ -615,7 +615,7 @@ `return True` `def annotate_thgdiff(self, treeview):`-`self._do_diff([], {'change' : self.currev}, modal=True)`+`self._do_diff([], {'change' : self.currev})` `def toggle_annatate_columns(self, button, treeview, col):` `b = button.get_active()`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/gdialog.py Stacked
405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420	405 406 407 408 409 410 411 412 413 414 415 416 417 418 419	@@ -405,16 +405,15 @@ `return True, textout` -`def _do_diff(self, canonpats, options, modal=False):`+`def _do_diff(self, canonpats, options):` `from hggtk import visdiff` `options['canonpats'] = canonpats` `dialog = visdiff.run(self.ui, **options)` `if not dialog:` `return` `dialog.show_all()`-`if modal:`-`dialog.run()`-`dialog.hide()`+`dialog.run()`+`dialog.hide()` `def _diff_file(self, stat, file):` `self._do_diff(file and [file] or [], self.opts)`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/history.py Stacked
638 639 640 641 642 643 644 645 646 647 648 649 659 660 661 662 663 664 665 666 667 668 669 670	638 639 640 641 642 643 644 645 646 647 648 649 659 660 661 662 663 664 665 666	@@ -638,12 +638,12 @@ `def vdiff_change(self, menuitem, pats=[]):` `rev = self.currow[treemodel.REVID]`-`self._do_diff(pats, {'change' : rev}, modal=True)`+`self._do_diff(pats, {'change' : rev})` `def vdiff_local(self, menuitem, pats=[]):` `rev = self.currow[treemodel.REVID]` `opts = {'rev' : ["%s" % rev]}`-`self._do_diff(pats, opts, modal=True)`+`self._do_diff(pats, opts)` `def diff_revs(self, menuitem):` `rev0, rev1 = self.revs`@@ -659,12 +659,8 @@ `return True` `def vdiff_selected(self, menuitem):`-`rev0, rev1 = self.revs`-`self.opts['rev'] = ["%s:%s" % (rev0, rev1)]`-`if len(self.pats) == 1:`-`self._diff_file(None, self.pats[0])`-`else:`-`self._diff_file(None, None)`+`strrevs = [str(r) for r in self.revs]`+`self._do_diff(self.pats, {'rev' : strrevs})` `def email_revs(self, menuitem):` `revs = list(self.revs)`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/logfilter.py Stacked
197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215	197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216	@@ -197,19 +197,20 @@ `self.dateentry.grab_focus()` `return` `elif self.revradio.get_active():`-`rev0 = self.rev0Entry.get_text()`-`rev1 = self.rev1Entry.get_text()`+`rev0 = self.rev0Entry.get_text().strip()`+`rev1 = self.rev1Entry.get_text().strip()` `if not rev1:` `rev1 = rev0`-`try:`-`rrange = cmdutil.revrange(self.repo, [rev0, rev1])`-`rrange.sort()`-`rrange.reverse()`-`opts['revrange'] = rrange`-`except Exception, e:`-`gdialog.Prompt(_('Invalid revision range'), str(e), self).run()`-`self.rev0Entry.grab_focus()`-`return`+`if rev0:`+`try:`+`rrange = cmdutil.revrange(self.repo, [rev0, rev1])`+`rrange.sort()`+`rrange.reverse()`+`opts['revrange'] = rrange`+`except Exception, e:`+`gdialog.Prompt(_('Invalid revision range'), str(e), self).run()`+`self.rev0Entry.grab_focus()`+`return` `elif self.branchradio.get_active():` `branch = self.branchbox.child.get_text()` `if branch:`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/visdiff.py Stacked
308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327	308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326	@@ -308,20 +308,19 @@ `change = opts.get('change')` `if change:` `args.extend(['--change', str(change)])`-`if len(revs) == 1:`-`args.extend(['--change', str(revs[0])])`-`else:`-`for r in revs:`-`args.extend(['--rev', str(r)])`+`for r in revs:`+`args.extend(['--rev', str(r)])` `args.extend(pats)` `args.extend(opts.get('canonpats', []))` `if os.name == 'nt':` `args = ['"%s"' % arg for arg in args]` `oldcwd = os.getcwd()`-`root = paths.find_root()`-`os.chdir(root)`-`os.spawnv(os.P_NOWAIT, sys.executable, args)`-`os.chdir(oldcwd)`+`root = paths.find_root(oldcwd)`+`try:`+`os.chdir(root)`+`os.spawnv(os.P_NOWAIT, sys.executable, args)`+`finally:`+`os.chdir(oldcwd)` `return None` `else:` `pats = hglib.canonpaths(pats)`

Diff Options

merge with stable

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

merge with stable

Diff to 5a1aad3c0092

Attach a Trello Card

Add a tag

Your session has expired