vim/gundo.vim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add Python 2.4 compatibility.

Browse Source
This commit is contained in:
Vincent Driessen 2010-10-19 09:37:54 +02:00
parent f3511a9782
commit a217cebb3a
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugin/gundo.vim
View File

@ -463,9 +463,15 @@ def generate(dag, edgefn, current):
seen, state = [], [0, 0] seen, state = [], [0, 0]
buf = Buffer() buf = Buffer()
for node, parents in list(dag): for node, parents in list(dag):
age_label = age(int(node.time)) if node.time else 'Original' if node.time:
age_label = age(int(node.time))
else:
age_label = 'Original'
line = '[%s] %s' % (node.n, age_label) line = '[%s] %s' % (node.n, age_label)
char = '@' if node.n == current else 'o' if node.n == current:
char = '@'
else:
char = 'o'
ascii(buf, state, 'C', char, [line], edgefn(seen, node, parents)) ascii(buf, state, 'C', char, [line], edgefn(seen, node, parents))
return buf.b return buf.b
ENDPYTHON ENDPYTHON
@ -567,7 +573,7 @@ def _make_nodes(alts, nodes, parent=None):
p = parent p = parent
for alt in alts: for alt in alts:
curhead = True if 'curhead' in alt else False curhead = 'curhead' in alt
node = Node(n=alt['seq'], parent=p, time=alt['time'], curhead=curhead) node = Node(n=alt['seq'], parent=p, time=alt['time'], curhead=curhead)
nodes.append(node) nodes.append(node)
if alt.get('alt'): if alt.get('alt'):
@ -607,7 +613,10 @@ def GundoRender():
def walk_nodes(nodes): def walk_nodes(nodes):
for node in nodes: for node in nodes:
yield(node, [node.parent] if node.parent else []) if node.parent:
yield (node, [node.parent])
else:
yield (node, [])
dag = sorted(nodes, key=lambda n: int(n.n), reverse=True) dag = sorted(nodes, key=lambda n: int(n.n), reverse=True)
current = changenr(nodes) current = changenr(nodes)
@ -753,8 +762,10 @@ def GundoPlayTo():
rev = origin.n < dest.n rev = origin.n < dest.n
nodes = [] nodes = []
current = origin if origin.n > dest.n else dest if origin.n > dest.n:
final = dest if origin.n > dest.n else origin current, final = origin, dest
else:
current, final = dest, origin
while current.n >= final.n: while current.n >= final.n:
if current.n == final.n: if current.n == final.n: