aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README3
-rw-r--r--TODO10
-rw-r--r--debian/changelog7
-rw-r--r--docs/git-import-orig.sgml11
-rwxr-xr-xgit-buildpackage1
-rwxr-xr-xgit-import-dsc21
-rwxr-xr-xgit-import-orig1
-rw-r--r--git_buildpackage/__init__.py1
-rw-r--r--git_buildpackage/deb_utils.py1
-rw-r--r--git_buildpackage/git_utils.py7
10 files changed, 39 insertions, 24 deletions
diff --git a/README b/README
index 4b52e750..24607b0b 100644
--- a/README
+++ b/README
@@ -5,7 +5,8 @@ This is a bunch of scripts to ease the development of Debian packages with git:
This will import the upstream source onto the upstream branch and add the Debian
paches on the master branch
- - git-import-orig: import a new upstream version into the repository
+ - git-import-orig: import a new upstream version into the repository and merge
+ it onto the onto the master branch
- git-debuild: build a package out of a git repository, check for local
modifications and tag appropriately
diff --git a/TODO b/TODO
index d3f2f0c4..6012eec7 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,7 @@
- git-buildpackage:
- - allow to export the hole source tree to tmpdir before building
- - easy push/pull to/from remote repositories (like alioth) after a
- successful build/for getting the sources
- - build orig.tar.gz if not available
+ - allow to export the hole source tree to tmpdir before building
+ - easy push/pull to/from remote repositories (like alioth) after a
+ successful build/for getting the sources
+ - build orig.tar.gz if not available
+- git-import-orig:
+ - allow to import from an unpacked source tree
diff --git a/debian/changelog b/debian/changelog
index e0010f91..20268743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git-buildpackage (0.2.8) git-buildpackage; urgency=low
+
+ * UNRELEASED
+ * minor cosmetic cleanups all over the place
+
+ -- Guido Guenther <agx@sigxcpu.org> Fri, 6 Oct 2006 23:13:05 +0200
+
git-buildpackage (0.2.7) git-buildpackage; urgency=low
* more robust regex matching
diff --git a/docs/git-import-orig.sgml b/docs/git-import-orig.sgml
index 0b2d9991..2da6e92e 100644
--- a/docs/git-import-orig.sgml
+++ b/docs/git-import-orig.sgml
@@ -42,9 +42,9 @@
<refsect1>
<title>DESCRIPTION</title>
<para>
- &git-import-orig; tar.gz file given by tar_gz into the git-buildpackage
- repository. It tries to guess the version information from the tarball's
- filename but it can also be specified on the command line.
+ &git-import-orig; import a tar.gz file given by tar_gz into the
+ git-buildpackage repository. It tries to guess the version information from
+ the tarball's filename but it can also be specified on the command line.
When importing the new version <command>git_load_dirs</command> is being
used to detect file renames and removals.
@@ -73,7 +73,10 @@
<term><option>--debian-branch</option>=<replaceable>branch_name</replaceable>
</term>
<listitem>
- <para>The branch in the Git repository the Debian package is being developed on, default is 'master'</para>
+ <para>The branch in the Git repository the Debian package is being
+ developed on, default is 'master'. After importing the new sources on
+ the upstream branch, &git-import-orig; will try to merge the new
+ version onto this branch.</para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/git-buildpackage b/git-buildpackage
index 375b82a4..c94e8b36 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -1,4 +1,5 @@
#!/usr/bin/python
+# -*- coding: utf-8 -*-
#
# run debuild in a git repository
#
diff --git a/git-import-dsc b/git-import-dsc
index 156aa804..8907c56c 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -1,4 +1,5 @@
#!/usr/bin/python
+# -*- coding: utf-8 -*-
#
# make a git archive out of a Debian source package
#
@@ -61,10 +62,10 @@ class DscPackage(object):
continue
m=self.tarre.match(line)
if m:
- dir=os.path.dirname(dscfile)
- if len(dir):
- dir+='/'
- self.tgz = dir+m.group('tar')
+ fromdir=os.path.dirname(dscfile)
+ if len(fromdir):
+ fromdir+='/'
+ self.tgz = fromdir+m.group('tar')
continue
f.close()
@@ -111,12 +112,7 @@ def move_tree(src, dirs):
RemoveTree(dirs['tmp'])()
-def usage(parser):
- parser.print_help()
- sys.exit(0)
-
-
-def main(argv):
+def main():
dirs={'top': os.path.abspath(os.curdir)}
parser = OptionParser('%prog [options] /path/to/package.dsc')
@@ -131,7 +127,8 @@ def main(argv):
Command.verbose = True
if len(args) != 1:
- usage(parser)
+ parser.print_help()
+ return 1
else:
src=DscPackage(args[0])
@@ -150,6 +147,6 @@ def main(argv):
print 'Everything imported under %s' % (src.pkg, )
if __name__ == '__main__':
- sys.exit(main(sys.argv))
+ sys.exit(main())
# vim:et:ts=4:sw=4:
diff --git a/git-import-orig b/git-import-orig
index fdf597e1..c085e08b 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -1,4 +1,5 @@
#!/usr/bin/python
+# -*- coding: utf-8 -*-
#
# (C) 2006 Guido Guenther <agx@sigxcpu.org>
# This program is free software; you can redistribute it and/or modify
diff --git a/git_buildpackage/__init__.py b/git_buildpackage/__init__.py
index 1fd958ac..1f3d66f4 100644
--- a/git_buildpackage/__init__.py
+++ b/git_buildpackage/__init__.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
# helper classes for git-buildpackge and friends
# (C) 2006 Guido Guenther <agx@sigxcpu.org>
diff --git a/git_buildpackage/deb_utils.py b/git_buildpackage/deb_utils.py
index 173c3128..7b8cd82a 100644
--- a/git_buildpackage/deb_utils.py
+++ b/git_buildpackage/deb_utils.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
# utility functions for git-buildpackge and friends
# (C) 2006 Guido Guenther <agx@sigxcpu.org>
diff --git a/git_buildpackage/git_utils.py b/git_buildpackage/git_utils.py
index 330c960a..9100abbb 100644
--- a/git_buildpackage/git_utils.py
+++ b/git_buildpackage/git_utils.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
# utility functions for git-buildpackge and friends
# (C) 2006 Guido Guenther <agx@sigxcpu.org>
@@ -7,18 +8,18 @@ import os.path
def is_repository_clean(path):
"""Does the repository at path contain any uncommitted modifications"""
try:
- dir=os.path.abspath(os.path.curdir)
+ curdir=os.path.abspath(os.path.curdir)
os.chdir(path)
except OSError:
return False
popen = subprocess.Popen(['git','status'], stdout=subprocess.PIPE)
- status=popen.wait()
+ popen.wait()
out=popen.stdout.readlines()
if out[0].strip() != 'nothing to commit':
ret=False
else:
ret=True
- os.chdir(dir)
+ os.chdir(curdir)
return (ret, "".join(out))
def is_repository(path):