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: use csinfo panel

Changeset b4d550ea0656…

Parent 0940acb2c755…

by Yuki KODAMA

Changes to one file · Browse files at b4d550ea0656 Showing diff from parent 0940acb2c755 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
68
69
70
71
72
73
74
75
76
 
 
 
 
 
 
 
 
 
 
 
 
 
77
78
79
80
81
82
83
 
 
 
 
84
 
 
 
 
 
 
85
86
87
 
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
@@ -68,20 +68,31 @@
  commands.update(repo.ui, repo, rev=rev0, check=True)   repo.ui.quiet = False   - frame = gtk.Frame(_('Merge target (other)')) - self.otherrev, desc = csinfo.create(repo, rev1, True) - frame.add(desc) - frame.set_border_width(5) - self.vbox.pack_start(frame, False, False) - self.otherframe = frame + # changeset info + style = csinfo.panelstyle(contents=csinfo.PANEL_DEFAULT + ('ishead',), + margin=5, padding=2) + def data_func(widget, ctx): + node = ctx.node() + return node in repo.heads() + def markup_func(widget, value): + if value: + return '' + return gtklib.markup(_('Not a head revision!'), weight='bold') + custom = csinfo.custom(ishead={ + 'data': data_func, 'markup': markup_func}) + createinfo = csinfo.factory(style=style, repo=repo, custom=custom)   - frame = gtk.Frame(_('Current revision (local)')) - self.localrev, desc = csinfo.create(repo, rev0, True) - frame.add(desc) - frame.set_border_width(5) - self.vbox.pack_start(frame, False, False) - self.localframe = frame + info = createinfo(rev1, style={'label': _('Merge target (other)')}) + self.vbox.pack_start(info, False, False) + self.otherframe = info + self.otherrev = info.get_data('revnum')   + info = createinfo(rev0, style={'label': _('Current revision (local)')}) + self.vbox.pack_start(info, False, False) + self.localframe = info + self.localrev = '???' + + # buttons   self.mergebtn = self.add_button(_('Merge'), RESPONSE_MERGE)   self.commitbtn = self.add_button(_('Commit'), RESPONSE_COMMIT)   self.undobtn = self.add_button(_('Undo'), RESPONSE_UNDO)