Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable revdetails: Show modified subrepos on revision details panel

This change adds some basic support for showing modified subrepos on the
revision details.
Current limitations are:
- Due to a lack of subrepo specific icon, I am using the "hg" icon to represent
modified subrepos on the file list. This only makes sense for hg subrepos though
- It can only preview mercurial subrepos
- Behaviour for merge revisions is probably not perfect
- The "open..." link does not work. This is surprising since the code that is
used to generate the link (and the link contents) is exactly the same that is
used to generate the link on the status widget. I assume that the status and
revision details panels behave differently on this regard.

Changeset 30e0273a0503…

Parent 97af7374008c…

by Angel Ezquerra

Changes to 2 files · Browse files at 30e0273a0503 Showing diff from parent 97af7374008c Diff from another changeset...

Change 1 of 3 Show Changes Only tortoisehg/​hgqt/​filelistmodel.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
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
 # Copyright (c) 2009-2010 LOGILAB S.A. (Paris, FRANCE).  # http://www.logilab.fr/ -- mailto:contact@logilab.fr  #  # This program is free software; you can redistribute it and/or modify it under  # the terms of the GNU General Public License as published by the Free Software  # Foundation; either version 2 of the License, or (at your option) any later  # version.  #  # This program is distributed in the hope that it will be useful, but WITHOUT  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS  # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.  #  # You should have received a copy of the GNU General Public License along with  # this program; if not, write to the Free Software Foundation, Inc.,  # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.   -from tortoisehg.util import hglib +from tortoisehg.util import hglib, patchctx    from tortoisehg.hgqt.qtlib import geticon    from PyQt4.QtCore import *  from PyQt4.QtGui import *    nullvariant = QVariant()    class HgFileListModel(QAbstractTableModel):   """   Model used for listing (modified) files of a given Hg revision   """     contextChanged = pyqtSignal(object)     def __init__(self, repo, parent):   """   data is a HgHLRepo instance   """   QAbstractTableModel.__init__(self, parent)   self.repo = repo   self._boldfont = parent.font()   self._boldfont.setBold(True)   self._ctx = None   self._files = []   self._filesdict = {}   self._fulllist = False   self._secondParent = False     @pyqtSlot(bool)   def toggleFullFileList(self, value):   self._fulllist = value   self.loadFiles()   self.layoutChanged.emit()     @pyqtSlot(bool)   def toggleSecondParent(self, value):   self._secondParent = value   self.layoutChanged.emit()     def __len__(self):   return len(self._files)     def rowCount(self, parent=None):   return len(self)     def columnCount(self, parent=None):   return 1     def file(self, row):   return self._files[row]['path']     def setContext(self, ctx):   self.contextChanged.emit(ctx)   reload = False   if not self._ctx:   reload = True   elif self._ctx.rev() is None:   reload = True   elif ctx.thgid() != self._ctx.thgid():   reload = True   if reload:   self._ctx = ctx   self.loadFiles()   self.layoutChanged.emit()     def fileFromIndex(self, index):   if not index.isValid() or index.row()>=len(self) or not self._ctx:   return None   row = index.row()   return self._files[row]['path']     def revFromIndex(self, index):   'return revision for index. index is guarunteed to be valid'   if len(self._ctx.parents()) < 2:   return None   row = index.row()   data = self._files[row]   if (data['wasmerged'] and self._secondParent) or \   (data['parent'] == 1 and self._fulllist):   return self._ctx.p2().rev()   else:   return self._ctx.p1().rev()     def dataFromIndex(self, index):   if not index.isValid() or index.row()>=len(self) or not self._ctx:   return None   row = index.row()   return self._files[row]     def indexFromFile(self, filename):   if filename in self._filesdict:   row = self._files.index(self._filesdict[filename])   return self.index(row, 0)   return QModelIndex()     def _buildDesc(self, parent):   files = []   ctxfiles = self._ctx.files()   modified, added, removed = self._ctx.changesToParent(parent)   ismerge = bool(self._ctx.p2()) + + # Add the list of modified subrepos to the top of the list + if not isinstance(self._ctx, patchctx.patchctx): + from mercurial import subrepo + for s, sd in self._ctx.substate.items(): + srev = self._ctx.substate.get(s, subrepo.nullstate)[1] + sp1rev = self._ctx.p1().substate.get(s, subrepo.nullstate)[1] + sp2rev = '' + if ismerge: + sp2rev = self._ctx.p2().substate.get(s, subrepo.nullstate)[1] + if srev != sp1rev or (sp2rev != '' and srev != sp2rev): + wasmerged = ismerge and s in ctxfiles + files.append({'path': s, 'status': 'S', 'parent': parent, + 'wasmerged': wasmerged}) +   if self._fulllist and ismerge:   func = lambda x: True   else:   func = lambda x: x in ctxfiles   for lst, flag in ((added, 'A'), (modified, 'M'), (removed, 'R')):   for f in filter(func, lst):   wasmerged = ismerge and f in ctxfiles   files.append({'path': f, 'status': flag, 'parent': parent,   'wasmerged': wasmerged})   return files     def loadFiles(self):   self._files = []   self._files = self._buildDesc(0)   if bool(self._ctx.p2()):   _paths = [x['path'] for x in self._files]   _files = self._buildDesc(1)   self._files += [x for x in _files if x['path'] not in _paths]   self._filesdict = dict([(f['path'], f) for f in self._files])     def data(self, index, role):   if not index.isValid() or index.row()>len(self) or not self._ctx:   return nullvariant   if index.column() != 0:   return nullvariant     row = index.row()   column = index.column()     current_file_desc = self._files[row]   current_file = current_file_desc['path']     if role in (Qt.DisplayRole, Qt.ToolTipRole):   return QVariant(hglib.tounicode(current_file))   elif role == Qt.DecorationRole:   if self._fulllist and bool(self._ctx.p2()):   if current_file_desc['wasmerged']:   icn = geticon('thg-file-merged')   elif current_file_desc['parent'] == 0:   icn = geticon('thg-file-p0')   elif current_file_desc['parent'] == 1:   icn = geticon('thg-file-p1')   return QVariant(icn.pixmap(20,20))   elif current_file_desc['status'] == 'A':   return QVariant(geticon('fileadd'))   elif current_file_desc['status'] == 'R':   return QVariant(geticon('filedelete')) + elif current_file_desc['status'] == 'S': + return QVariant(geticon('hg'))   #else:   # return QVariant(geticon('filemodify'))   elif role == Qt.FontRole:   if current_file_desc['wasmerged']:   return QVariant(self._boldfont)   else:   return nullvariant
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
605
606
607
608
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
609
610
611
 
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
639
640
 
