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

12 years agodocs: fix version string
Guido Günther [Mon, 5 Dec 2011 10:13:08 +0000 (11:13 +0100)]
docs: fix version string

12 years agoDocument changes and release 0.6.0~git20111202 debian/0.6.0_git20111202
Guido Günther [Fri, 2 Dec 2011 18:30:58 +0000 (19:30 +0100)]
Document changes and release 0.6.0~git20111202

12 years agoParse the changelog of the exported tree instead of the working copy
Guido Günther [Mon, 28 Nov 2011 21:23:53 +0000 (22:23 +0100)]
Parse the changelog of the exported tree instead of the working copy

when using --export. This reduces the number of options needed when
using an export dir since the correct tarball is now being created
without additional options.

Closes: #564791

12 years agoRemove unused module
Guido Günther [Tue, 29 Nov 2011 12:38:04 +0000 (13:38 +0100)]
Remove unused module

Git-Dch: Ignore

12 years agobuildpackage.py: move changelog fetching into function
Guido Günther [Sun, 27 Nov 2011 22:44:51 +0000 (23:44 +0100)]
buildpackage.py: move changelog fetching into function

12 years agoAdd ChangeLog class
Guido Günther [Fri, 25 Nov 2011 14:51:52 +0000 (15:51 +0100)]
Add ChangeLog class

making it easier to query versions. Add tests.

12 years agoAdditional documentation for postexport hook in the manual
Jan Čapek [Wed, 23 Nov 2011 13:44:40 +0000 (14:44 +0100)]
Additional documentation for postexport hook in the manual

- the documentation now provides sample postexport script and gbp.conf

Signed-off-by: Jan Čapek <jan.capek@braiins.cz>
Signed-off-by: Guido Günther <agx@sigxcpu.org>
12 years agoFix typos
Guido Günther [Wed, 23 Nov 2011 07:37:46 +0000 (08:37 +0100)]
Fix typos

13 years agobuildpackage: group functions needed for export-dir handling
Guido Günther [Tue, 22 Nov 2011 21:56:26 +0000 (22:56 +0100)]
buildpackage: group functions needed for export-dir handling

13 years agobuildpackage: move export of source tree into separate function
Guido Günther [Tue, 22 Nov 2011 21:51:21 +0000 (22:51 +0100)]
buildpackage: move export of source tree into separate function

13 years agoDocumentation update for --git-postexport, --git-postbuild typo fix
Jan Čapek [Fri, 9 Sep 2011 15:24:19 +0000 (17:24 +0200)]
Documentation update for --git-postexport, --git-postbuild typo fix

Signed-off-by: Jan Čapek <jan.capek@braiins.cz>
Signed-off-by: Guido Günther <agx@sigxcpu.org>
13 years agoSupport postexport hooks
Guido Günther [Tue, 22 Nov 2011 19:58:01 +0000 (20:58 +0100)]
Support postexport hooks

Heavily based on a patch by Jan Čapek

Closes: #640982

13 years agoMove debian related helpers into submodule
Guido Günther [Tue, 22 Nov 2011 15:49:30 +0000 (16:49 +0100)]
Move debian related helpers into submodule

13 years agobuildpackage: move tarball preparation into separate function
Guido Günther [Tue, 22 Nov 2011 15:45:40 +0000 (16:45 +0100)]
buildpackage: move tarball preparation into separate function

13 years agoUse GitArgs in GitRepository.{create,delete}_branch()
Guido Günther [Mon, 21 Nov 2011 22:11:27 +0000 (23:11 +0100)]
Use GitArgs in GitRepository.{create,delete}_branch()

13 years agoUse GitArgs in GitRepository.clone()
Guido Günther [Mon, 21 Nov 2011 22:08:07 +0000 (23:08 +0100)]
Use GitArgs in GitRepository.clone()

13 years agogbp-pq: Instead of looking for the signature don't let git generate it
Guido Günther [Mon, 21 Nov 2011 21:42:58 +0000 (22:42 +0100)]
gbp-pq: Instead of looking for the signature don't let git generate it

Thanks: Robert Luberda

13 years agoGitRepository: add signature option to format_patch
Guido Günther [Mon, 21 Nov 2011 21:42:31 +0000 (22:42 +0100)]
GitRepository: add signature option to format_patch

13 years agoAdd class to simplify git argument handling
Guido Günther [Mon, 21 Nov 2011 21:42:08 +0000 (22:42 +0100)]
Add class to simplify git argument handling

13 years agoFastImport: add test and cleanup api a bit
Guido Günther [Sun, 20 Nov 2011 13:10:41 +0000 (14:10 +0100)]
FastImport: add test and cleanup api a bit

13 years agoGitRepository: Return GitModifier from get_author_info
Guido Günther [Sun, 20 Nov 2011 16:53:46 +0000 (17:53 +0100)]
GitRepository: Return GitModifier from get_author_info

13 years agoMove FastImport to separate file
Guido Günther [Sun, 20 Nov 2011 12:58:14 +0000 (13:58 +0100)]
Move FastImport to separate file

13 years agoMove GitCommit class into separate file
Guido Günther [Tue, 15 Nov 2011 18:59:13 +0000 (19:59 +0100)]
Move GitCommit class into separate file

13 years agoMove GitModifier class to separate file
Guido Günther [Tue, 15 Nov 2011 18:30:03 +0000 (19:30 +0100)]
Move GitModifier class to separate file

and introduce a new base exception for Git related errors.

