tools/git-buildpackage.git
12 years agodeb.changelog: allow to extract author and date
Guido Günther [Thu, 15 Mar 2012 20:19:48 +0000 (21:19 +0100)]
deb.changelog: allow to extract author and date

12 years agodocs: Fix path to gbp-configure-unpatched-source
Guido Günther [Thu, 15 Mar 2012 19:09:58 +0000 (20:09 +0100)]
docs: Fix path to gbp-configure-unpatched-source

Thanks: Tobias Frost

12 years agoDocument changes and release 0.6.0~git20120311 debian/0.6.0_git20120311
Guido Günther [Sun, 11 Mar 2012 18:23:52 +0000 (19:23 +0100)]
Document changes and release 0.6.0~git20120311

12 years agoMove gbp.conf manpage to section 5 and add references
Guido Günther [Sun, 11 Mar 2012 18:10:02 +0000 (19:10 +0100)]
Move gbp.conf manpage to section 5 and add references

from the other manpages

12 years agoDocument changes and release 0.6.0~git20120227
Guido Günther [Thu, 8 Mar 2012 17:57:42 +0000 (18:57 +0100)]
Document changes and release 0.6.0~git20120227

12 years agogit-import-dscs: allow to ignore gbp.conf files stored in the repository
Guido Günther [Thu, 8 Mar 2012 17:17:51 +0000 (18:17 +0100)]
git-import-dscs: allow to ignore gbp.conf files stored in the repository

Closes: #660898

12 years agodocs: Mention --help and commands that can't be configured via gbp.conf
Guido Günther [Thu, 8 Mar 2012 17:08:30 +0000 (18:08 +0100)]
docs: Mention --help and commands that can't be configured via gbp.conf

Git-Dch: Ignore

12 years agoGbpOptionParser: allow to modify list of parsed conf files
Guido Günther [Thu, 8 Mar 2012 13:54:22 +0000 (14:54 +0100)]
GbpOptionParser: allow to modify list of parsed conf files

by setting the GBP_CONF_FILES environment variable.

12 years agoBump standards version to 3.9.3
Guido Günther [Thu, 8 Mar 2012 16:51:46 +0000 (17:51 +0100)]
Bump standards version to 3.9.3

12 years agoRemove build/ directory
Guido Günther [Thu, 8 Mar 2012 16:49:01 +0000 (17:49 +0100)]
Remove build/ directory

during clean so we don't step on any epydoc leftovers

12 years agoBuild-require a git version that supports --no-edit
Guido Günther [Thu, 8 Mar 2012 16:46:10 +0000 (17:46 +0100)]
Build-require a git version that supports --no-edit

Closes: #663103

12 years agoAdd manual page for gbp.conf
Guido Günther [Thu, 8 Mar 2012 07:57:20 +0000 (08:57 +0100)]
Add manual page for gbp.conf

Closes: #661748
Thanks: Jari Alto for the POD version

12 years agoimport_dsc: Create debian branch for native packages too
Guido Günther [Thu, 8 Mar 2012 07:42:36 +0000 (08:42 +0100)]
import_dsc: Create debian branch for native packages too

Closes: #663001

12 years agoDocument changes and release 0.6.0~git20120226 debian/0.6.0_git20120226
Guido Günther [Sun, 26 Feb 2012 11:11:48 +0000 (12:11 +0100)]
Document changes and release 0.6.0~git20120226

12 years agoDepend on git >= 1:1.7.9.1-1~
Guido Günther [Sun, 26 Feb 2012 11:04:56 +0000 (12:04 +0100)]
Depend on git >= 1:1.7.9.1-1~

for a working git merge --no-edit

Thanks: Jonathan Nieder

12 years agoGitRepository.merge: add edit option
Guido Günther [Sun, 26 Feb 2012 10:59:05 +0000 (11:59 +0100)]
GitRepository.merge: add edit option

defaulting to False

Closes: #659239

12 years agoGitRepsitory.merge: update apidoc and switch to GitArgs
Guido Günther [Sun, 26 Feb 2012 10:52:14 +0000 (11:52 +0100)]
GitRepsitory.merge: update apidoc and switch to GitArgs

