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 Entire File tortoisehg/​hgqt/​filelistmodel.py Stacked
 
14
15
16
 
 
17
18
19
 
144
145
146
 
147
148
149
 
14
15
16
17
18
19
20
21
 
146
147
148
149
150
151
152
@@ -14,6 +14,8 @@
 # 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 @@ -144,6 +146,7 @@
  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
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 Changes Only tortoisehg/​util/​shlib.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
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
 # shlib.py - TortoiseHg shell utilities  #  # Copyright 2007 TK Soh <teekaysoh@gmail.com>  # Copyright 2008 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.    import os  import sys  import time  import threading  from mercurial.i18n import _  from mercurial import hg    def get_system_times():   t = os.times()   if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()   t = (t[0], t[1], t[2], t[3], time.clock())   return t    if os.name == 'nt':   def browse_url(url):   try:   import win32api   except ImportError:   return   def start_browser():   try:   win32api.ShellExecute(0, 'open', url, None, None, 0)   except Exception:   pass   threading.Thread(target=start_browser).start()     def shell_notify(paths):   try:   from win32com.shell import shell, shellcon   import pywintypes   except ImportError:   return   dirs = set()   for path in paths:   if path is None:   continue   abspath = os.path.abspath(path)   if not os.path.isdir(abspath):   abspath = os.path.dirname(abspath)   dirs.add(abspath)   # send notifications to deepest directories first   for dir in sorted(dirs, key=len, reverse=True):   try:   pidl, ignore = shell.SHILCreateFromPath(dir, 0)   except pywintypes.com_error:   return   if pidl is None:   continue   shell.SHChangeNotify(shellcon.SHCNE_UPDATEITEM,   shellcon.SHCNF_IDLIST | shellcon.SHCNF_FLUSH,   pidl, None)     def update_thgstatus(ui, root, wait=False):   '''Rewrite the file .hg/thgstatus     Caches the information provided by repo.status() in the file   .hg/thgstatus, which can then be read by the overlay shell extension   to display overlay icons for directories.     The file .hg/thgstatus contains one line for each directory that has   removed, modified or added files (in that order of preference). Each   line consists of one char for the status of the directory (r, m or a),   followed by the relative path of the directory in the repo. If the   file .hg/thgstatus is empty, then the repo's working directory is   clean.     Specify wait=True to wait until the system clock ticks to the next   second before accessing Mercurial's dirstate. This is useful when   Mercurial's .hg/dirstate contains unset entries (in output of   "hg debugstate"). unset entries happen if .hg/dirstate was updated   within the same second as Mercurial updated the respective file in   the working tree. This happens with a high probability for example   when cloning a repo. The overlay shell extension will display unset   dirstate entries as (potentially false) modified. Specifying wait=True   ensures that there are no unset entries left in .hg/dirstate when this   function exits.   '''   if wait:   tref = time.time()   tdelta = float(int(tref)) + 1.0 - tref   if (tdelta > 0.0):   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 = {}   def dirname(f):   return '/'.join(f.split('/')[:-1])   for fn in added:   dirstatus[dirname(fn)] = 'a'   for fn in modified:   dirstatus[dirname(fn)] = 'm'   for fn in removed + deleted:   dirstatus[dirname(fn)] = 'r'     update = False   f = None   try:   try:   f = repo.opener('thgstatus', 'rb')   for dn in sorted(dirstatus):   s = dirstatus[dn]   e = f.readline()   if e.startswith('@@noicons'):   break   if e == '' or e[0] != s or e[1:-1] != dn:   update = True   break   if f.readline() != '':   # extra line in f, needs update   update = True   except IOError:   update = True   finally:   if f != None:   f.close()     if update:   f = repo.opener('thgstatus', 'wb', atomictemp=True)   for dn in sorted(dirstatus):   s = dirstatus[dn]   f.write(s + dn + '\n')   ui.note("%s %s\n" % (s, dn))   f.rename()    else:   def shell_notify(paths):   if not paths:   return   notify = os.environ.get('THG_NOTIFY', '.tortoisehg/notify')   if not os.path.isabs(notify):   notify = os.path.join(os.path.expanduser('~'), notify)   os.environ['THG_NOTIFY'] = notify   if not os.path.isfile(notify):   return   try:   f_notify = open(notify, 'w')   except IOError:   return   try:   abspaths = [os.path.abspath(path) for path in paths if path]   f_notify.write('\n'.join(abspaths))   finally:   f_notify.close()     def update_thgstatus(*args, **kws):   pass     def browse_url(url):   def start_browser():   if sys.platform == 'darwin':   # use Mac OS X internet config module (removed in Python 3.0)   import ic   ic.launchurl(url)   else:   try:   import gconf   client = gconf.client_get_default()   browser = client.get_string(   '/desktop/gnome/url-handlers/http/command') + '&'   os.system(browser % url)   except ImportError:   # If gconf is not found, fall back to old standard   os.system('firefox ' + url)   threading.Thread(target=start_browser).start()
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);