13 years agoMove git code into submodule
Guido Günther [Mon, 14 Nov 2011 18:54:12 +0000 (19:54 +0100)]
Move git code into submodule

13 years agoGitRepository: add auto_name option to clone()
Guido Günther [Mon, 31 Oct 2011 10:14:55 +0000 (11:14 +0100)]
GitRepository: add auto_name option to clone()

so we can specify the exact name of a clone.

13 years agoGitRepository: add checkout() to checkout a treeish
Guido Günther [Mon, 7 Nov 2011 16:54:36 +0000 (17:54 +0100)]
GitRepository: add checkout() to checkout a treeish

13 years agoGitRepository: fetch and pull quietly
Guido Günther [Mon, 7 Nov 2011 16:37:54 +0000 (17:37 +0100)]
GitRepository: fetch and pull quietly

13 years agoGitRepository: handle case when not on any branch
Guido Günther [Mon, 7 Nov 2011 16:37:01 +0000 (17:37 +0100)]
GitRepository: handle case when not on any branch

13 years agoMove gbp/version.py generation into setup.py
Guido Günther [Mon, 7 Nov 2011 15:05:20 +0000 (16:05 +0100)]
Move gbp/version.py generation into setup.py

This allows us to build on non Debian systems with setup.py only.

13 years agoUpdate .gitignore
Guido Günther [Sun, 6 Nov 2011 18:40:57 +0000 (19:40 +0100)]
Update .gitignore

13 years agoSwitch to dh
Guido Günther [Sun, 6 Nov 2011 17:50:08 +0000 (18:50 +0100)]
Switch to dh

13 years agoMove doc generation to separate Makefile
Guido Günther [Sun, 6 Nov 2011 17:29:19 +0000 (18:29 +0100)]
Move doc generation to separate Makefile

13 years agoGitRepository.tag(): Always add the '-s' flag
Guido Günther [Wed, 2 Nov 2011 11:43:55 +0000 (12:43 +0100)]
GitRepository.tag(): Always add the '-s' flag

when signing tags.

13 years agogbp-pull: massive speedup by just updating the ref
Guido Günther [Sun, 6 Nov 2011 15:47:01 +0000 (16:47 +0100)]
gbp-pull: massive speedup by just updating the ref

to the remote's SHA1 instead of checking out the branch and doing a
fast-forward merge.

13 years agoGitRepository: fix fetch invocation without repo
Guido Günther [Mon, 31 Oct 2011 10:30:56 +0000 (11:30 +0100)]
GitRepository: fix fetch invocation without repo

13 years agodebian/rules: invoke pychecker on submodules too
Guido Günther [Sun, 6 Nov 2011 15:12:15 +0000 (16:12 +0100)]
debian/rules: invoke pychecker on submodules too

13 years agoFastImport: robustify exception handling
Guido Günther [Sun, 6 Nov 2011 15:11:25 +0000 (16:11 +0100)]
FastImport: robustify exception handling

13 years agoConfigure epydoc via setup.cfg
Guido Günther [Wed, 2 Nov 2011 11:56:58 +0000 (12:56 +0100)]
Configure epydoc via setup.cfg

13 years agoUse setuptools to run the tests
Guido Günther [Wed, 2 Nov 2011 09:35:58 +0000 (10:35 +0100)]
Use setuptools to run the tests

13 years agogbp-pq: don't claim we're uptodate
Guido Günther [Fri, 4 Nov 2011 12:18:37 +0000 (13:18 +0100)]
gbp-pq: don't claim we're uptodate

if 'rebase' is invoked from the pq branch.

13 years agoUse import_dsc as a module
Guido Günther [Tue, 1 Nov 2011 17:24:25 +0000 (18:24 +0100)]
Use import_dsc as a module

No need to spawn an external command here.

13 years agoGet rid of the symlink
Guido Günther [Sun, 30 Oct 2011 19:03:33 +0000 (20:03 +0100)]
Get rid of the symlink

by moving the commands to gbp/scripts/

13 years agoAllow to import Debian packages into bare repositories
Guido Günther [Sun, 30 Oct 2011 15:16:09 +0000 (16:16 +0100)]
Allow to import Debian packages into bare repositories

13 years agoAllow to import upstream tarballs into bare repositories
Guido Günther [Sun, 30 Oct 2011 12:51:22 +0000 (13:51 +0100)]
Allow to import upstream tarballs into bare repositories

Closes: #582775

13 years agoGitRepository: Use update-ref to force a branch's head in bare repos
Guido Günther [Sun, 30 Oct 2011 13:25:43 +0000 (14:25 +0100)]
GitRepository: Use update-ref to force a branch's head in bare repos

13 years agoGitRepository: handle bare repos and errors in is_clean()
Guido Günther [Sat, 29 Oct 2011 14:08:47 +0000 (16:08 +0200)]
GitRepository: handle bare repos and errors in is_clean()

13 years agoGitRepository: Simplify error status handling
Guido Günther [Sat, 29 Oct 2011 14:06:20 +0000 (16:06 +0200)]
GitRepository: Simplify error status handling

Git-Dch: Ignore

13 years agoFail on epydoc warnings
Guido Günther [Sat, 29 Oct 2011 10:07:11 +0000 (12:07 +0200)]
Fail on epydoc warnings

13 years agoFix epydoc warnings
Guido Günther [Sat, 29 Oct 2011 10:06:52 +0000 (12:06 +0200)]
Fix epydoc warnings