Git-Dch: Ignore

12 years agoconfig.py: Add default value print out to all options
Guido Günther [Sun, 26 Feb 2012 10:32:11 +0000 (11:32 +0100)]
config.py: Add default value print out to all options

12 years agodocs: makeversion pattern match the code
Guido Günther [Sat, 25 Feb 2012 14:57:48 +0000 (15:57 +0100)]
docs: makeversion pattern match the code

Closes: #650465

12 years agocopy_from: remove, not used anymore
Guido Günther [Tue, 31 Jan 2012 07:25:01 +0000 (08:25 +0100)]
copy_from: remove, not used anymore

12 years agogbp-pq: refactor args of write_patch()
Markus Lehtonen [Thu, 12 Jan 2012 13:40:54 +0000 (15:40 +0200)]
gbp-pq: refactor args of write_patch()

Allows defining the formerly hardcoded patch_dir. This makes
write_patch() re-usable in the upcoming RPM-tools.

Signed-off-by: Guido Günther <agx@sigxcpu.org>
12 years agoMerge tag 'debian/0.6.0_git20120218' into experimental
Guido Günther [Sat, 18 Feb 2012 15:26:19 +0000 (16:26 +0100)]
Merge tag 'debian/0.6.0_git20120218' into experimental

Debian release 0.6.0~git20120218

12 years agoDocument changes and release 0.6.0~git20120211 debian/0.6.0_git20120218
Guido Günther [Sat, 18 Feb 2012 15:17:26 +0000 (16:17 +0100)]
Document changes and release 0.6.0~git20120211

12 years agogbp-pq: Properly print patch name
Guido Günther [Sat, 18 Feb 2012 15:15:51 +0000 (16:15 +0100)]
gbp-pq: Properly print patch name

when guessing authorship information

12 years agodocs: add missing tags to sgml files
Markus Lehtonen [Fri, 10 Feb 2012 15:08:20 +0000 (17:08 +0200)]
docs: add missing tags to sgml files

Signed-off-by: Guido Günther <agx@sigxcpu.org>
12 years agoMake sure we test the built modules
Guido Günther [Mon, 13 Feb 2012 18:56:10 +0000 (19:56 +0100)]
Make sure we test the built modules

not the system ones

12 years agogbp.config: Add tests
Guido Günther [Mon, 13 Feb 2012 18:00:43 +0000 (19:00 +0100)]
gbp.config: Add tests

Git-Dch: Ignore

12 years agoRename GbpOptionParserCommon common to GbpOptionParser
Guido Günther [Mon, 13 Feb 2012 17:56:28 +0000 (18:56 +0100)]
Rename GbpOptionParserCommon common to GbpOptionParser

12 years agoRefactor config.py as preparation for rpm support.
Markus Lehtonen [Thu, 12 Jan 2012 13:40:42 +0000 (15:40 +0200)]
Refactor config.py as preparation for rpm support.

Split GbpOptionParser in to a common base class and a Debian
specific subclass, as a preparation for upcoming RPM support.

This allows having different default values (and help texts) for common
options between different package types, and, clearer separation of
package type specific options.

Signed-off-by: Guido Günther <agx@sigxcpu.org>
12 years agoRequire git 1.7
Guido Günther [Mon, 13 Feb 2012 16:10:47 +0000 (17:10 +0100)]
Require git 1.7

which is already in Squeeze and Lenny Backports

12 years agoLower dependencies on python-nose and python-coverage
Guido Günther [Mon, 13 Feb 2012 08:39:49 +0000 (09:39 +0100)]
Lower dependencies on python-nose and python-coverage

the versions in Squeeze are recent enough.

12 years agoDepend on git instead of git-core
Guido Günther [Mon, 13 Feb 2012 07:46:02 +0000 (08:46 +0100)]
Depend on git instead of git-core

Closes: #659661

12 years agoMake pristine_tar testcases pass with older git versions
Markus Lehtonen [Tue, 7 Feb 2012 16:25:02 +0000 (18:25 +0200)]
Make pristine_tar testcases pass with older git versions

that don't support user-defined output formats (tar filters) in
git-archive.

12 years agoDocument changes and release 0.6.0~git20120210 debian/0.6.0_git20120210
Guido Günther [Fri, 10 Feb 2012 08:31:09 +0000 (09:31 +0100)]
Document changes and release 0.6.0~git20120210

12 years agogbp-pull: Use a DebianGitRepository
Guido Günther [Fri, 10 Feb 2012 07:41:50 +0000 (08:41 +0100)]
gbp-pull: Use a DebianGitRepository

Closes: #59290

12 years agoInclude missing doctests in generated API docs
Guido Günther [Thu, 9 Feb 2012 15:15:41 +0000 (16:15 +0100)]
Include missing doctests in generated API docs

12 years agoPristineTar: fix links in testcases
Guido Günther [Thu, 9 Feb 2012 15:11:35 +0000 (16:11 +0100)]
PristineTar: fix links in testcases

12 years agoDocument changes and release 0.6.0~git20120209 debian/0.6.0_git20120209
Guido Günther [Thu, 9 Feb 2012 13:09:09 +0000 (14:09 +0100)]
Document changes and release 0.6.0~git20120209

12 years agoDocument changes and release 0.6.0~git20120207
Guido Günther [Tue, 7 Feb 2012 22:25:18 +0000 (23:25 +0100)]
Document changes and release 0.6.0~git20120207

12 years agoimport_orig: Properly detect .tgz and other abbreviated file extensions
Guido Günther [Tue, 7 Feb 2012 22:21:14 +0000 (23:21 +0100)]
import_orig: Properly detect .tgz and other abbreviated file extensions

Closes: #658777

12 years agoimport_orig: clarify function description
Guido Günther [Tue, 7 Feb 2012 22:21:00 +0000 (23:21 +0100)]
import_orig: clarify function description

12 years agoUpstreamSource: tgz is suitable as upstream tarball.
Guido Günther [Tue, 7 Feb 2012 22:12:45 +0000 (23:12 +0100)]
UpstreamSource: tgz is suitable as upstream tarball.

12 years agoUpstreamSource: clarify method descriptions
Guido Günther [Tue, 7 Feb 2012 22:12:10 +0000 (23:12 +0100)]
UpstreamSource: clarify method descriptions

12 years agoUpstreamSource: turn is_* vars and properties into methods
Guido Günther [Tue, 7 Feb 2012 21:55:48 +0000 (22:55 +0100)]
UpstreamSource: turn is_* vars and properties into methods

since this is more consistent with the other is_* methods in other
classes.

12 years agoDocument changes and release 0.6.0~git20120124 debian/0.6.0_git20120124
Guido Günther [Tue, 31 Jan 2012 09:22:31 +0000 (10:22 +0100)]
Document changes and release 0.6.0~git20120124

12 years agoGitRepository: Use _git_inout() in __init__()
Guido Günther [Tue, 31 Jan 2012 08:59:15 +0000 (09:59 +0100)]
GitRepository: Use _git_inout() in __init__()

to avoid misleading error message

12 years agoGitRepository: Allow empty input in _git_inout()
Guido Günther [Tue, 31 Jan 2012 08:58:45 +0000 (09:58 +0100)]
GitRepository: Allow empty input in _git_inout()

so it can replace _git_getoutput()

12 years agoGitRepository: rename to __git_inout to _git_inout
Guido Günther [Tue, 31 Jan 2012 08:24:14 +0000 (09:24 +0100)]
GitRepository: rename to __git_inout to _git_inout

for readability.

12 years agoGitRepository: Rename __git_getoutput to _git_getoutput
Guido Günther [Tue, 31 Jan 2012 08:17:09 +0000 (09:17 +0100)]
GitRepository: Rename __git_getoutput to _git_getoutput

and deprecate it since _git_inout is more flexible, allows to capture
stderr and doesn't return a list of strings.

