Mercurial > hg
changeset 1117:de14c419b323
Added merge_history.py to contrib
author | Frank Zschockelt <jdev@freakysoft.de> |
---|---|
date | Fri, 05 Jan 2007 17:39:07 +0100 |
parents | 2ba26f6c060f |
children | 71422d407a34 |
files | mcabber/contrib/merge_history.py |
diffstat | 1 files changed, 38 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mcabber/contrib/merge_history.py Fri Jan 05 17:39:07 2007 +0100 @@ -0,0 +1,38 @@ +#!/usr/bin/env python +# This script is provided under the terms of the GNU General Public License, +# see the file COPYING in the root mcabber source directory. +# +# Frank Zschockelt, 05.01.2007 + +import sys + +if(len(sys.argv) != 3): + print "usage:",sys.argv[0],"histA histB > histA+B" + sys.exit(0) +file=open(sys.argv[1], "r") +linesA=file.readlines() +file.close() +file=open(sys.argv[2], "r") +linesB=file.readlines() +file.close() + +i=j=0 +while(i<len(linesA) and j < len(linesB)): + if(linesA[i][3:20] <= linesB[j][3:20]): + l=int(linesA[i][22:25]) + for s in linesA[i:i+l+1]: + print s, + if(linesA[i]==linesB[j]): + j+=l+1 + i+=l+1 + else: + l=int(linesB[j][22:25]) + for s in linesB[j:j+l+1]: + print s, + j+=l+1 + +for s in linesA[i:len(linesA)]: + print s, +for s in linesB[j:len(linesB)]: + print s, +