Mercurial > traipse_dev
annotate upmana/mercurial/ancestor.py @ 121:496dbf12a6cb alpha
Traipse Alpha 'OpenRPG' {091030-00}
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 (Cleaning up for Beta):
Adds Bookmarks (Alpha) with cool Smiley Star and Plus Symbol images!
Changes made to the map for increased portability. SnowDog has changes planned in
Core, though.
Added an initial push to the BCG. Not much to see, just shows off how it is
re-writing Main code.
Fix to remote admin commands
Minor fix to texted based server, works in /System/ folder
Some Core changes to gametree to correctly disply Pretty Print, thanks David!
Fix to Splitter Nodes not being created.
Added images to Plugin Control panel for Autostart feature
Fix to massive amounts of images loading; from Core
fix to gsclient so with_statement imports
Added 'boot' command to remote admin
Prep work in Pass tool for remote admin rankings and different passwords, ei,
Server, Admin, Moderator, etc.
Remote Admin Commands more organized, more prep work.
Added Confirmation window for sent nodes.
Minor changes to allow for portability to an OpenSUSE linux OS (hopefully without
breaking)
{091028}
Made changes to gametree to start working with Element Tree, mostly from Core
Minor changes to Map to start working with Element Tree, from Core
Preliminary changes to map efficiency, from FlexiRPG
Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG
Changes to main.py to start working with Element Tree
{091029}
Changes made to server to start working with Element Tree.
Changes made to Meta Server Lib. Prepping test work for a multi meta network
page.
Minor bug fixed with mini to gametree
Zoom Mouse plugin added.
{091030}
Getting ready for Beta. Server needs debugging so Alpha remains bugged.
Plugin UI code cleaned. Auto start works with a graphic, pop-up asks to enable or
disable plugin.
Update Manager now has a partially working Status Bar. Status Bar captures
terminal text, so Merc out put is visible. Manifest.xml file, will be renamed, is
now much cleaner.
Debug Console has a clear button and a Report Bug button. Prep work for a Term2Win
class in Debug Console.
Known: Current Alpha fails in Windows.
| author | sirebral |
|---|---|
| date | Fri, 30 Oct 2009 22:21:40 -0500 |
| parents | |
| children |
| rev | line source |
|---|---|
| 121 | 1 # ancestor.py - generic DAG ancestor algorithm for mercurial |
| 2 # | |
| 3 # Copyright 2006 Matt Mackall <mpm@selenic.com> | |
| 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 heapq | |
| 9 | |
| 10 def ancestor(a, b, pfunc): | |
| 11 """ | |
| 12 return the least common ancestor of nodes a and b or None if there | |
| 13 is no such ancestor. | |
| 14 | |
| 15 pfunc must return a list of parent vertices | |
| 16 """ | |
| 17 | |
| 18 if a == b: | |
| 19 return a | |
| 20 | |
| 21 # find depth from root of all ancestors | |
| 22 parentcache = {} | |
| 23 visit = [a, b] | |
| 24 depth = {} | |
| 25 while visit: | |
| 26 vertex = visit[-1] | |
| 27 pl = pfunc(vertex) | |
| 28 parentcache[vertex] = pl | |
| 29 if not pl: | |
| 30 depth[vertex] = 0 | |
| 31 visit.pop() | |
| 32 else: | |
| 33 for p in pl: | |
| 34 if p == a or p == b: # did we find a or b as a parent? | |
| 35 return p # we're done | |
| 36 if p not in depth: | |
| 37 visit.append(p) | |
| 38 if visit[-1] == vertex: | |
| 39 depth[vertex] = min([depth[p] for p in pl]) - 1 | |
| 40 visit.pop() | |
| 41 | |
| 42 # traverse ancestors in order of decreasing distance from root | |
| 43 def ancestors(vertex): | |
| 44 h = [(depth[vertex], vertex)] | |
| 45 seen = set() | |
| 46 while h: | |
| 47 d, n = heapq.heappop(h) | |
| 48 if n not in seen: | |
| 49 seen.add(n) | |
| 50 yield (d, n) | |
| 51 for p in parentcache[n]: | |
| 52 heapq.heappush(h, (depth[p], p)) | |
| 53 | |
| 54 def generations(vertex): | |
| 55 sg, s = None, set() | |
| 56 for g, v in ancestors(vertex): | |
| 57 if g != sg: | |
| 58 if sg: | |
| 59 yield sg, s | |
| 60 sg, s = g, set((v,)) | |
| 61 else: | |
| 62 s.add(v) | |
| 63 yield sg, s | |
| 64 | |
| 65 x = generations(a) | |
| 66 y = generations(b) | |
| 67 gx = x.next() | |
| 68 gy = y.next() | |
| 69 | |
| 70 # increment each ancestor list until it is closer to root than | |
| 71 # the other, or they match | |
| 72 try: | |
| 73 while 1: | |
| 74 if gx[0] == gy[0]: | |
| 75 for v in gx[1]: | |
| 76 if v in gy[1]: | |
| 77 return v | |
| 78 gy = y.next() | |
| 79 gx = x.next() | |
| 80 elif gx[0] > gy[0]: | |
| 81 gy = y.next() | |
| 82 else: | |
| 83 gx = x.next() | |
| 84 except StopIteration: | |
| 85 return None |