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

stable license: refresh with current address from fsf.org (fixes #858)

Changeset 7e8415d9e124…

Parent 9d58ecd48e43…

by André Sintzoff

Changes to 13 files · Browse files at 7e8415d9e124 Showing diff from parent 9d58ecd48e43 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​blockmatcher.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 #  # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.    """  Qt4 widgets to display diffs as blocks
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 #  # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  """  Qt4 dialogs to display hg revisions of a file  """
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filelistmodel.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 #  # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.    from tortoisehg.util import hglib, patchctx  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 #  # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.    import os  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filerevmodel.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 #  # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.    from tortoisehg.hgqt.repomodel import HgRepoListModel, COLUMNHEADERS  from tortoisehg.hgqt.graph import Graph, filelog_grapher
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​graph.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 #  # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.    """helper functions and classes to ease hg revision graph building  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​quickbar.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 #  # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  """  Qt4 QToolBar-based class for quick bars XXX  """
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repomodel.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 #  # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.    from mercurial import util, error  from mercurial.util import propertycache
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repoview.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 #  # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.    from mercurial import error  
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​dialog.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 #  # 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 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA    import gtk  from tortoisehg.util.i18n import _
Change 1 of 2 Show Changes Only tortoisehg/​util/​colormap.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
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
 # Copyright (C) 2005 Dan Loda <danloda@gmail.com>    # 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 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA  import sys, math    def _days(ctx, now):   return (now - ctx.date()[0]) / (24 * 60 * 60)    def _rescale(val, step):   return float(step) * int(val / step)    def _rescaleceil(val, step):   return float(step) * math.ceil(float(val) / step)    class AnnotateColorMap:     really_old_color = "#0046FF"     colors = {   20.: "#FF0000",   40.: "#FF3800",   60.: "#FF7000",   80.: "#FFA800",   100.:"#FFE000",   120.:"#E7FF00",   140.:"#AFFF00",   160.:"#77FF00",   180.:"#3FFF00",   200.:"#07FF00",   220.:"#00FF31",   240.:"#00FF69",   260.:"#00FFA1",   280.:"#00FFD9",   300.:"#00EEFF",   320.:"#00B6FF",   340.:"#007EFF"   }     def __init__(self, span=340.):   self.set_span(span)     def set_span(self, span):   self._span = span   self._scale = span / max(self.colors.keys())     def get_color(self, ctx, now):   color = self.really_old_color   days = self.colors.keys()   days.sort()   days_old = _days(ctx, now)   for day in days:   if (days_old <= day * self._scale):   color = self.colors[day]   break     return color    class AnnotateColorSaturation(object):   def __init__(self, maxhues=None, maxsaturations=None):   self._maxhues = maxhues   self._maxsaturations = maxsaturations     def hue(self, angle):   return tuple([self.v(angle, r) for r in (0, 120, 240)])     @staticmethod   def ang(angle, rotation):   angle += rotation   angle = angle % 360   if angle > 180:   angle = 180 - (angle - 180)   return abs(angle)     def v(self, angle, rotation):   ang = self.ang(angle, rotation)   if ang < 60:   return 1   elif ang > 120:   return 0   else:   return 1 - ((ang - 60) / 60)     def saturate_v(self, saturation, hv):   return int(255 - (saturation/3*(1-hv))) - +   def committer_angle(self, committer):   angle = float(abs(hash(committer))) / sys.maxint * 360.0   if self._maxhues is None:   return angle   return _rescale(angle, 360.0 / self._maxhues)     def get_color(self, ctx, now):   days = max(_days(ctx, now), 0.0)   saturation = 255/((days/50) + 1)   if self._maxsaturations:   saturation = _rescaleceil(saturation, 255. / self._maxsaturations)   hue = self.hue(self.committer_angle(ctx.user()))   color = tuple([self.saturate_v(saturation, h) for h in hue])   return "#%x%x%x" % color    def makeannotatepalette(fctxs, now, maxcolors, maxhues=None,   maxsaturations=None, mindate=None):   """Assign limited number of colors for annotation     :fctxs: list of filecontexts by lines   :now: latest time which will have most significat color   :maxcolors: max number of colors   :maxhues: max number of committer angles (hues)   :maxsaturations: max number of saturations by age   :mindate: reassign palette until it includes fctx of mindate   (requires maxsaturations)     This returns dict of {color: fctxs, ...}.   """   if mindate is not None and maxsaturations is None:   raise ValueError('mindate must be specified with maxsaturations')     sortedfctxs = list(sorted(set(fctxs), key=lambda fctx: -fctx.date()[0]))   return _makeannotatepalette(sortedfctxs, now, maxcolors, maxhues,   maxsaturations, mindate)[0]    def _makeannotatepalette(sortedfctxs, now, maxcolors, maxhues,   maxsaturations, mindate):   cm = AnnotateColorSaturation(maxhues=maxhues,   maxsaturations=maxsaturations)   palette = {}     def reassignifneeded(fctx):   # fctx is the latest fctx which is NOT included in the palette   if mindate is None or fctx.date()[0] < mindate or maxsaturations <= 1:   return palette, cm   return _makeannotatepalette(sortedfctxs, now, maxcolors, maxhues,   maxsaturations - 1, mindate)     # assign from the latest for maximum discrimination   for fctx in sortedfctxs:   color = cm.get_color(fctx, now)   if color not in palette:   if len(palette) >= maxcolors:   return reassignifneeded(fctx)   palette[color] = []   palette[color].append(fctx)     return palette, cm # return cm for debbugging
Change 1 of 3 Show Entire File win32/​shellext/​StringUtils.cpp Stacked
 
13
14
15
16
 
17
18
19
 
36
37
38
39
 
40
41
42
 
49
50
51
52
 
53
54
55
56
 
57
58
59
 
13
14
15
 
16
17
18
19
 
36
37
38
 
39
40
41
42
 
49
50
51
 
52
53
54
55
 
56
57
58
59
@@ -13,7 +13,7 @@
   // 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. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.    #include "StringUtils.h"   @@ -36,7 +36,7 @@
  CodePage, 0, wide.c_str(), static_cast<int>(wide.length()),   NULL, 0, NULL, NULL   ); - +   std::vector<CHAR> narrow(ret + 1);     ret = WideCharToMultiByte( @@ -49,11 +49,11 @@
 }     -// Convert multibyte string to Unicode string +// Convert multibyte string to Unicode string  std::wstring MultibyteToWide(const std::string& multibyte, UINT CodePage)  {   int ret = MultiByteToWideChar( - CodePage, 0, multibyte.c_str(), + CodePage, 0, multibyte.c_str(),   static_cast<int>(multibyte.length()), 0, 0   );  
Change 1 of 2 Show Entire File win32/​shellext/​StringUtils.h Stacked
 
13
14
15
16
 
17
18
19
 
27
28
29
30
 
31
32
33
 
13
14
15
 
16
17
18
19
 
27
28
29
 
30
31
32
33
@@ -13,7 +13,7 @@
   // 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. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.    #ifndef _STRING_UTILS_H  #define _STRING_UTILS_H @@ -27,7 +27,7 @@
 // Convert Unicode string to multibyte string  std::string WideToMultibyte(const std::wstring& wide, UINT CodePage = CP_ACP);   -// Convert multibyte string to Unicode string +// Convert multibyte string to Unicode string  std::wstring MultibyteToWide(const std::string& multibyte, UINT CodePage = CP_ACP);