Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset fa4af62c8e59…

Parents bfb34f3aaa50…

Parents 4862de17b8dd…

by Steve Borho

Changes to 3 files · Browse files at fa4af62c8e59 Showing diff from parent bfb34f3aaa50 4862de17b8dd Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​htmlui.py Stacked
 
21
22
23
24
25
26
27
 
21
22
23
 
24
25
26
@@ -21,7 +21,6 @@
  self.setconfig('ui', 'interactive', 'off')   self.setconfig('progress', 'disable', 'True')   self.output, self.error = [], [] - os.environ['TERM'] = 'dumb'     def write(self, *args, **opts):   label = opts.get('label', '')
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
 
14
15
16
17
 
18
19
20
 
40
41
42
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
43
44
45
 
14
15
16
 
17
18
19
20
 
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
@@ -14,7 +14,7 @@
   from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib, cmdui, visdiff, thgrepo +from tortoisehg.hgqt import qtlib, cmdui, csinfo, visdiff, thgrepo    MARGINS = (8, 0, 0, 0)   @@ -40,6 +40,40 @@
  hbox.addWidget(tb)   hbox.addWidget(self.stlabel)   + def revisionInfoLayout(repo): + """ + Return a layout containg the revision information (local and other) + """ + hbox = QHBoxLayout() + hbox.setSpacing(0) + hbox.setContentsMargins(*MARGINS) + + vbox = QVBoxLayout() + vbox.setContentsMargins(*MARGINS) + hbox.addLayout(vbox) + localrevtitle = qtlib.LabeledSeparator(_('Local revision information')) + localrevinfo = csinfo.create(repo) + localrevinfo.update(repo[None].p1()) + vbox.addWidget(localrevtitle) + vbox.addWidget(localrevinfo) + vbox.addStretch() + + vbox = QVBoxLayout() + vbox.setContentsMargins(*MARGINS) + hbox.addLayout(vbox) + otherrevtitle = qtlib.LabeledSeparator(_('Other revision information')) + otherrevinfo = csinfo.create(repo) + otherrevinfo.update(repo[None].p2()) + + vbox.addWidget(otherrevtitle) + vbox.addWidget(otherrevinfo) + vbox.addStretch() + + return hbox + + if len(self.repo[None].parents()) > 1: + self.layout().addLayout(revisionInfoLayout(self.repo)) +   unres = qtlib.LabeledSeparator(_('Unresolved conflicts'))   self.layout().addWidget(unres)  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​thread.py Stacked
 
101
102
103
104
105
106
107
 
101
102
103
 
104
105
106
@@ -101,7 +101,6 @@
    self.setconfig('ui', 'interactive', 'on')   self.setconfig('progress', 'disable', 'True') - os.environ['TERM'] = 'dumb'     def write(self, *args, **opts):   if self._buffers: