Mercurial > traipse_dev
annotate upmana/mercurial/bdiff.py @ 213:8b7bb1d72c1c beta
Traipse Beta 'OpenRPG' {100428-01}
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 (Patch-2)
New Features:
New Namespace method with two new syntaxes
New Namespace Internal is context sensitive, always!
New Namespace External is 'as narrow as you make it'
New Namespace FutureCheck helps ensure you don't receive an incorrect node
New PluginDB access for URL2Link plugin
New to Forms, they now show their content in Design Mode
New to Update Manager, checks Repo for updates on software start
Fixes:
Fix to Server GUI startup errors
Fix to Server GUI Rooms tab updating
Fix to Chat and Settings if non existant die roller is picked
Fix to Dieroller and .open() used with .vs(). Successes are correctly calculated
Fix to Alias Lib's Export to Tree, Open, Save features
Fix to alias node, now works properly
Fix to Splitter node, minor GUI cleanup
Fix to Backgrounds not loading through remote loader
Fix to Node name errors
Fix to rolling dice in chat Whispers
Fix to Splitters Sizing issues
Fix to URL2Link plugin, modified regex compilation should remove memory leak
Fix to mapy.py, a roll back due to zoomed grid issues
Fix to whiteboard_handler, Circles work by you clicking the center of the circle
Fix to Servers parse_incoming_dom which was outdated and did not respect XML
Fix to a broken link in the server welcome message
Fix to InterParse and logger requiring traceback
Fix to Update Manager Status Bar
Fix to failed image and erroneous pop up
Daily-01: I somehow did not update the version number.
Last changed file list:
Currently selected branch: beta
Author: sirebral
Files Modified (in update):
orpg/chat/chatwnd.py
orpg/chat/commands.py
orpg/dieroller/HOWTO.txt
orpg/dieroller/base.py
orpg/dieroller/dieroller.txt
orpg/dieroller/rollers/std.py
orpg/gametree/gametree.py
orpg/gametree/nodehandlers/chatmacro.py
orpg/gametree/nodehandlers/containers.py
orpg/gametree/nodehandlers/forms.py
orpg/gametree/nodehandlers/rpg_grid.py
orpg/main.py
orpg/map/__init__.py
orpg/map/_background.py
orpg/map/_canvas.py
orpg/map/_circles.py
orpg/map/_fog.py
orpg/map/_grid.py
orpg/map/_lines.py
orpg/map/_minis.py
orpg/map/_object.py
orpg/map/_text.py
orpg/map/_tiles.py
orpg/mapper/background.py
orpg/mapper/map.py
orpg/mapper/whiteboard_handler.py
orpg/networking/meta_server_lib.py
orpg/networking/mplay_server.py
orpg/networking/mplay_server_gui.py
orpg/orpg_version.py
orpg/templates/default_ignorelist.txt
orpg/templates/default_settings.xml
orpg/templates/metaservers.cache
orpg/templates/nodes/split.xml
orpg/templates/nodes/textctrl.xml
orpg/tools/InterParse.py
orpg/tools/aliaslib.py
orpg/tools/orpg_log.py
orpg/tools/orpg_settings.py
plugins/xxurl2link.py
readme.txt
rollback.py
start_developer.py
start_noupdate.py
start_tester.py
upmana/ignorelist.txt
upmana/updatemana.py
| author | sirebral |
|---|---|
| date | Wed, 28 Apr 2010 08:13:35 -0500 |
| parents | dcf4fbe09b70 |
| children |
| rev | line source |
|---|---|
| 135 | 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 |