12 years agoGitRepository: allow to capture stderr in __git_inout
Guido Günther [Tue, 31 Jan 2012 07:48:06 +0000 (08:48 +0100)]
GitRepository: allow to capture stderr in __git_inout

stderr was always None.

12 years agoDepend on pristine-tar for the tests
Guido Günther [Mon, 30 Jan 2012 12:03:03 +0000 (13:03 +0100)]
Depend on pristine-tar for the tests

12 years agoPristineTar: add testcase
Guido Günther [Sun, 22 Jan 2012 18:45:58 +0000 (19:45 +0100)]
PristineTar: add testcase

12 years agoPristineTar: fix match when not passing in a compression type
Guido Günther [Mon, 30 Jan 2012 11:48:45 +0000 (12:48 +0100)]
PristineTar: fix match when not passing in a compression type

12 years agoPristineTar: add missing import for debug output
Guido Günther [Mon, 30 Jan 2012 11:48:13 +0000 (12:48 +0100)]
PristineTar: add missing import for debug output

12 years agoGitRepository: document archive()
Guido Günther [Sat, 28 Jan 2012 20:08:47 +0000 (21:08 +0100)]
GitRepository: document archive()

12 years agoPristineTar: make sure we set the current working directory
Guido Günther [Sat, 28 Jan 2012 20:08:34 +0000 (21:08 +0100)]
PristineTar: make sure we set the current working directory

otherwise this will fail when invoked from outside the git tree

12 years agoRemove comparison with True to make pychecker happy
Guido Günther [Mon, 23 Jan 2012 22:27:06 +0000 (23:27 +0100)]
Remove comparison with True to make pychecker happy

12 years agoGitRepository: allow git.commit_dir to create new branches
Markus Lehtonen [Thu, 12 Jan 2012 13:21:51 +0000 (15:21 +0200)]
GitRepository: allow git.commit_dir to create new branches

commit_dir creates new orphan branch if the given branch is not found
and create_missing_branch is allowed.

12 years agogbp-pq: don't crash in get_maintainer_from_control()
Markus Lehtonen [Thu, 12 Jan 2012 13:27:13 +0000 (15:27 +0200)]
gbp-pq: don't crash in get_maintainer_from_control()

even if debian/control is missing.

12 years agoDocument changes and release 0.6.0~git20120123
Guido Günther [Mon, 23 Jan 2012 21:16:35 +0000 (22:16 +0100)]
Document changes and release 0.6.0~git20120123

12 years agobuildpackage: Add pristine-tar-commit option
Guido Günther [Sun, 22 Jan 2012 12:00:38 +0000 (13:00 +0100)]
buildpackage: Add pristine-tar-commit option

This option allows to auto commit a generated tarball to the
pristine-tar branch to simplify building non-dfsg clean packages and to
make it easier to track uptream git.

12 years agoPristineTar: move to separate module
Guido Günther [Fri, 13 Jan 2012 08:07:19 +0000 (09:07 +0100)]
PristineTar: move to separate module

and make it accessible from GitRepository to group
checkout/checkin/lookup.

12 years agodeb.changelog: add name property
Guido Günther [Sun, 22 Jan 2012 11:52:23 +0000 (12:52 +0100)]
deb.changelog: add name property

12 years agodeb: Add UpstreamSource.build_tarball_name
Guido Günther [Sun, 22 Jan 2012 15:46:51 +0000 (16:46 +0100)]
deb: Add UpstreamSource.build_tarball_name

to build a tarball name from a (package, version, compression) triplet
optionally adding a directory.

12 years agotristate: fix __repr__
Guido Günther [Sun, 22 Jan 2012 15:57:02 +0000 (16:57 +0100)]
tristate: fix __repr__

and add doctest

12 years agoDebianGitRepository: Add parameter and return types to find_version()
Guido Günther [Sat, 21 Jan 2012 16:48:34 +0000 (17:48 +0100)]
DebianGitRepository: Add parameter and return types to find_version()

12 years agodeb: make find_version() return sha1 of a commit
Markus Lehtonen [Thu, 19 Jan 2012 15:03:38 +0000 (17:03 +0200)]
deb: make find_version() return sha1 of a commit

