git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uses more descriptive words for the state change of a CONFIG option
[linux-2.6.git]
/
configs
/
kompare
diff --git
a/configs/kompare
b/configs/kompare
index
3d642a2
..
50db0b7
100755
(executable)
--- a/
configs/kompare
+++ b/
configs/kompare
@@
-5,7
+5,7
@@
# Marc E. Fiuczynski <mef@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Marc E. Fiuczynski <mef@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: kompare,v 1.
3 2006/11/30 23:02:35
mef Exp $
+# $Id: kompare,v 1.
4 2006/12/01 16:21:33
mef Exp $
#
import sys, re, os
#
import sys, re, os
@@
-66,7
+66,7
@@
if args[0] == "-a":
(old,oldorder)= process(open(args[0]))
(new,neworder)= process(open(args[1]))
(old,oldorder)= process(open(args[0]))
(new,neworder)= process(open(args[1]))
-newstate = {None:'REM
',"is not set":'DIS','y':'BLT','m':'MOD
'}
+newstate = {None:'REM
OVED',"is not set":'DISABLE','y':'BUILTIN','m':'MODULE
'}
keys = neworder
for key in keys:
o = old.get(key,None)
keys = neworder
for key in keys:
o = old.get(key,None)
@@
-76,13
+76,10
@@
for key in keys:
# not sure we care about what options have been removed
# from from.config file
# not sure we care about what options have been removed
# from from.config file
-sys.exit(0)
-oldstate = {None:'A',"is not set":'D','y':'B','m':'M'}
+oldstate = {None:'REMOVED',"is not set":'DISABLE','y':'BUILTIN','m':'MODULE '}
keys = oldorder
for key in keys:
keys = oldorder
for key in keys:
- n = new.get(key,
-1
)
+ n = new.get(key,
None
)
o = old[key]
o = old[key]
- if n == -1 and not showall:
- print "%c -> %c : %s" % (oldstate[o],oldstate[n],key)
-
-
+ if n == o and not showall: continue
+ print "%6s -> %6s : %s" % (oldstate.get(o,o),oldstate.get(n,n),key)