641
642
643
 
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
 
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
667
668
669
@@ -605,7 +605,25 @@
  if status == 'S':   try:   from mercurial import subrepo, commands - assert(ctx.rev() is None) + + def genSubrepoRevChangedDescription(sfrom, sto): + """Generate a subrepository revision change description""" + out = [] + opts = {'date':None, 'user':None, 'rev':[sfrom]} + if not sfrom: + out.append(_('Subrepo initialized to revision:') + u'\n\n') + else: + out.append(_('Revision has changed from:') + u'\n\n') + _ui.pushbuffer() + commands.log(_ui, srepo, **opts) + out.append(hglib.tounicode(_ui.popbuffer())) + out.append(_('To:') + u'\n') + opts['rev'] = [sto] + _ui.pushbuffer() + commands.log(_ui, srepo, **opts) + out.append(hglib.tounicode(_ui.popbuffer())) + return out +   srev = ctx.substate.get(wfile, subrepo.nullstate)[1]   sub = ctx.sub(wfile)   if isinstance(sub, subrepo.hgsubrepo): @@ -623,21 +641,29 @@
  out.append(_('File Status:') + u'\n')   out.append(hglib.tounicode(data))   out.append(u'\n') - if srev == '': - out.append(_('New subrepository') + u'\n\n') - elif srev != sactual: - out.append(_('Revision has changed from:') + u'\n\n') - opts = {'date':None, 'user':None, 'rev':[srev]} - _ui.pushbuffer() - commands.log(_ui, srepo, **opts) - out.append(hglib.tounicode(_ui.popbuffer())) - out.append(_('To:') + u'\n') - opts['rev'] = [sactual] - _ui.pushbuffer() - commands.log(_ui, srepo, **opts) - out.append(hglib.tounicode(_ui.popbuffer())) + sstatedesc = 'changed' + if ctx.rev() is not None: + sparent = ctx.p1().substate.get(wfile, subrepo.nullstate)[1] + out += genSubrepoRevChangedDescription(sparent, srev) + else: + sstatedesc = 'dirty' + if srev == '': + sstatedesc = 'new' + out.append(_('New subrepository') + u'\n\n') + elif srev != sactual: + sstatedesc = 'changed' + out.append(_('Revision has changed from:') + u'\n\n') + opts = {'date':None, 'user':None, 'rev':[srev]} + _ui.pushbuffer() + commands.log(_ui, srepo, **opts) + out.append(hglib.tounicode(_ui.popbuffer())) + out.append(_('To:') + u'\n') + opts['rev'] = [sactual] + _ui.pushbuffer() + commands.log(_ui, srepo, **opts) + out.append(hglib.tounicode(_ui.popbuffer()))   self.contents = u''.join(out) - self.flabel += _(' <i>(is a dirty sub-repository)</i>') + self.flabel += _(' <i>(is a %s sub-repository)</i>' % sstatedesc)   lbl = u' <a href="subrepo:%s">%s...</a>'   self.flabel += lbl % (hglib.tounicode(srepo.root), _('open'))   except (EnvironmentError, error.RepoError, util.Abort), e: