Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph

thgrepo, filedata, filelistmodel, manifestmodel: add support for largefiles

Changeset c08f68ca89ab…

Parent 467bba3abf63…

by David Golub

Changes to 4 files · Browse files at c08f68ca89ab Showing diff from parent 467bba3abf63 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​filedata.py Stacked
 
47
48
49
50
 
51
52
53
 
303
304
305
306
 
307
308
309
 
319
320
321
322
 
323
324
325
 
330
331
332
333
334
 
 
335
336
337
 
47
48
49
 
50
51
52
53
 
303
304
305
 
306
307
308
309
 
319
320
321
 
322
323
324
325
 
330
331
332
 
 
333
334
335
336
337
@@ -47,7 +47,7 @@
  return None   try:   data = fctx.data() - if '\0' in data or ctx.isKbf(wfile): + if '\0' in data or ctx.isStandin(wfile):   self.error = p + _('File is binary.\n')   return None   except (EnvironmentError, util.Abort), e: @@ -303,7 +303,7 @@
  else:   self.contents = olddata   self.flabel += _(' <i>(was deleted)</i>') - elif hasattr(ctx.p1(), 'hasBfile') and ctx.p1().hasBfile(wfile): + elif hasattr(ctx.p1(), 'hasStandin') and ctx.p1().hasStandin(wfile):   self.error = 'binary file'   self.flabel += _(' <i>(was deleted)</i>')   else: @@ -319,7 +319,7 @@
  return   else:   data = util.posixfile(absfile, 'r').read() - elif ctx.hasBfile(wfile): + elif ctx.hasStandin(wfile):   data = '\0'   else:   data = ctx.filectx(wfile).data() @@ -330,8 +330,8 @@
  return     if status in ('M', 'A'): - if ctx.hasBfile(wfile): - wfile = ctx.standin(wfile) + if ctx.hasStandin(wfile): + wfile = ctx.findStandin(wfile)   isbfile = True   res = self.checkMaxDiff(ctx, wfile, maxdiff)   if res is None:
Change 1 of 1 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
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
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
 # 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.,  # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.    from tortoisehg.util import hglib, patchctx    from tortoisehg.hgqt.qtlib import geticon, getoverlaidicon    from PyQt4.QtCore import *  from PyQt4.QtGui import *    nullvariant = QVariant()    def getSubrepoIcoDict():   'Return a dictionary mapping each subrepo type to the corresponding icon'   _subrepoType2IcoMap = {   'hg': 'hg',   'git': 'thg-git-subrepo',   'svn': 'thg-svn-subrepo',   'hgsubversion': 'thg-svn-subrepo',   'empty': 'hg'   }   icOverlay = geticon('thg-subrepo')   subrepoIcoDict = {}   for stype in _subrepoType2IcoMap:   ic = geticon(_subrepoType2IcoMap[stype])   ic = getoverlaidicon(ic, icOverlay)   subrepoIcoDict[stype] = ic   return subrepoIcoDict    class HgFileListModel(QAbstractTableModel):   """   Model used for listing (modified) files of a given Hg revision   """   showMessage = pyqtSignal(QString)     def __init__(self, parent):   QAbstractTableModel.__init__(self, parent)   self._boldfont = parent.font()   self._boldfont.setBold(True)   self._ctx = None   self._files = []   self._filesdict = {}   self._fulllist = False   self._subrepoIcoDict = getSubrepoIcoDict()     @pyqtSlot(bool)   def toggleFullFileList(self, value):   self._fulllist = value   self.loadFiles()   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):   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 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):   if ".hgsubstate" in ctxfiles or ".hgsub" in ctxfiles:   from mercurial import subrepo   # Add the list of modified subrepos   for s, sd in self._ctx.substate.items():   srev = self._ctx.substate.get(s, subrepo.nullstate)[1]   stype = self._ctx.substate.get(s, subrepo.nullstate)[2]   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, 'stype': stype})   # Add the list of missing subrepos   subreposet = set(self._ctx.substate.keys())   subrepoparent1set = set(self._ctx.p1().substate.keys())   missingsubreposet = subrepoparent1set.difference(subreposet)   for s in missingsubreposet:   wasmerged = ismerge and s in ctxfiles   stype = self._ctx.p1().substate.get(s, subrepo.nullstate)[2]   files.append({'path': s, 'status': 'S', 'parent': parent,   'wasmerged': wasmerged, 'stype': stype})     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 - f = self._ctx.removeKbf(f) + f = self._ctx.removeStandin(f)   files.append({'path': f, 'status': flag, 'parent': parent,   'wasmerged': wasmerged})   return files     def loadFiles(self):   self._files = []   try:   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]   except EnvironmentError, e:   self.showMessage.emit(hglib.tounicode(str(e)))   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':   stype = current_file_desc.get('stype', 'hg')   return QVariant(self._subrepoIcoDict[stype])   #else:   # return QVariant(geticon('filemodify'))   elif role == Qt.FontRole:   if current_file_desc['wasmerged']:   return QVariant(self._boldfont)   else:   return nullvariant
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​manifestmodel.py Stacked
 