Change find_version() so that it always returns sha1 of a commit object.
That is, annotated tags are dereferenced to a commit object. Previously
find_commit returned the sha1 of the tag object.

12 years agoGitRepository: add get_obj_type()
Markus Lehtonen [Thu, 12 Jan 2012 13:23:05 +0000 (15:23 +0200)]
GitRepository: add get_obj_type()

get_obj_type() returns the type of a git repository object.

12 years agoDebianGitRepository: fix module description
Guido Günther [Sat, 21 Jan 2012 16:37:13 +0000 (17:37 +0100)]
DebianGitRepository: fix module description

12 years agoDon't assume gzip compression of the orig tarball
Guido Günther [Wed, 18 Jan 2012 07:47:55 +0000 (08:47 +0100)]
Don't assume gzip compression of the orig tarball

12 years agoAdd git-depth option to gbp-clone and gbp-pull
Markus Lehtonen [Thu, 12 Jan 2012 13:25:10 +0000 (15:25 +0200)]
Add git-depth option to gbp-clone and gbp-pull

Allows creating and deepening shallow clones. This is sometimes
useful for e.g. saving bandwidth when cloning.

12 years agodebian/rules: be verbose on epydoc markup errors
Guido Günther [Sun, 15 Jan 2012 19:03:59 +0000 (20:03 +0100)]
debian/rules: be verbose on epydoc markup errors

12 years agoGitRepository: Fix types in diff docstring
Guido Günther [Sun, 15 Jan 2012 19:02:45 +0000 (20:02 +0100)]
GitRepository: Fix types in diff docstring

12 years agoGitRepository: add depth parameter to fetch()
Markus Lehtonen [Thu, 12 Jan 2012 13:24:57 +0000 (15:24 +0200)]
GitRepository: add depth parameter to fetch()

Allows deepening of shallow clones.

12 years agoGitRepository: fix documentation of fetch()
Markus Lehtonen [Fri, 13 Jan 2012 09:49:22 +0000 (11:49 +0200)]
GitRepository: fix documentation of fetch()

12 years agodeb: minor refactor of parameters of has_orig()
Markus Lehtonen [Thu, 12 Jan 2012 13:24:19 +0000 (15:24 +0200)]
deb: minor refactor of parameters of has_orig()

12 years agodeb: minor refactor of parameters of symlink_orig()
Markus Lehtonen [Thu, 12 Jan 2012 13:24:04 +0000 (15:24 +0200)]
deb: minor refactor of parameters of symlink_orig()

12 years agoGitRepository: add diff()
Markus Lehtonen [Thu, 12 Jan 2012 13:23:39 +0000 (15:23 +0200)]
GitRepository: add diff()

Diff two git repository objects (tag, commit, tree or blob).

12 years agoGitRepository: add rename_branch() method
Markus Lehtonen [Thu, 12 Jan 2012 13:22:51 +0000 (15:22 +0200)]
GitRepository: add rename_branch() method

12 years agogbp-posttag-push: check if upstream is up to date per remote
Guido Günther [Fri, 13 Jan 2012 21:45:03 +0000 (22:45 +0100)]
gbp-posttag-push: check if upstream is up to date per remote

This isn't perfect since someone else might have already pushed
that ref and we might not have pulled it yet.

12 years agoGitRepository: don't explicitly set the tags option
Guido Günther [Fri, 13 Jan 2012 21:37:05 +0000 (22:37 +0100)]
GitRepository: don't explicitly set the tags option

to avoid missing remotes on "git fetch".

12 years agoUpdate to git-pbuilder 1.27
Guido Günther [Tue, 10 Jan 2012 11:34:44 +0000 (12:34 +0100)]
Update to git-pbuilder 1.27

This adds support for creating backport build environments.

Thanks: Russ Allbery

12 years agoGitRepository: Allow to explicitly fetch tags
Guido Günther [Wed, 11 Jan 2012 20:51:17 +0000 (21:51 +0100)]
GitRepository: Allow to explicitly fetch tags

