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

fogcreek Merge with stable

Changeset eacaa46c6eae…

Parents 0524579d8c04…

Parents 49d1b27ed01a…

by David Golub

Changes to 9 files · Browse files at eacaa46c6eae Showing diff from parent 0524579d8c04 49d1b27ed01a Diff from another changeset...

Change 1 of 1 Show Entire File .hgeol Stacked
 
 
 
 
 
 
 
 
1
2
3
4
5
6
@@ -0,0 +1,6 @@
+[patterns] +**.py = native +**.py.out = native + +[repository] +native = LF
Change 1 of 6 Show Entire File tortoisehg/​hgqt/​filedata.py Stacked
 
6
7
8
 
9
10
11
 
47
48
49
50
 
51
52
53
 
72
73
74
 
75
76
77
 
301
302
303
 
 
 
304
305
306
 
323
324
325
 
 
 
326
327
328
 
364
365
366
 
 
 
367
368
 
6
7
8
9
10
11
12
 
48
49
50
 
51
52
53
54
 
73
74
75
76
77
78
79
 
303
304
305
306
307
308
309
310
311
 
328
329
330
331
332
333
334
335
336
 
372
373
374
375
376
377
378
379
@@ -6,6 +6,7 @@
 # GNU General Public License version 2, incorporated herein by reference.    import os +import re    from mercurial import error, match, patch, util, mdiff  from mercurial import ui as uimod @@ -47,7 +48,7 @@
  return None   try:   data = fctx.data() - if '\0' in data: + if '\0' in data or re.match(r'^\.kbf/', wfile):   self.error = p + _('File is binary.\n')   return None   except (EnvironmentError, util.Abort), e: @@ -72,6 +73,7 @@
  return 'C'   return None   + isbfile = False   repo = ctx._repo   self.flabel += u'<b>%s</b>' % hglib.tounicode(wfile)   @@ -301,6 +303,9 @@
  else:   self.contents = olddata   self.flabel += _(' <i>(was deleted)</i>') + elif '.kbf/' + wfile in ctx.p1(): + self.error = 'binary file' + self.flabel += _(' <i>(was deleted)</i>')   else:   self.flabel += _(' <i>(was added, now missing)</i>')   return @@ -323,6 +328,9 @@
  return     if status in ('M', 'A'): + if '.kbf/' + wfile in ctx: + wfile = '.kbf/' + wfile + isbfile = True   res = self.checkMaxDiff(ctx, wfile, maxdiff)   if res is None:   return @@ -364,5 +372,8 @@
  revs = [str(ctx), str(ctx2)]   diffopts = patch.diffopts(repo.ui, {})   diffopts.git = False + if isbfile: + olddata += '\0' + newdata += '\0'   self.diff = mdiff.unidiff(olddata, olddate, newdata, newdate,   oldname, wfile, revs, diffopts)
Change 1 of 2 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
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
201
202
 # 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.   +import re +  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 = re.sub(r'^\.kbf/', '', 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/​quickop.py Stacked
 
136
137
138
139
 
 
 
 
140
141
 
142
143
144
 
136
137
138
 
139
140
141
142
143
 
144
145
146
147
@@ -136,9 +136,12 @@
  parent=self)   return   if self.command == 'remove': - wctx = self.repo[None] + self.repo.bfstatus = True + repostate = self.repo.status() + self.repo.bfstatus = False + unknown, ignored = repostate[4:6]   for wfile in files: - if wfile not in wctx: + if wfile in unknown or wfile in ignored:   try:   util.unlink(wfile)   except EnvironmentError:
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
413
414
415
 
416
 
417
418
419
 
425
426
427
 
428
 
429
430
431
 
432
 
433
434
435
 
413
414
415
416
417
418
419
420
421
 
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
@@ -413,7 +413,9 @@
  # status and commit only pre-check MAR files   precheckfn = lambda x: x < 4   m = hglib.match(self.repo[None], self.pats) + self.repo.bfstatus = True   status = self.repo.status(match=m, **stopts) + self.repo.bfstatus = False   # Record all matched files as initially checked   for i, stat in enumerate(StatusType.preferredOrder):   if stat == 'S': @@ -425,11 +427,15 @@
  wctx = context.workingctx(self.repo, changes=status)   self.patchecked = patchecked   elif self.pctx: + self.repo.bfstatus = True   status = self.repo.status(node1=self.pctx.p1().node(), **stopts) + self.repo.bfstatus = False   wctx = context.workingctx(self.repo, changes=status)   else:   wctx = self.repo[None] + self.repo.bfstatus = True   wctx.status(**stopts) + self.repo.bfstatus = False   self.wctx = wctx     wctx.dirtySubrepos = []
Change 1 of 1 Show Entire File tortoisehg/​util/​shlib.py Stacked
 
90
91
92
 
93
 
94
95
96
 
90
91
92
93
94
95
96
97
98
@@ -90,7 +90,9 @@
  time.sleep(tdelta)     repo = hg.repository(ui, root) # a fresh repo object is needed + repo.bfstatus = True   repostate = repo.status() # will update .hg/dirstate as a side effect + repo.bfstatus = False   modified, added, removed, deleted = repostate[:4]     dirstatus = {}
