Jari Aalto schrieb:
PACKAGE DESCRIPTION
===
Homepage: http://procode.org/stgit
License : GPL
Offer similar functionality to quilt i.e. pushing/popping patches
to/from a stack) on top of git. These operations are performed using
git commands and the patches are stored as git commit objects,
allowing easy merging of the stgit patches into other repositories
using standard git functionality.
CHANGES SINCE LAST RELEASE
==
Not applicaple.
stgit needs some patches for git-1.6
also upstream.
--
Reini Urban
http://phpwiki.org/ http://murbreak.at/
difforig /usr/lib/python2.5/site-packages/stgit
diff -u /usr/lib/python2.5/site-packages/stgit/basedir.py.orig
--- /usr/lib/python2.5/site-packages/stgit/basedir.py.orig 2006-06-11 12:33:58.00100 +
+++ /usr/lib/python2.5/site-packages/stgit/basedir.py 2008-12-15 18:35:56.021375000 +
@@ -39,7 +39,7 @@
if 'GIT_DIR' in os.environ:
__base_dir = os.environ['GIT_DIR']
else:
-__base_dir = __output('git-rev-parse --git-dir 2 /dev/null')
+__base_dir = __output('git rev-parse --git-dir 2 /dev/null')
return __base_dir
diff -u /usr/lib/python2.5/site-packages/stgit/commands/diff.py.orig
--- /usr/lib/python2.5/site-packages/stgit/commands/diff.py.orig 2008-12-15 18:48:57.958875000 +
+++ /usr/lib/python2.5/site-packages/stgit/commands/diff.py 2008-12-15 18:46:22.66200 +
@@ -45,7 +45,7 @@
metavar = 'rev1[..[rev2]]', dest = 'revs',
help = 'show the diff between revisions'),
make_option('-O', '--diff-opts',
- help = 'options to pass to git-diff'),
+ help = 'options to pass to git diff'),
make_option('-s', '--stat',
help = 'show the stat instead of the diff',
action = 'store_true')]
diff -u /usr/lib/python2.5/site-packages/stgit/commands/export.py.orig
--- /usr/lib/python2.5/site-packages/stgit/commands/export.py.orig 2008-12-15 18:49:19.708875000 +
+++ /usr/lib/python2.5/site-packages/stgit/commands/export.py 2008-12-15 18:46:22.66200 +
@@ -63,7 +63,7 @@
make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
make_option('-O', '--diff-opts',
- help = 'options to pass to git-diff'),
+ help = 'options to pass to git diff'),
make_option('-s', '--stdout',
help = 'dump the patches to the standard output',
action = 'store_true')]
diff -u /usr/lib/python2.5/site-packages/stgit/commands/files.py.orig
--- /usr/lib/python2.5/site-packages/stgit/commands/files.py.orig 2008-12-15 18:49:42.333875000 +
+++ /usr/lib/python2.5/site-packages/stgit/commands/files.py 2008-12-15 18:46:22.66200 +
@@ -39,7 +39,7 @@
make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
make_option('-O', '--diff-opts',
- help = 'options to pass to git-diff'),
+ help = 'options to pass to git diff'),
make_option('--bare',
help = 'bare file names (useful for scripting)',
action = 'store_true')]
diff -u /usr/lib/python2.5/site-packages/stgit/commands/pick.py.orig
--- /usr/lib/python2.5/site-packages/stgit/commands/pick.py.orig 2008-12-15 18:46:14.09950 +
+++ /usr/lib/python2.5/site-packages/stgit/commands/pick.py 2008-12-15 18:46:22.69325 +
@@ -96,7 +96,7 @@
if options.fold:
out.start('Folding commit %s' % commit_id)
-# try a direct git-apply first
+# try a direct git apply first
if not git.apply_diff(bottom, top):
git.merge(bottom, git.get_head(), top, recursive = True)
diff -u /usr/lib/python2.5/site-packages/stgit/config.py.orig
--- /usr/lib/python2.5/site-packages/stgit/config.py.orig 2007-05-21 21:05:00.00100 +
+++ /usr/lib/python2.5/site-packages/stgit/config.py 2008-12-15 18:34:52.50575 +
@@ -29,8 +29,8 @@
'stgit.autoresolved': 'no',
'stgit.smtpserver': 'localhost:25',
'stgit.smtpdelay': '5',
-'stgit.pullcmd': 'git-pull',
-'stgit.fetchcmd': 'git-fetch',
+'stgit.pullcmd': 'git pull',
+'stgit.fetchcmd': 'git fetch',
'stgit.pull-policy': 'pull',
'stgit.merger': 'diff3 -L current -L ancestor -L patched -m -E ' \
'%(branch1)s %(ancestor)s %(branch2)s %(output)s',
@@ -98,15 +98,15 @@
raise GitConfigException, 'Value for %s is not an integer: %s' % (name, value)
def rename_section(self, from_name, to_name):
-self.__run('git-repo-config --rename-section', [from_name, to_name])
+self.__run('git repo-config --rename-section', [from_name, to_name])
