tools/git-buildpackage.git
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 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

12 years agoWrite coverage information as html
Guido Günther [Wed, 28 Dec 2011 22:39:15 +0000 (23:39 +0100)]
Write coverage information as html

12 years agoRename and comment tests
Guido Günther [Wed, 28 Dec 2011 21:04:03 +0000 (22:04 +0100)]
Rename and comment tests

Git-Dch: Ignore

12 years agodch: Honor epoch when guessing new upstream version
Guido Günther [Wed, 28 Dec 2011 09:30:07 +0000 (10:30 +0100)]
dch: Honor epoch when guessing new upstream version

Closes: #652366
Thanks: a lot to Daniel Dehennin for the testcase

12 years agodch: Split guessing of upstream version into separate function
Guido Günther [Tue, 27 Dec 2011 18:50:45 +0000 (19:50 +0100)]
dch: Split guessing of upstream version into separate function

12 years agoMove _build_legacty_tag from GitRepository to to DebianGitRepository
Guido Günther [Wed, 28 Dec 2011 08:31:51 +0000 (09:31 +0100)]
Move _build_legacty_tag from GitRepository to to DebianGitRepository

and add doctest.

Git-Dch: Ignore

12 years agogbp.deb.git.py: Fix typos and add version
Guido Günther [Tue, 27 Dec 2011 18:48:29 +0000 (19:48 +0100)]
gbp.deb.git.py: Fix typos and add version

12 years agoGitRepository: Use GitArgs in get_commits
Guido Günther [Tue, 27 Dec 2011 17:27:57 +0000 (18:27 +0100)]
GitRepository: Use GitArgs in get_commits

12 years agoGitRepository: Add num option to git_commits
Guido Günther [Tue, 27 Dec 2011 17:09:11 +0000 (18:09 +0100)]
GitRepository: Add num option to git_commits

to limit number of returned commits and fix path option to also accept a
list of paths instead of a string.

12 years agodch: Indentation and docstring cleanups
Guido Günther [Tue, 27 Dec 2011 16:43:31 +0000 (17:43 +0100)]
dch: Indentation and docstring cleanups

12 years agodch: Add doctests for snapshot_version
Guido Günther [Tue, 27 Dec 2011 15:54:21 +0000 (16:54 +0100)]
dch: Add doctests for snapshot_version

12 years agodch: fix epydoc parameters
Guido Günther [Mon, 26 Dec 2011 15:55:05 +0000 (16:55 +0100)]
dch: fix epydoc parameters

12 years agoFix typo in clean target override
Guido Günther [Mon, 26 Dec 2011 15:46:43 +0000 (16:46 +0100)]
Fix typo in clean target override

12 years agodocs: add missing dependency to manpage generation
Guido Günther [Mon, 26 Dec 2011 15:42:34 +0000 (16:42 +0100)]
docs: add missing dependency to manpage generation

12 years agogbp-pq: add "switch" action
Guido Günther [Mon, 26 Dec 2011 12:45:08 +0000 (13:45 +0100)]
gbp-pq: add "switch" action

to quickly switch between patch-queue and base branch.

12 years agogbp-add-patch: simplify by using existing classes
Guido Günther [Sat, 24 Dec 2011 20:53:59 +0000 (21:53 +0100)]
gbp-add-patch: simplify by using existing classes

12 years agogbp.git.repository: add edit option to commit_staged
Guido Günther [Sat, 24 Dec 2011 20:53:27 +0000 (21:53 +0100)]
gbp.git.repository: add edit option to commit_staged

to allow editing the commit message.

12 years agoRename gbp.pq to gbp.patch_series
Guido Günther [Sat, 24 Dec 2011 13:16:49 +0000 (14:16 +0100)]
Rename gbp.pq to gbp.patch_series

since that's what it currently handles.

12 years agopq.Patch: move support for parsing patch headers into Patch class
Guido Günther [Sat, 24 Dec 2011 10:15:30 +0000 (11:15 +0100)]
pq.Patch: move support for parsing patch headers into Patch class

and add tests.

12 years agopq: rename PatchQueue to PatchSeries
Guido Günther [Sat, 24 Dec 2011 10:09:48 +0000 (11:09 +0100)]
pq: rename PatchQueue to PatchSeries

since this models a quilt patch series

12 years agoAdd --[no-]-pbuilder-autoconf
Guido Günther [Mon, 26 Dec 2011 11:13:49 +0000 (12:13 +0100)]
Add --[no-]-pbuilder-autoconf

to pass GIT_PBUILDER_AUTOCONF=no to git-pbuilder.

12 years agoUpdate git-pbuilder
Guido Günther [Mon, 26 Dec 2011 11:06:33 +0000 (12:06 +0100)]
Update git-pbuilder

Closes: #635061, #642355
Thanks: Russ Allbery

12 years agoscripts/pq: handle patches without filename extension
Guido Günther [Sun, 18 Dec 2011 12:41:13 +0000 (13:41 +0100)]
scripts/pq: handle patches without filename extension

Don't fail if patches don't have a proper patch header and filename
extensions (like in the heimdal package)

12 years agoscripts/pq: Move patch name handling to separate function
Guido Günther [Sun, 18 Dec 2011 12:40:25 +0000 (13:40 +0100)]
scripts/pq: Move patch name handling to separate function

and add tests

12 years agoDocument changes and release 0.6.0~git20111217 debian/0.6.0_git20111217
Guido Günther [Sat, 17 Dec 2011 12:29:19 +0000 (13:29 +0100)]
Document changes and release 0.6.0~git20111217

12 years agopq: add --force option to fore recreation of pq branch
Guido Günther [Mon, 5 Dec 2011 17:00:25 +0000 (18:00 +0100)]
pq: add --force option to fore recreation of pq branch

so one doesn't have to drop the old one first.

12 years agoMove GitRepository into separate submodule
Guido Günther [Sun, 4 Dec 2011 12:51:36 +0000 (13:51 +0100)]
Move GitRepository into separate submodule

12 years agoMove debian specific functions from GitRepository to DebianGitRepository
Guido Günther [Sun, 4 Dec 2011 12:24:00 +0000 (13:24 +0100)]
Move debian specific functions from GitRepository to DebianGitRepository