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
updated to optionally display the text that describes a config option
[linux-2.6.git]
/
configs
/
kompare
diff --git
a/configs/kompare
b/configs/kompare
index
11df5e9
..
8fff7f8
100755
(executable)
--- a/
configs/kompare
+++ b/
configs/kompare
@@
-5,17
+5,18
@@
# 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.
1 2006/11/30 16:41:09
mef Exp $
+# $Id: kompare,v 1.
2 2006/11/30 17:07:03
mef Exp $
#
import sys, re, os
#
import sys, re, os
+import kread
def process(file):
ORDER = []
CONFIGS = {}
for line in file.readlines():
iline = line.lower()
def process(file):
ORDER = []
CONFIGS = {}
for line in file.readlines():
iline = line.lower()
- iline.strip()
+ iline
= iline
.strip()
if len(iline)==0: continue
firstchar = iline[0]
if len(iline)==0: continue
firstchar = iline[0]
@@
-73,6
+74,9
@@
for key in keys:
n = new[key]
if n==o and not showall: continue
print "%6s -> %6s : %s" % (newstate.get(o,o),newstate.get(n,n),key)
n = new[key]
if n==o and not showall: continue
print "%6s -> %6s : %s" % (newstate.get(o,o),newstate.get(n,n),key)
+ if not showall: continue
+ helptxt=kread.gethelp(key)
+ if helptxt<>'':print helptxt
# 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
@@
-85,3
+89,4
@@
for key in keys:
if n == -1 and not showall:
print "%c -> %c : %s" % (oldstate[o],oldstate[n],key)
if n == -1 and not showall:
print "%c -> %c : %s" % (oldstate[o],oldstate[n],key)
+