252
253
254
255
 
256
257
258
 
252
253
254
 
255
256
257
258
@@ -252,7 +252,7 @@
  continue     origpath = path - path = self._repo.removeKbf(path) + path = self._repo.removeStandin(path)     e = treeroot   for p in hglib.tounicode(path).split('/'):
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
 
26
27
28
 
29
30
31
 
537
538
539
540
541
 
 
 
 
 
 
 
 
542
543
544
 
 
 
 
545
546
547
548
 
549
 
 
 
550
551
552
 
615
616
617
618
619
 
 
 
 
 
 
 
 
620
621
622
 
 
623
624
625
 
 
626
627
628
629
 
 
 
 
 
 
630
631
632
 
674
675
676
677
 
678
 
 
 
 
26
27
28
29
30
31
32
 
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
 
627
628
629
 
 
630
631
632
633
634
635
636
637
638
 
 
639
640
641
 
 
642
643
644
 
 
 
645
646
647
648
649
650
651
652
653
 
695
696
697
 
698
699
700
701
702
@@ -26,6 +26,7 @@
   _repocache = {}  _kbfregex = re.compile(r'^\.kbf/') +_lfregex = re.compile(r'^\.hglf/')    if 'THGDEBUG' in os.environ:   def dbgoutput(*args): @@ -537,16 +538,27 @@
  dest = tempfile.mktemp(ext+'.bak', root+'_', trashcan)   shutil.copyfile(path, dest)   - def isKbf(self, path): - return 'kbfiles' in self.extensions() and _kbfregex.match(path) + def isStandin(self, path): + if 'largefiles' in self.extensions(): + if _lfregex.match(path): + return True + if 'largefiles' in self.extensions() or 'kbfiles' in self.extensions(): + if _kbfregex.match(path): + return True + return False   - def removeKbf(self, path): - if 'kbfiles' in self.extensions(): + def removeStandin(self, path): + if 'largefiles' in self.extensions(): + path = _lfregex.sub('', path) + if 'largefiles' in self.extensions() or 'kbfiles' in self.extensions():   path = _kbfregex.sub('', path)   return path   - def standin(self, path): + def bfStandin(self, path):   return '.kbf/' + path + + def lfStandin(self, path): + return '.hglf/' + path     return thgrepository   @@ -615,18 +627,27 @@
    return summary   - def hasBfile(self, file): - return 'kbfiles' in self._repo.extensions() and self._repo.standin(file) in self.manifest() + def hasStandin(self, file): + if 'largefiles' in self._repo.extensions(): + if self._repo.lfStandin(file) in self.manifest(): + return True + elif 'largefiles' in self._repo.extensions() or 'kbfiles' in self._repo.extensions(): + if self._repo.bfStandin(file) in self.manifest(): + return True + return False   - def isKbf(self, path): - return self._repo.isKbf(path) + def isStandin(self, path): + return self._repo.isStandin(path)   - def removeKbf(self, path): - return self._repo.removeKbf(path) + def removeStandin(self, path): + return self._repo.removeStandin(path)   - def standin(self, path): - return self._repo.standin(path) - + def findStandin(self, file): + if 'largefiles' in self._repo.extensions(): + if self._repo.lfStandin(file) in self.manifest(): + return self._repo.lfStandin(file) + return self._repo.bfStandin(file) +   return thgchangectx    _pctxcache = {} @@ -674,5 +695,8 @@
  else:   f.close()   -def isKbf(path): +def isBfStandin(path):   return _kbfregex.match(path) + +def isLfStandin(path): + return _lfregex.match(path)