Change 1 of 5 Show Entire File win32/​shellext/​Dirstatecache.cpp Stacked
 
31
32
33
34
 
 
35
36
37
 
40
41
42
43
 
44
45
46
47
48
 
 
49
50
51
 
71
72
73
 
74
75
76
 
159
160
161
162
 
163
164
165
 
168
169
170
171
 
172
173
174
 
31
32
33
 
34
35
36
37
38
 
41
42
43
 
44
45
46
47
48
 
49
50
51
52
53
 
73
74
75
76
77
78
79
 
162
163
164
 
165
166
167
168
 
171
172
173
 
174
175
176
177
@@ -31,7 +31,8 @@
     Dirstate* Dirstatecache::get( - const std::string& hgroot, const std::string& cwd, bool& unset) + const std::string& hgroot, const std::string& cwd, bool& unset, + bool usekbfiles)  {   unset = false;   @@ -40,12 +41,13 @@
  Iter iter = cache().begin();   for (;iter != cache().end(); ++iter)   { - if (hgroot == iter->hgroot) + if (hgroot == iter->hgroot && usekbfiles == iter->usekbfiles)   break;   }     Winstat64 stat; - std::string path = hgroot + "\\.hg\\dirstate"; + std::string path = hgroot + (usekbfiles ? "\\.hg\\kilnbfiles\\dirstate" + : "\\.hg\\dirstate");     unsigned tc = GetTickCount();   bool new_stat = false; @@ -71,6 +73,7 @@
    E e;   e.hgroot = hgroot; + e.usekbfiles = usekbfiles;   cache().push_front(e);   iter = cache().begin();   iter->tickcount = tc; @@ -159,7 +162,7 @@
 }     -void Dirstatecache::invalidate(const std::string& hgroot) +void Dirstatecache::invalidate(const std::string& hgroot, bool usekbfiles)  {   typedef std::list<E>::iterator Iter;   @@ -168,7 +171,7 @@
    for (Iter i = cache().begin(); i != cache().end(); ++i)   { - if (hgroot == i->hgroot) + if (hgroot == i->hgroot && usekbfiles == i->usekbfiles)   {   delete i->dstate;   i->dstate = 0;
Change 1 of 2 Show Entire File win32/​shellext/​Dirstatecache.h Stacked
 
34
35
36
 
37
38
39
40
41
42
43
 
 
44
45
46
 
48
49
50
51
52
 
 
 
53
54
55
 
34
35
36
37
38
39
40
41
42
43
 
44
45
46
47
48
 
50
51
52
 
 
53
54
55
56
57
58
@@ -34,13 +34,15 @@
  std::string hgroot;   unsigned tickcount;   bool unset; + bool usekbfiles;     E():   dstate(0),   dstate_mtime(0),   dstate_size(0),   tickcount(0), - unset(false) + unset(false), + usekbfiles(false)   {}   };   @@ -48,8 +50,9 @@
   public:   static Dirstate* get( - const std::string& hgroot, const std::string& cwd, bool& unset); - static void invalidate(const std::string& hgroot); + const std::string& hgroot, const std::string& cwd, bool& unset, + bool usekbfiles = false); + static void invalidate(const std::string& hgroot, bool usekbfiles = false);  };    #endif
Change 1 of 3 Show Entire File win32/​shellext/​QueryDirstate.cpp Stacked
 
83
84
85
86
 
87
88
 
89
90
91
 
301
302
303
304
305
 
 
 
 
 
 
 
306
307
308
 
312
313
314
315
 
316
317
318
319
 
 
 
 
 
 
 
 
 
 
 
320
321
322
 
83
84
85
 
86
87
 
88
89
90
91
 
301
302
303
 
 
304
305
306
307
308
309
310
311
312
313
 
317
318
319
 
320
321
322
 
 
323
324
325
326
327
328
329
330
331
332
333
334
335
336
@@ -83,9 +83,9 @@
  {   std::string p = cur.path;   p.push_back('\\'); - if (p.find("\\.hg\\") != std::string::npos) + if (p.find("\\.hg\\") != std::string::npos || p.find("\\.kbf\\") != std::string::npos)   { - // ignore files and dirs named '.hg' + // ignore files and dirs named '.hg' or '.kbf'   last = cur;   return 0;   } @@ -301,8 +301,13 @@
  {   if (!relpath.empty() && !pds->root().getdir(relpath))   { - last = cur; - return 0; // unknown dir -> no icon + // attempt to get status from kbfiles + pds = Dirstatecache::get(cur.hgroot, cur.basedir, unset, true); + if (!pds || !pds->root().getdir(relpath)) + { + last = cur; + return 0; // unknown dir -> no icon + }   }     outStatus = (pdirsta ? pdirsta->status(relpath) : '?'); @@ -312,11 +317,20 @@
  return 1;   }   - const Direntry* const e = pds->root().get(relpath); + const Direntry* e = pds->root().get(relpath);   if (!e)   { - last = cur; - return 0; + // attempt to get status from kbfiles + pds = Dirstatecache::get(cur.hgroot, cur.basedir, unset, true); + if (pds) + { + e = pds->root().get(relpath); + } + if (!e) + { + last = cur; + return 0; + }   }     outStatus = e->status(stat);