12 years agobuildpackage: Allow to pass pbuilder options
Guido Günther [Wed, 11 Jan 2012 20:36:22 +0000 (21:36 +0100)]
buildpackage: Allow to pass pbuilder options

via commandline or gbp.conf

12 years agogbp-post-tag-push: Add --verbose option
Guido Günther [Tue, 10 Jan 2012 19:31:53 +0000 (20:31 +0100)]
gbp-post-tag-push: Add --verbose option

to ease debugging

12 years agoGitRepository.branch_contains: fix misplaced remote parameter
Guido Günther [Tue, 10 Jan 2012 19:28:04 +0000 (20:28 +0100)]
GitRepository.branch_contains: fix misplaced remote parameter

12 years agogbp-posttag-push: Allow to push the upstream tag too
Guido Günther [Tue, 10 Jan 2012 14:22:52 +0000 (15:22 +0100)]
gbp-posttag-push: Allow to push the upstream tag too

via the -u option.

12 years agoGitRepository: Test find_tag() and add_remote_repo()
Guido Günther [Tue, 10 Jan 2012 16:01:16 +0000 (17:01 +0100)]
GitRepository: Test find_tag() and add_remote_repo()

12 years agoGitRepository: Add branch_contains()
Guido Günther [Tue, 10 Jan 2012 14:58:56 +0000 (15:58 +0100)]
GitRepository: Add branch_contains()

to check if a branch contains a specific commit

12 years agoGitRepository: add verify_tag()
Guido Günther [Tue, 10 Jan 2012 14:00:15 +0000 (15:00 +0100)]
GitRepository: add verify_tag()

12 years agoGitRepository: add push() and push_tag()
Guido Günther [Tue, 10 Jan 2012 13:47:23 +0000 (14:47 +0100)]
GitRepository: add push() and push_tag()

12 years agoUse testutils in 09_test_write_tree.py
Guido Günther [Tue, 10 Jan 2012 12:17:10 +0000 (13:17 +0100)]
Use testutils in 09_test_write_tree.py

12 years agoAllow to specify the upstream tree via --upstream-tree
Guido Günther [Sun, 8 Jan 2012 18:48:24 +0000 (19:48 +0100)]
Allow to specify the upstream tree via --upstream-tree

without the indirection to --upstream-branch.

12 years agoGitRepository: use isinstance(basestring) to check for string types
Guido Günther [Sun, 8 Jan 2012 19:03:10 +0000 (20:03 +0100)]
GitRepository: use isinstance(basestring) to check for string types

12 years agoAdd "gbp-pq switch" to bash completion
Guido Günther [Sat, 31 Dec 2011 15:44:00 +0000 (16:44 +0100)]
Add "gbp-pq switch" to bash completion

12 years agoDocument changes and release 0.6.0~git20111229 debian/0.6.0_git20111229
Guido Günther [Thu, 29 Dec 2011 13:54:48 +0000 (14:54 +0100)]
Document changes and release 0.6.0~git20111229

12 years agoimport_dsc: remove debian dir from upstream source
Guido Günther [Thu, 29 Dec 2011 12:37:42 +0000 (13:37 +0100)]
import_dsc: remove debian dir from upstream source

after importing it. This gives as the orig tarball on upstream but the
debian branch looks the same as with dpkg-source -x.

Closes: #653472

12 years agoGitRepository: add test for {write,commit}_tree
Guido Günther [Thu, 29 Dec 2011 09:10:47 +0000 (10:10 +0100)]
GitRepository: add test for {write,commit}_tree

Git-Dch: Ignore

12 years agoGitRepository: Add testcases for cornercases
Guido Günther [Thu, 29 Dec 2011 11:33:13 +0000 (12:33 +0100)]
GitRepository: Add testcases for cornercases

and small functions

Git-Dch: Ignore

12 years agoGitRepository: more consistent exception syntax
Guido Günther [Thu, 29 Dec 2011 11:21:21 +0000 (12:21 +0100)]
GitRepository: more consistent exception syntax