From d6a43ef17c035c2efbeaa6a6094f47f9b9107079 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 21 Aug 2008 16:05:41 +0200 Subject: [PATCH] alsatool: do not use 'git-*' commands, add more files to comments.py Signed-off-by: Jaroslav Kysela --- alsatool | 24 ++++++++++++------------ comments.py | 11 +++++++++++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/alsatool b/alsatool index 882b8af..f405673 100755 --- a/alsatool +++ b/alsatool @@ -734,8 +734,8 @@ def edit(argv, remove=False): print "Original HEAD is %s..." % head print "Removed commits are in %s..." % tmpdir + '/commits' print "Resetting tree to %s..." % os.popen("git log --pretty=oneline %s~1..%s" % (commit, commit)).readline().strip() - if os.system("git-reset --hard %s~1" % commit): - raise ValueError, "git-reset" + if os.system("git reset --hard %s~1" % commit): + raise ValueError, "git reset" first = True for commit in commits: if remove and first: @@ -801,7 +801,7 @@ def import_(argv): blacklist.append(l[:l.find(' ')]) del blacklist1 branch = argv[0] - base = os.popen("git-merge-base master %s" % branch).readline().strip() + base = os.popen("git merge-base master %s" % branch).readline().strip() log1 = parse_log(os.popen("git log --pretty=fuller --date=iso --reverse master..%s" % branch)) log2 = parse_log(os.popen("git log --pretty=fuller --date=iso --reverse %s..master" % base)) tomerge = [] @@ -832,11 +832,11 @@ def import_(argv): print 'Already merged patches: %s' % skipcount print 'Patches to be merged: %s' % len(tomerge) for l1 in tomerge: - oldrev = os.popen("git-rev-parse HEAD").readline().strip() + oldrev = os.popen("git rev-parse HEAD").readline().strip() if extpick(['.', l1['commit']], sign=True): sys.stderr.write('An error occured...\n') return - rev = os.popen("git-rev-parse HEAD").readline().strip() + rev = os.popen("git rev-parse HEAD").readline().strip() if oldrev == rev: sys.stdout.write('No change, do you want to black list this patch? (Y/ ) ') sys.stdout.flush() @@ -940,16 +940,16 @@ def kmirrorcheck(): print "Analyzing alsa-kmirror.." os.chdir(ROOT + '/alsa-kmirror') - kcommits = parse_log(os.popen("git-log --reverse --pretty=fuller --date=iso v1.0.16..HEAD")) + kcommits = parse_log(os.popen("git log --reverse --pretty=fuller --date=iso v1.0.16..HEAD")) print "Found %s commits after v1.0.16" % len(kcommits) os.chdir(ROOT + '/alsa-kernel') print "Looking for a common base..." - base = os.popen("git-merge-base %s linux-2.6" % getorigin()).read(1024).strip() + base = os.popen("git merge-base %s linux-2.6" % getorigin()).read(1024).strip() if not base: raise ValueError, "base" print "Base is %s" % repr(base) - log1 = os.popen("git-log --reverse --name-only --pretty=oneline --date=iso %s..linux-2.6" % base) + log1 = os.popen("git log --reverse --name-only --pretty=oneline --date=iso %s..linux-2.6" % base) last = '' ok = False commits = [] @@ -973,7 +973,7 @@ def kmirrorcheck(): changes = 0 msg = [] for commit in commits: - fuller = parse_log(os.popen("git-log --name-only --pretty=fuller --date=iso %s~1..%s" % (commit, commit)))[0] + fuller = parse_log(os.popen("git log --name-only --pretty=fuller --date=iso %s~1..%s" % (commit, commit)))[0] if fuller.has_key('Merge'): continue for l2 in kcommits: @@ -1053,14 +1053,14 @@ Additional notes: The following files will be updated: """ % (branch, branch, patch) - lines1 = os.popen("git-diff -M --stat --summary linux-2.6..%s" % branch).readlines() + lines1 = os.popen("git diff -M --stat --summary linux-2.6..%s" % branch).readlines() for line in lines1: if not line.startswith(' create mode'): lines += line lines += '\n' - lines += os.popen("git-rev-list --no-merges --pretty=short linux-2.6..%s | git-shortlog" % branch).read(10*1024*1024) + lines += os.popen("git rev-list --no-merges --pretty=short linux-2.6..%s | git-shortlog" % branch).read(10*1024*1024) filename = tmpdir() + '/' + patch - if os.system("git-diff -r linux-2.6..%s > %s" % (branch, filename)): + if os.system("git diff -r linux-2.6..%s > %s" % (branch, filename)): raise ValueError, "git-diff" if os.system("gzip -9 %s" % filename): raise ValueError, "gzip" diff --git a/comments.py b/comments.py index a5be80a..f1c6f40 100644 --- a/comments.py +++ b/comments.py @@ -48,6 +48,8 @@ COMMENT_MAP = { ['/arm/s3c24xx-iis.[ch]', 'ARM S3C24XX IIS driver'], ['/arm', 'ERROR'], ['/isa/Kconfig', 'ISA'], + ['/include/wss.h', 'WSS library'], + ['/isa/wss/.*', 'WSS library'], ['/include/ad1816a.h', 'AD1816A driver'], ['/isa/ad1816a', 'AD1816A driver'], ['/include/ad1843.h', 'AD1843 driver'], @@ -233,17 +235,23 @@ COMMENT_MAP = { ['/pcmcia/Makefile', 'PCMCIA'], ['/pcmcia', 'ERROR'], ['/include/soc.h', 'SoC Layer'], + ['/include/soc-of-simple.h', 'SoC Layer'], ['/include/soc-dapm.h', 'SoC Dynamic Audio Power Management'], ['/soc/codecs/Kconfig', 'SoC Layer'], ['/soc/codecs/ac97.(c|h)', 'SoC Codec AC97'], ['/soc/codecs/wm8510.(c|h)', 'SoC Codec WM8510'], + ['/soc/codecs/wm8560.(c|h)', 'SoC Codec WM8560'], + ['/soc/codecs/wm8580.(c|h)', 'SoC Codec WM8580'], ['/soc/codecs/wm8731.(c|h)', 'SoC Codec WM8731'], ['/soc/codecs/wm8750.(c|h)', 'SoC Codec WM8750'], ['/soc/codecs/wm8753.(c|h)', 'SoC Codec WM8753'], + ['/soc/codecs/wm8900.(c|h)', 'SoC Codec WM8900'], ['/soc/codecs/wm8990.(c|h)', 'SoC Codec WM8990'], ['/soc/codecs/wm9712.(c|h)', 'SoC Codec WM9712'], ['/soc/codecs/wm9713.(c|h)', 'SoC Codec WM9713'], ['/soc/codecs/cs4270.(c|h)', 'SoC Codec CS4270'], + ['/soc/codecs/ad1980.(c|h)', 'SoC Codec AD1980'], + ['/soc/codecs/tlv320aic26.(c|h)', 'SoC Codec TLV320AIC26'], ['/soc/codecs/tlv320aic3x.(c|h)', 'SoC Codec TLV320AIC3X'], ['/soc/codecs/uda1380.(c|h)', 'SoC Codec Philips UDA1380'], ['/soc/codecs/ak4535.(c|h)', 'SoC Codec AK4535'], @@ -310,6 +318,8 @@ COMMENT_MAP = { ['/core/control.*', 'Control Midlevel'], ['/core/isadma.*', 'ISA DMA'], ['/core/vmaster.*', 'Virtual Master'], + ['/include/jack.h', 'Jack Input Event Midlevel'], + ['/core/jack.*', 'Jack Input Event Midlevel'], ['/include/adriver.h', 'ALSA Core'], ['/include/asound.h', 'ALSA Core'], ['/include/asoundef.h', 'ALSA Core'], @@ -516,6 +526,7 @@ COMMENT_MAP = { ['/maemo/.*', 'Alsa support for Maemo SDK (n770)'], ['/pph/.*', 'Public Parrot Hack rate converter'], ['/rate-lavc/.*', "libavcodec's resampler"], + ['/usb_stream/.*', 'USB stream plugin'], ['/COPYING.GPL', 'Core'], ['/COPYING', 'Core'], ['/configure.in', 'Core'], -- 2.47.1