Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge with Adrian

Changeset a77b80f99a18…

Parents 800a8c5b63d8…

Parents ad76bdbc5ceb…

by Steve Borho

Changes to 3 files · Browse files at a77b80f99a18 Showing diff from parent 800a8c5b63d8 ad76bdbc5ceb Diff from another changeset...

Change 1 of 1 Show Entire File thgtaskbar.py Stacked
 
317
318
319
 
 
320
321
 
322
323
324
 
317
318
319
320
321
322
 
323
324
325
326
@@ -317,8 +317,10 @@
  update(args, hwnd)   elif cmd == 'remove':   remove(args) + elif cmd == 'error': + logger.msg("**** Error: %s" % args[0])   else: - logger.msg("Error: unknown request '%s'" % req) + logger.msg("**** Error: unknown request '%s'" % req)    class Updater(threading.Thread):   def __init__(self, hwnd):
Change 1 of 2 Show Changes Only win32/​shellext/​InitStatus.cpp 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
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
   // Copyright (C) 2009 Adrian Buehlmann  //  // 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, see <http://www.gnu.org/licenses/>.    #include "stdafx.h"    #include "InitStatus.h" +#include "Thgstatus.h"      InitStatus& InitStatus::inst()  {   static InitStatus s;   return s;  }      void InitStatus::add(std::string& s, const char* missing)  {   if (!s.empty())   s += ", ";   s += missing;  }      std::string InitStatus::check()  {   const InitStatus& self = inst();   std::string missing;     if (self.unchanged_ == 0)   add(missing, "unchanged");   if (self.added_ == 0)   add(missing, "added");   if (self.modified_ == 0)   add(missing, "modified");   if (self.notinrepo_ == 0)   add(missing, "notinrepo");     if (missing.empty())   return "";   - std::string res = "InitStatus: error: uninitialized handlers: "; - res += missing; + std::string reason = "uninitialized handlers: " + missing; + Thgstatus::error(reason); + std::string res = "InitStatus: error: " + reason;   TDEBUG_TRACE("***** " << res);   return res;  }
Change 1 of 1 Show Entire File win32/​shellext/​Thgstatus.h Stacked
 
30
31
32
 
 
 
33
34
35
 
30
31
32
33
34
35
36
37
38
@@ -30,6 +30,9 @@
  static int remove(const std::string& path) {   return SendRequest("remove|" + path);   } + static int error(const std::string& text) { + return SendRequest("error|" + text); + }  };    #endif