Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

merge: show working directory status

Changeset c71cea49a9a4…

Parent d4085ecdbf3c…

by Yuki KODAMA

Changes to one file · Browse files at c71cea49a9a4 Showing diff from parent d4085ecdbf3c Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
487
488
489
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
490
491
492
493
494
 
 
495
496
497
498
499
500
 
501
502
503
 
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
@@ -487,17 +487,60 @@
  repo = self.wizard().repo   box = QVBoxLayout()   + # csinfo + def label_func(widget, item): + if item == 'rev': + return _('Revision:') + elif item == 'parents': + return _('Parents') + raise csinfo.UnknownItem() + def data_func(widget, item, ctx): + if item == 'rev': + return _('Working Directory'), str(ctx) + elif item == 'parents': + parents = [] + cbranch = ctx.branch() + for pctx in ctx.parents(): + branch = None + if hasattr(pctx, 'branch') and pctx.branch() != cbranch: + branch = pctx.branch() + parents.append((str(pctx.rev()), str(pctx), branch, pctx)) + return parents + raise csinfo.UnknownItem() + def markup_func(widget, item, value): + if item == 'rev': + text, rev = value + return '%s (%s)' % (text, rev) + elif item == 'parents': + def branch_markup(branch): + opts = dict(fg='black', bg='#aaffaa') + return qtlib.markup(' %s ' % branch, **opts) + csets = [] + for rnum, rid, branch, pctx in value: + line = '%s (%s)' % (rnum, rid) + if branch: + line = '%s %s' % (line, branch_markup(branch)) + msg = widget.info.get_data('summary', widget, + pctx, widget.custom) + if msg: + line = '%s %s' % (line, msg) + csets.append(line) + return csets + raise csinfo.UnknownItem() + custom = csinfo.custom(label=label_func, data=data_func, + markup=markup_func) + contents = ('rev', 'user', 'dateage', 'branch', 'parents') + style = csinfo.panelstyle(contents=contents, margin=6) + + # merged files   box.addSpacing(12)   rev_sep = qtlib.LabeledSeparator(_('Working Directory (merged)'))   box.addWidget(rev_sep) - style = csinfo.panelstyle(margin=6) - rev_info = csinfo.create(repo, None, style, withupdate=True) + rev_info = csinfo.create(repo, None, style, custom=custom, + withupdate=True)   box.addWidget(rev_info)   - # TODO - todo = QLabel('<b>TODO:</b> Merged files are shown in here') - box.addWidget(todo) - + # commit message area   msg_sep = qtlib.LabeledSeparator(_('Commit message'))   box.addWidget(msg_sep)   msg_text = QTextEdit()