History - Kiln » TortoiseHg » TortoiseHg

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 Jul 3 11 at 10:43 AM

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

Change 1 of 1 Show Changes Only Show Entire File Loading... 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 Changes Only Show Entire File Loading... 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 Changes Only Show Entire File Loading... 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 Changes Only Show Entire File Loading... 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 Changes Only Show Entire File Loading... 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 Changes Only Show Entire File Loading... tortoisehg/hgqt/graph.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 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358	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 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358	`# Copyright (c) 2003-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.`+`# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.` `"""helper functions and classes to ease hg revision graph building` `Based on graphlog's algorithm, with insipration stolen from TortoiseHg` `revision grapher (now stolen back).` `"""` `import time` `import os` `import itertools` `from mercurial import util, error` `def revision_grapher(repo, **opts):` `"""incremental revision grapher` `This generator function walks through the revision history from` `revision start_rev to revision stop_rev (which must be less than` `or equal to start_rev) and for each revision emits tuples with the` `following elements:` `- current revision` `- column of the current node in the set of ongoing edges` `- color of the node (?)` `- lines; a list of (col, next_col, color) indicating the edges between` `the current row and the next row` `- parent revisions of current revision` `- author of the current revision` `If follow is True, only generated the subtree from the start_rev head.` `If branch is set, only generated the subtree for the given named branch.` `If allparents is set, include the branch heads for the selected named` `branch heads and all ancestors. If not set, include only the revisions` `on the selected named branch.` `"""` `revset = opts.get('revset', None)` `branch = opts.get('branch', None)` `if revset:` `start_rev = max(revset)` `stop_rev = min(revset)` `follow = False` `hidden = lambda rev: rev not in revset` `else:` `start_rev = opts.get('start_rev', None)` `stop_rev = opts.get('stop_rev', 0)` `follow = opts.get('follow', False)` `hidden = lambda rev: False` `assert start_rev is None or start_rev >= stop_rev` `curr_rev = start_rev` `revs = []` `rev_color = {}` `nextcolor = 0` `if opts.get('allparents') or not branch:` `def getparents(ctx):` `return [x.rev() for x in ctx.parents() if x]` `else:` `def getparents(ctx):` `return [x.rev() for x in ctx.parents() \` `if x and x.branch() == branch]` `while curr_rev is None or curr_rev >= stop_rev:` `if hidden(curr_rev):` `curr_rev -= 1` `continue` `# Compute revs and next_revs.` `ctx = repo[curr_rev]` `# Compute revs and next_revs.` `if curr_rev not in revs:` `if branch and ctx.branch() != branch:` `if curr_rev is None:` `curr_rev = len(repo)` `else:` `curr_rev -= 1` `yield None` `continue` `# New head.` `if start_rev and follow and curr_rev != start_rev:` `curr_rev -= 1` `continue` `revs.append(curr_rev)` `rev_color[curr_rev] = curcolor = nextcolor` `nextcolor += 1` `p_revs = getparents(ctx)` `while p_revs:` `rev0 = p_revs[0]` `if rev0 < stop_rev or rev0 in rev_color:` `break` `rev_color[rev0] = curcolor` `p_revs = getparents(repo[rev0])` `curcolor = rev_color[curr_rev]` `rev_index = revs.index(curr_rev)` `next_revs = revs[:]` `# Add parents to next_revs.` `parents = [p for p in getparents(ctx) if not hidden(p)]` `try:` `author = ctx.user()` `except error.Abort:` `author = ''` `parents_to_add = []` `if len(parents) > 1:` `preferred_color = None` `else:` `preferred_color = curcolor` `for parent in parents:` `if parent not in next_revs:` `parents_to_add.append(parent)` `if parent not in rev_color:` `if preferred_color:` `rev_color[parent] = preferred_color` `preferred_color = None` `else:` `rev_color[parent] = nextcolor` `nextcolor += 1` `preferred_color = None` `# parents_to_add.sort()` `next_revs[rev_index:rev_index + 1] = parents_to_add` `lines = []` `for i, rev in enumerate(revs):` `if rev in next_revs:` `color = rev_color[rev]` `lines.append( (i, next_revs.index(rev), color) )` `elif rev == curr_rev:` `for parent in parents:` `color = rev_color[parent]` `lines.append( (i, next_revs.index(parent), color) )` `yield (curr_rev, rev_index, curcolor, lines, parents, author)` `revs = next_revs` `if curr_rev is None:` `curr_rev = len(repo)` `else:` `curr_rev -= 1` `def filelog_grapher(repo, path):` `'''` `Graph the ancestry of a single file (log). Deletions show` `up as breaks in the graph.` `'''` `filerev = len(repo.file(path)) - 1` `fctx = repo.filectx(path, fileid=filerev)` `rev = fctx.rev()` `flog = fctx.filelog()` `heads = [repo.filectx(path, fileid=flog.rev(x)).rev() for x in flog.heads()]` `assert rev in heads` `heads.remove(rev)` `revs = []` `rev_color = {}` `nextcolor = 0` `_paths = {}` `while rev >= 0:` `# Compute revs and next_revs` `if rev not in revs:` `revs.append(rev)` `rev_color[rev] = nextcolor ; nextcolor += 1` `curcolor = rev_color[rev]` `index = revs.index(rev)` `next_revs = revs[:]` `# Add parents to next_revs` `fctx = repo.filectx(_paths.get(rev, path), changeid=rev)` `for pfctx in fctx.parents():` `_paths[pfctx.rev()] = pfctx.path()` `parents = [pfctx.rev() for pfctx in fctx.parents()]# if f.path() == path]` `parents_to_add = []` `for parent in parents:` `if parent not in next_revs:` `parents_to_add.append(parent)` `if len(parents) > 1:` `rev_color[parent] = nextcolor ; nextcolor += 1` `else:` `rev_color[parent] = curcolor` `parents_to_add.sort()` `next_revs[index:index + 1] = parents_to_add` `lines = []` `for i, nrev in enumerate(revs):` `if nrev in next_revs:` `color = rev_color[nrev]` `lines.append( (i, next_revs.index(nrev), color) )` `elif nrev == rev:` `for parent in parents:` `color = rev_color[parent]` `lines.append( (i, next_revs.index(parent), color) )` `pcrevs = [pfc.rev() for pfc in fctx.parents()]` `yield (fctx.rev(), index, curcolor, lines, pcrevs,` `_paths.get(fctx.rev(), path), fctx.user())` `revs = next_revs` `if revs:` `rev = max(revs)` `else:` `rev = -1` `if heads and rev <= heads[-1]:` `rev = heads.pop()` `def mq_patch_grapher(repo):` `"""Graphs unapplied MQ patches"""` `for patchname in reversed(repo.thgmqunappliedpatches):` `yield (patchname, 0, "", [], [], "")` `class GraphNode(object):` `"""` `Simple class to encapsulate e hg node in the revision graph. Does` `nothing but declaring attributes.` `"""` `def __init__(self, rev, xposition, color, lines, parents, ncols=None,` `extra=None):` `self.rev = rev` `self.x = xposition` `self.color = color` `if ncols is None:` `ncols = len(lines)` `self.cols = ncols` `self.parents = parents` `self.bottomlines = lines` `self.toplines = []` `self.extra = extra` `class Graph(object):` `"""` `Graph object to ease hg repo navigation. The Graph object` instanciate a `revision_grapher` generator, and provide a `fill` `method to build the graph progressively.` `"""` `#@timeit` `def __init__(self, repo, grapher, include_mq=False):` `self.repo = repo` `self.maxlog = len(repo)` `if include_mq:` `patch_grapher = mq_patch_grapher(self.repo)` `self.grapher = itertools.chain(patch_grapher, grapher)` `else:` `self.grapher = grapher` `self.nodes = []` `self.nodesdict = {}` `self.max_cols = 0` `self.authors = set()` `def __getitem__(self, idx):` `if isinstance(idx, slice):` `# XXX TODO: ensure nodes are built` `return self.nodes.__getitem__(idx)` `if idx >= len(self.nodes):` `# build as many graph nodes as required to answer the` `# requested idx` `self.build_nodes(idx)` `if idx >= len(self):` `return self.nodes[-1]` `return self.nodes[idx]` `def __len__(self):` `# len(graph) is the number of actually built graph nodes` `return len(self.nodes)` `def build_nodes(self, nnodes=None, rev=None):` `"""` Build up to `nnodes` more nodes in our graph, or build as many nodes required to reach `rev`. `If both rev and nnodes are set, build as many nodes as` `required to reach rev plus nnodes more.` `"""` `if self.grapher is None:` `return False` `usetimer = nnodes is None and rev is None` `if usetimer:` `if os.name == "nt":` `timer = time.clock` `else:` `timer = time.time` `startsec = timer()` `stopped = False` `mcol = set([self.max_cols])` `for vnext in self.grapher:` `if vnext is None:` `continue` `nrev, xpos, color, lines, parents, author = vnext[:6]` `self.authors.add(author)` `if not type(nrev) == str and nrev >= self.maxlog:` `continue` `gnode = GraphNode(nrev, xpos, color, lines, parents,` `extra=vnext[5:])` `if self.nodes:` `gnode.toplines = self.nodes[-1].bottomlines` `self.nodes.append(gnode)` `self.nodesdict[nrev] = gnode` `mcol = mcol.union(set([xpos]))` `mcol = mcol.union(set([max(x[:2]) for x in gnode.bottomlines]))` `if rev is not None and nrev <= rev:` `rev = None # we reached rev, switching to nnode counter` `if rev is None:` `if nnodes is not None:` `nnodes -= 1` `if not nnodes:` `break` `if usetimer:` `cursec = timer()` `if cursec < startsec or cursec > startsec + 0.1:` `break` `else:` `self.grapher = None` `stopped = True` `self.max_cols = max(mcol) + 1` `return not stopped` `def isfilled(self):` `return self.grapher is None` `def index(self, rev):` `if len(self) == 0: # graph is empty, let's build some nodes` `self.build_nodes(10)` `if rev is not None and len(self) > 0 and rev < self.nodes[-1].rev:` `self.build_nodes(self.nodes[-1].rev - rev)` `if rev in self.nodesdict:` `return self.nodes.index(self.nodesdict[rev])` `return -1` `#` `# File graph method` `#` `def filename(self, rev):` `return self.nodesdict[rev].extra[0]`

Change 1 of 1 Show Changes Only Show Entire File Loading... 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 Changes Only Show Entire File Loading... 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 Changes Only Show Entire File Loading... 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 Changes Only Show Entire File Loading... 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 Show Entire File Loading... tortoisehg/util/colormap.py Stacked
12 13 14 15 16 17 18 94 95 96 97 98 99 100	12 13 14 15 16 17 18 94 95 96 97 98 99 100	@@ -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 sys, math` `def _days(ctx, now):`@@ -94,7 +94,7 @@ `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:`

Change 1 of 3 Show Changes Only Show Entire File Loading... 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 Changes Only Show Entire File Loading... 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);`

Diff Options

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

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

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

Diff to 7e8415d9e124

Attach a Trello Card

Add a tag

Your session has expired