[alsa-cvslog] alsa (service): ALSA repository for misc stuff (service like) branch, master now at
Brought to you by:
perex
From: <nor...@al...> - 2008-05-30 11:12:42
|
Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 067e155277bcd4eab92c3a18ba67eb13fec32d56 (commit) from 42d7644978ae80602e6394f46c64a83518778e68 (commit) - Log ----------------------------------------------------------------- commit 067e155277bcd4eab92c3a18ba67eb13fec32d56 Author: Jaroslav Kysela <pe...@pe...> AuthorDate: Fri May 30 13:12:36 2008 +0200 Commit: Jaroslav Kysela <pe...@pe...> CommitDate: Fri May 30 13:12:36 2008 +0200 alsatool updates ----------------------------------------------------------------------- Diffstat: alsatool | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) Patch -------------- (max 1500 lines) diff --git a/alsatool b/alsatool index ad46af3..98fb0c1 100755 --- a/alsatool +++ b/alsatool @@ -12,6 +12,7 @@ Usage: import os import sys import getopt +from shutil import rmtree VERSION="2.0" @@ -478,6 +479,19 @@ def verbose(argv): global VERBOSE VERBOSE=True +def extpick(argv): + repo = os.path.abspath(argv[0]) + commit = argv[1] + tmpdir = ".extpick" + if not os.path.exists(tmpdir): + os.mkdir(tmpdir) + if os.system("git --work-tree=%s --git-dir=%s format-patch -k --stdout --full-index --committer %s~1..%s > %s" % (repo, repo + '/.git', commit, commit, tmpdir + '/format-patch')): + raise ValueError, "format-patch" + os.system("git am --committer -i -3 %s" % (tmpdir + '/format-patch')) + #if os.system("git --work-tree=%s --git-dir=%s mailinfo -u %s %s < %s > %s" % (repo, repo + '/.git', tmpdir + '/msg', tmpdir + '/patch', tmpdir + '/format-patch', tmpdir + '/info')): + # raise ValueError, "mail-info" + rmtree(tmpdir) + OPTS=[ ['h', 'help', usage, '', 'Print this help'], ['r', 'root', root, '<GIT root dir>', 'Set GIT root directory (default is %s)' % ROOT], @@ -491,7 +505,8 @@ CMDS=[ ['push', push, '[repo]', 'Do push on selected or all (default) repositories'], ['showchanged', showchanged, 'tag [repo]', 'Show which repositories were changed since tag'], ['release', release, 'tag [repo]', 'Do an ALSA release (auto = automatic change control)'], - ['changes', changes, 'oldtag newtag', 'Show changes between oldtag and newtag'] + ['changes', changes, 'oldtag newtag', 'Show changes between oldtag and newtag'], + ['extpick', extpick, 'local-repo-path commit', 'Pick and merge a patch from another repository'] ] def main(): ------- End of patch hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 42d7644978ae80602e6394f46c64a83518778e68 \ 067e155277bcd4eab92c3a18ba67eb13fec32d56 |