Mercurial > traipse_dev
annotate upmana/mercurial/bdiff.py @ 179:5609ac142298 alpha
Traipse Alpha 'OpenRPG' {100114-03}
Traipse is a distribution of OpenRPG that is designed to be easy to
setup and go. Traipse also makes it easy for developers to work on code
without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy'
and adds fixes to the code. 'Ornery-Orc's main goal is to offer more
advanced features and enhance the productivity of the user.
Update Summary (Keeping up with Beta)
New Features:
Added Bookmarks
Added 'boot' command to remote admin
Added confirmation window for sent nodes
Minor changes to allow for portability to an OpenSUSE linux OS
Miniatures Layer pop up box allows users to turn off Mini labels, from
FlexiRPG
Zoom Mouse plugin added
Images added to Plugin UI
Switching to Element Tree
Map efficiency, from FlexiRPG
Added Status Bar to Update Manager
New TrueDebug Class in orpg_log (See documentation for usage)
Portable Mercurial
Tip of the Day added, from Core and community
New Reference Syntax added for custom PC sheets
New Child Reference for gametree
New Parent Reference for gametree
New Gametree Recursion method, mapping, context sensitivity, and
effeciency..
New Features node with bonus nodes and Node Referencing help added
Dieroller structure from Core
New DieRoller portability for odd Dice
Added 7th Sea die roller; ie [7k3] = [7d10.takeHighest(3).open(10)]
New 'Mythos' System die roller added
Added new vs. die roller method for WoD; ie [3v3] = [3d10.vs(3)].
Included for Mythos roller also
New Warhammer FRPG Die Roller (Special thanks to Puu-san for the
support)
New EZ_Tree Reference system. Push a button, Traipse the tree, get a
reference (Beta!)
Fixes:
Fix to Text based Server
Fix to Remote Admin Commands
Fix to Pretty Print, from Core
Fix to Splitter Nodes not being created
Fix to massive amounts of images loading, from Core
Fix to Map from gametree not showing to all clients
Fix to gametree about menus
Fix to Password Manager check on startup
Fix to PC Sheets from tool nodes. They now use the tabber_panel
Fix to Whiteboard ID to prevent random line or text deleting.
Fixes to Server, Remote Server, and Server GUI
Fix to Update Manager; cleaner clode for saved repositories
Fixes made to Settings Panel and now reactive settings when Ok is
pressed
Fixes to Alternity roller's attack roll. Uses a simple Tuple instead of
a Splice
Fix to Use panel of Forms and Tabbers. Now longer enters design mode
Fix made Image Fetching. New fetching image and new failed image
Modified ID's to prevent non updated clients from ruining the fix.
default_manifest.xml renamed to default_upmana.xml
| author | sirebral |
|---|---|
| date | Thu, 14 Jan 2010 21:22:21 -0600 |
| parents | 496dbf12a6cb |
| children |
| rev | line source |
|---|---|
| 121 | 1 # bdiff.py - Python implementation of bdiff.c |
| 2 # | |
| 3 # Copyright 2009 Matt Mackall <mpm@selenic.com> and others | |
| 4 # | |
| 5 # This software may be used and distributed according to the terms of the | |
| 6 # GNU General Public License version 2, incorporated herein by reference. | |
| 7 | |
| 8 import struct, difflib | |
| 9 | |
| 10 def splitnewlines(text): | |
| 11 '''like str.splitlines, but only split on newlines.''' | |
| 12 lines = [l + '\n' for l in text.split('\n')] | |
| 13 if lines: | |
| 14 if lines[-1] == '\n': | |
| 15 lines.pop() | |
| 16 else: | |
| 17 lines[-1] = lines[-1][:-1] | |
| 18 return lines | |
| 19 | |
| 20 def _normalizeblocks(a, b, blocks): | |
| 21 prev = None | |
| 22 for curr in blocks: | |
| 23 if prev is None: | |
| 24 prev = curr | |
| 25 continue | |
| 26 shift = 0 | |
| 27 | |
| 28 a1, b1, l1 = prev | |
| 29 a1end = a1 + l1 | |
| 30 b1end = b1 + l1 | |
| 31 | |
| 32 a2, b2, l2 = curr | |
| 33 a2end = a2 + l2 | |
| 34 b2end = b2 + l2 | |
| 35 if a1end == a2: | |
| 36 while a1end+shift < a2end and a[a1end+shift] == b[b1end+shift]: | |
| 37 shift += 1 | |
| 38 elif b1end == b2: | |
| 39 while b1end+shift < b2end and a[a1end+shift] == b[b1end+shift]: | |
| 40 shift += 1 | |
| 41 yield a1, b1, l1+shift | |
| 42 prev = a2+shift, b2+shift, l2-shift | |
| 43 yield prev | |
| 44 | |
| 45 def bdiff(a, b): | |
| 46 a = str(a).splitlines(True) | |
| 47 b = str(b).splitlines(True) | |
| 48 | |
| 49 if not a: | |
| 50 s = "".join(b) | |
| 51 return s and (struct.pack(">lll", 0, 0, len(s)) + s) | |
| 52 | |
| 53 bin = [] | |
| 54 p = [0] | |
| 55 for i in a: p.append(p[-1] + len(i)) | |
| 56 | |
| 57 d = difflib.SequenceMatcher(None, a, b).get_matching_blocks() | |
| 58 d = _normalizeblocks(a, b, d) | |
| 59 la = 0 | |
| 60 lb = 0 | |
| 61 for am, bm, size in d: | |
| 62 s = "".join(b[lb:bm]) | |
| 63 if am > la or s: | |
| 64 bin.append(struct.pack(">lll", p[la], p[am], len(s)) + s) | |
| 65 la = am + size | |
| 66 lb = bm + size | |
| 67 | |
| 68 return "".join(bin) | |
| 69 | |
| 70 def blocks(a, b): | |
| 71 an = splitnewlines(a) | |
| 72 bn = splitnewlines(b) | |
| 73 d = difflib.SequenceMatcher(None, an, bn).get_matching_blocks() | |
| 74 d = _normalizeblocks(an, bn, d) | |
| 75 return [(i, i + n, j, j + n) for (i, j, n) in d] | |
| 76 |