tools/git-buildpackage.git
13 years agocommand_wrappers,git: remove unused Git functions
Guido Günther [Fri, 18 Mar 2011 10:49:09 +0000 (11:49 +0100)]
command_wrappers,git: remove unused Git functions

The rest will be moved into gbp.git.

Git-Dch: Ignore

13 years agogbp-pq: Allow to specify subdirs for patches
Guido Günther [Fri, 11 Mar 2011 17:08:58 +0000 (18:08 +0100)]
gbp-pq: Allow to specify subdirs for patches

via the "Gbp-Pq-Tag: <subdir>" directive in the patch header. This also
gets rid sed callouts.

Add "apply" action to apply single patches

13 years agogit: improve error handling for commit_tree
Guido Günther [Fri, 11 Mar 2011 21:18:27 +0000 (22:18 +0100)]
git: improve error handling for commit_tree

Git-Dch: Ignore

13 years agogbp-pq: move write_patches into separate function
Guido Günther [Thu, 3 Mar 2011 08:38:39 +0000 (09:38 +0100)]
gbp-pq: move write_patches into separate function

Git-Dch: Ignore

13 years agois_fast_forward: make sure git interprets arguments as revisions
Guido Günther [Thu, 3 Mar 2011 07:10:16 +0000 (08:10 +0100)]
is_fast_forward: make sure git interprets arguments as revisions

so git prints a clearer error message on configuration errors in
.git/config

13 years agoAdd script to ignore .pc and tell dpkg-source unpatch the source
Guido Günther [Sun, 27 Feb 2011 14:05:02 +0000 (15:05 +0100)]
Add script to ignore .pc and tell dpkg-source unpatch the source

See #591858.

13 years agoMake the desktop notification transient
Guido Günther [Sun, 13 Feb 2011 11:33:36 +0000 (12:33 +0100)]
Make the desktop notification transient

so they timeout and don't clutter the notification area.

13 years agoDocument changes and release 0.5.19 debian/0.5.19
Guido Günther [Fri, 11 Feb 2011 17:20:40 +0000 (18:20 +0100)]
Document changes and release 0.5.19

13 years agogit-import-dsc: better explain missing upstream branch
Guido Günther [Wed, 9 Feb 2011 22:36:46 +0000 (16:36 -0600)]
git-import-dsc: better explain missing upstream branch

Thanks: Jonathan Nieder for the suggestion.

13 years agoMove no_upstream_branch message into gbp.config
Guido Günther [Fri, 11 Feb 2011 17:03:43 +0000 (18:03 +0100)]
Move no_upstream_branch message into gbp.config

Git-Dch: Ignore

13 years agogit-import-dsc: make final log message more useful
Guido Günther [Wed, 9 Feb 2011 22:03:04 +0000 (23:03 +0100)]
git-import-dsc: make final log message more useful

Git-Dch: Ignore

13 years agogit-import-dsc: auto create upstream branch
Guido Günther [Wed, 9 Feb 2011 21:50:59 +0000 (22:50 +0100)]
git-import-dsc: auto create upstream branch

if it's missing. This allows to mass import old history of packages that
were native and switched to non-native later.

Closes: #610379

13 years agogit-import-dscs: really use git-import-dsc from the same location as git-import-dscs
Guido Günther [Wed, 9 Feb 2011 21:49:35 +0000 (22:49 +0100)]
git-import-dscs: really use git-import-dsc from the same location as git-import-dscs

13 years agoSimplify author and committer argument passing
Guido Günther [Wed, 9 Feb 2011 20:19:23 +0000 (21:19 +0100)]
Simplify author and committer argument passing

to reduce the number of function arguments.

Git-Dch: Ignore

13 years agoSplit out command line parsing
Guido Günther [Sun, 6 Feb 2011 16:36:14 +0000 (17:36 +0100)]
Split out command line parsing

to honor pycheckers sensible request for smaller functions.

Git-Dch: Ignore

13 years agogbp-clone: reparse the configuration after cloning the repository
Guido Günther [Wed, 9 Feb 2011 19:13:20 +0000 (20:13 +0100)]
gbp-clone: reparse the configuration after cloning the repository

Closes: #607936

13 years agologging: don't use color inside Emacs's comint shell
Guido Günther [Tue, 8 Feb 2011 07:29:01 +0000 (08:29 +0100)]
logging: don't use color inside Emacs's comint shell

Closes: #612384

13 years agogit-import-dsc: improve error message when upstream branch is missing
Jonathan Nieder [Tue, 18 Jan 2011 04:01:46 +0000 (22:01 -0600)]
git-import-dsc: improve error message when upstream branch is missing

13 years agoDocument changes and release 0.5.18 debian/0.5.18
Guido Günther [Sun, 23 Jan 2011 13:55:57 +0000 (14:55 +0100)]
Document changes and release 0.5.18

13 years agogit-import-dsc doc updates for new options
Jonathan Nieder [Sat, 22 Jan 2011 22:26:20 +0000 (16:26 -0600)]
git-import-dsc doc updates for new options

--author-is-committer and --author-date-is-committer-date

13 years agopychecker: bump maxargs to 12 for commit_dir
Guido Günther [Sat, 22 Jan 2011 14:34:35 +0000 (15:34 +0100)]
pychecker: bump maxargs to 12 for commit_dir

Git-Dch: Ignore

13 years agoAdd --author-is-comitter and --author-date-is-comitter-date commandline options
Guido Günther [Wed, 19 Jan 2011 17:59:45 +0000 (18:59 +0100)]
Add --author-is-comitter and --author-date-is-comitter-date commandline options

Closes: #610381

13 years agogit.force_head: quiet git reset
Guido Günther [Sat, 22 Jan 2011 14:25:00 +0000 (15:25 +0100)]
git.force_head: quiet git reset

so we don't see pointless 'HEAD is now at ...' messages during imports.

13 years agogit-buildpackage: print the "Looking for tarball..." message at debug level
Guido Günther [Sat, 22 Jan 2011 12:42:19 +0000 (13:42 +0100)]
git-buildpackage: print the "Looking for tarball..." message at debug level

There's no need to print two messages in the default logging level.

13 years agogit-import-dscs: Ignore debsnap download errors
Guido Günther [Tue, 18 Jan 2011 18:25:35 +0000 (19:25 +0100)]
git-import-dscs: Ignore debsnap download errors

to cope with binNMUs. Based on a patch from Jonathan Nieder.

Closes: #610376

13 years agogit-import-dscs: Fix --debsnap doc and option error handling
Jonathan Nieder [Tue, 18 Jan 2011 01:17:56 +0000 (19:17 -0600)]
git-import-dscs: Fix --debsnap doc and option error handling

Signed-off-by: Guido Günther <agx@sigxcpu.org>
Closes: #610376

13 years agogbp-pull: Adjust incorrect logging level
Guido Günther [Sun, 16 Jan 2011 17:21:40 +0000 (18:21 +0100)]
gbp-pull: Adjust incorrect logging level

13 years agogit-buildpackage: fix fallback to auto detection for unknown compression types
Guido Günther [Sat, 15 Jan 2011 14:38:47 +0000 (15:38 +0100)]
git-buildpackage: fix fallback to auto detection for unknown compression types

13 years agoDocument changes and release 0.5.17 debian/0.5.17
Guido Günther [Sat, 15 Jan 2011 12:49:07 +0000 (13:49 +0100)]
Document changes and release 0.5.17

13 years agoUse the latest commit instead of the earliest one
Guido Günther [Fri, 14 Jan 2011 16:22:36 +0000 (17:22 +0100)]
Use the latest commit instead of the earliest one

when guessing the compression type for pristine-tar.

Closes; #609980
Thanks: Andreas Rottmann for the detailed report

13 years agoDocument --remote-name
Guido Günther [Thu, 13 Jan 2011 20:34:59 +0000 (21:34 +0100)]
Document --remote-name

13 years agogit-create-remote-repo: Don't hardcode 'origin' as remote
Guido Günther [Thu, 13 Jan 2011 20:34:59 +0000 (21:34 +0100)]
git-create-remote-repo: Don't hardcode 'origin' as remote

This makes it possible to create different remote repos from within the
same repository.

13 years agoRename get_remotes to get_remote_branches
Guido Günther [Thu, 13 Jan 2011 20:12:58 +0000 (21:12 +0100)]
Rename get_remotes to get_remote_branches

Git-Dch: Ignore

13 years agogbp-create-remote-repo: get repository name from debian/changelog
Guido Günther [Thu, 13 Jan 2011 19:52:55 +0000 (20:52 +0100)]
gbp-create-remote-repo: get repository name from debian/changelog

if possible.

13 years agogbp-create-remote-repo: Allow for repository names without substitutions
Guido Günther [Thu, 13 Jan 2011 18:38:28 +0000 (19:38 +0100)]
gbp-create-remote-repo: Allow for repository names without substitutions

13 years agoDocument changes and release 0.5.16 debian/0.5.16
Guido Günther [Tue, 11 Jan 2011 06:48:26 +0000 (07:48 +0100)]
Document changes and release 0.5.16

13 years agogit-import-dsc: also set the commit date to the changelog date
Guido Günther [Tue, 11 Jan 2011 06:27:15 +0000 (07:27 +0100)]
git-import-dsc: also set the commit date to the changelog date

when importing old history. This makes sure we get proper sorting with
e.g. gitk.

Thanks: Rob Browning for the hint and explanation

13 years agoMake gbp-create-remote-repo a first class citizen
Guido Günther [Mon, 10 Jan 2011 15:09:05 +0000 (16:09 +0100)]
Make gbp-create-remote-repo a first class citizen

Add manpage, move into path, add bash completion

13 years agogbp-create-remote-repo: allow to set up remote branch tracking
Guido Günther [Mon, 10 Jan 2011 14:53:52 +0000 (15:53 +0100)]
gbp-create-remote-repo: allow to set up remote branch tracking

13 years agoMake --[no-]merge a proper option
Guido Günther [Mon, 10 Jan 2011 14:17:21 +0000 (15:17 +0100)]
Make --[no-]merge a proper option

so it can be configured via gbp.conf.

13 years agoDocument changes and release 0.5.15 debian/0.5.15
Guido Günther [Sat, 8 Jan 2011 18:10:20 +0000 (19:10 +0100)]
Document changes and release 0.5.15

13 years agogit-dch: don't add empty changelog entries with "Git-Dch: Ignore"
Guido Günther [Sat, 8 Jan 2011 17:18:28 +0000 (18:18 +0100)]
git-dch: don't add empty changelog entries with "Git-Dch: Ignore"

13 years agoRequire python 2.6
Guido Günther [Sat, 8 Jan 2011 14:36:20 +0000 (15:36 +0100)]
Require python 2.6

since we use a context manager

13 years agogit-buildpackage: Add support for sending notifications via libnotify
Guido Günther [Sat, 8 Jan 2011 13:27:33 +0000 (14:27 +0100)]
git-buildpackage: Add support for sending notifications via libnotify

after the build finished.

13 years agoUse tristate option for --color=value
Guido Günther [Sat, 8 Jan 2011 12:36:21 +0000 (13:36 +0100)]
Use tristate option for --color=value

this allows true and false as alias for on and off.

13 years agoAdd Tristate class that allows for on, off and auto
Guido Günther [Sat, 8 Jan 2011 12:33:31 +0000 (13:33 +0100)]
Add Tristate class that allows for on, off and auto

Git-Dch: Ignore

13 years agoDocument changes and release 0.5.14 debian/0.5.14
Guido Günther [Fri, 7 Jan 2011 08:59:16 +0000 (09:59 +0100)]
Document changes and release 0.5.14

13 years agodocs: fix typo in gbp-pq manpage
Guido Günther [Fri, 7 Jan 2011 08:55:20 +0000 (09:55 +0100)]
docs: fix typo in gbp-pq manpage

Closes: #609166
Thanks: Emilio Pozuelo

13 years agobash completion: avoid space after options taking an argument
Guido Günther [Fri, 7 Jan 2011 08:54:10 +0000 (09:54 +0100)]
bash completion: avoid space after options taking an argument

This makes branch and tag completion more useful.

13 years agobash completion: add support for tristate options like --color
Guido Günther [Thu, 6 Jan 2011 19:35:15 +0000 (20:35 +0100)]
bash completion: add support for tristate options like --color

13 years agobash completion: add completion for gbp-{pq,pull,clone}
Guido Günther [Sun, 2 Jan 2011 10:32:25 +0000 (11:32 +0100)]
bash completion: add completion for gbp-{pq,pull,clone}

13 years agobash completion: also complete on tags
Guido Günther [Mon, 3 Jan 2011 21:47:30 +0000 (22:47 +0100)]
bash completion: also complete on tags

13 years agobash completion: parse short options too
Guido Günther [Mon, 3 Jan 2011 21:46:09 +0000 (22:46 +0100)]
bash completion: parse short options too

13 years agoUse logging functions
Guido Günther [Wed, 29 Dec 2010 19:49:03 +0000 (20:49 +0100)]
Use logging functions

13 years agoSpit out debug message in __git_inout
Yaroslav Halchenko [Tue, 28 Dec 2010 19:38:15 +0000 (14:38 -0500)]
Spit out debug message in __git_inout

Signed-off-by: Guido Günther <agx@sigxcpu.org>
13 years agogit-import-dscs: Use git-import-dsc from the same location as git-import-dscs
Yaroslav Halchenko [Tue, 28 Dec 2010 19:13:21 +0000 (14:13 -0500)]
git-import-dscs: Use git-import-dsc from the same location as git-import-dscs

With hardcoded path it is impossible to use git-import-dscs directly
from the repository while developing both tools

Signed-off-by: Guido Günther <agx@sigxcpu.org>
13 years agoRemove duplicate log message
Guido Günther [Tue, 28 Dec 2010 11:35:43 +0000 (12:35 +0100)]
Remove duplicate log message

13 years agoEnable pychecker warnings
Guido Günther [Mon, 27 Dec 2010 22:43:05 +0000 (23:43 +0100)]
Enable pychecker warnings

13 years agoChange dirs declaration to avoid false positives from pychecker
Guido Günther [Mon, 27 Dec 2010 22:32:49 +0000 (23:32 +0100)]
Change dirs declaration to avoid false positives from pychecker

See #608153

13 years agopychecker warning cleanups
Guido Günther [Sun, 26 Dec 2010 21:07:28 +0000 (22:07 +0100)]
pychecker warning cleanups

(mostly unused variables and imports)

13 years agoDocument --debsnap to fetch from snapshots.debian.org
Guido Günther [Mon, 27 Dec 2010 23:14:35 +0000 (00:14 +0100)]
Document --debsnap to fetch from snapshots.debian.org

13 years agoAdd generated files to .gitignore
Guido Günther [Mon, 27 Dec 2010 21:06:47 +0000 (22:06 +0100)]
Add generated files to .gitignore

13 years agoAdd gbp-{pull,clone,pq} examples to gbp.conf
Guido Günther [Mon, 27 Dec 2010 20:57:09 +0000 (21:57 +0100)]
Add gbp-{pull,clone,pq} examples to gbp.conf

Git-Dch: Ignore

13 years agoAdd gbp-{pull,clone,pq} examples to gbp.conf
Guido Günther [Mon, 27 Dec 2010 20:57:09 +0000 (21:57 +0100)]
Add gbp-{pull,clone,pq} examples to gbp.conf

13 years agogbp-pull: Better document --force and --redo-pq
Guido Günther [Mon, 27 Dec 2010 20:42:55 +0000 (21:42 +0100)]
gbp-pull: Better document --force and --redo-pq

13 years agogbp-clone: better document --all
Guido Günther [Mon, 27 Dec 2010 20:38:15 +0000 (21:38 +0100)]
gbp-clone: better document --all

13 years agoDocument changes and release 0.5.13 debian/0.5.13
Guido Günther [Sun, 26 Dec 2010 23:05:48 +0000 (00:05 +0100)]
Document changes and release 0.5.13

13 years agoAllow to drop numbers from patch names via --no-patch-numbers
Guido Günther [Sun, 26 Dec 2010 22:31:57 +0000 (23:31 +0100)]
Allow to drop numbers from patch names via --no-patch-numbers

so patch names remain constant when interim patches are dropped.

Closes: #592129

13 years agoRewrite gbp-pq in python
Guido Günther [Sun, 26 Dec 2010 18:25:53 +0000 (19:25 +0100)]
Rewrite gbp-pq in python

so we get consistent logging and debugging options.

13 years agoInitialize Logger.get_color{,off}
Guido Günther [Sat, 25 Dec 2010 22:54:14 +0000 (23:54 +0100)]
Initialize Logger.get_color{,off}

so we can print errors before the option parsing finished.

Closes: #608004

13 years agoTypo
Guido Günther [Sat, 25 Dec 2010 22:48:56 +0000 (23:48 +0100)]
Typo

Git-Dch: Ignore

13 years agoUpdate the repo after the first import
Guido Günther [Thu, 23 Dec 2010 21:14:20 +0000 (22:14 +0100)]
Update the repo after the first import

so master matches the debian branch.

Thanks: Rob Browning for the testcase

13 years agoDocument changes and release 0.5.12 debian/0.5.12
Guido Günther [Mon, 20 Dec 2010 15:35:04 +0000 (16:35 +0100)]
Document changes and release 0.5.12

13 years agoAdd missing options
Guido Günther [Mon, 20 Dec 2010 14:56:23 +0000 (15:56 +0100)]
Add missing options

Git-Dch: ignore

13 years agoAdd option to open editor
Guido Günther [Mon, 20 Dec 2010 14:51:22 +0000 (15:51 +0100)]
Add option to open editor

Closes: #565553

13 years agoChange --ignore-same-version to --allow-same-version
Guido Günther [Mon, 20 Dec 2010 09:55:46 +0000 (10:55 +0100)]
Change --ignore-same-version to --allow-same-version

and properly document it. This matches the defaults we had since ages.

13 years agoFavor ARCH environment variable over dpkg's architecture
Guido Günther [Fri, 17 Dec 2010 18:44:05 +0000 (19:44 +0100)]
Favor ARCH environment variable over dpkg's architecture

based on a patch by Jacob Helwig.
Closes: #607318

13 years agoRemove noop
Guido Günther [Mon, 13 Dec 2010 13:05:05 +0000 (14:05 +0100)]
Remove noop

Git-Dch: Ignore

13 years agoFix debug string formatting
Guido Günther [Mon, 13 Dec 2010 08:06:56 +0000 (09:06 +0100)]
Fix debug string formatting

Closes: #606771

13 years agoFix error detected by pychecker
Guido Günther [Fri, 10 Dec 2010 17:16:42 +0000 (18:16 +0100)]
Fix error detected by pychecker

Git-Dch: ignore

13 years agoMove Debian tag with --ignore-same-version
Guido Günther [Fri, 10 Dec 2010 17:12:22 +0000 (18:12 +0100)]
Move Debian tag with --ignore-same-version

so the import doesn't fail.

Closes: #606204

13 years agoAdd move_tag
Guido Günther [Fri, 10 Dec 2010 17:09:16 +0000 (18:09 +0100)]
Add move_tag

Git-Dch: ignore

13 years agoFix --ignore-same-version
Guido Günther [Fri, 10 Dec 2010 16:47:28 +0000 (17:47 +0100)]
Fix --ignore-same-version

13 years agoIntroduce functions
Guido Günther [Wed, 8 Dec 2010 09:32:35 +0000 (10:32 +0100)]
Introduce functions

to self document the code a bit

13 years agoAdd --multimaint support to git-dch
Rob Browning [Wed, 8 Dec 2010 09:26:31 +0000 (10:26 +0100)]
Add --multimaint support to git-dch

13 years agoBetter wrap thanks and closes
Guido Günther [Tue, 7 Dec 2010 11:53:14 +0000 (12:53 +0100)]
Better wrap thanks and closes

Closes: #529332

13 years agoDrop debugging print statement
Guido Günther [Tue, 7 Dec 2010 11:50:30 +0000 (12:50 +0100)]
Drop debugging print statement

13 years agogit-dch: fix --id-length != 0
Guido Günther [Mon, 6 Dec 2010 08:17:27 +0000 (09:17 +0100)]
git-dch: fix --id-length != 0

Git-Dch: Ignore

13 years agoAdd git-dch --customizations FILE to allow changelog entry customization
Rob Browning [Mon, 6 Dec 2010 07:30:22 +0000 (08:30 +0100)]
Add git-dch --customizations FILE to allow changelog entry customization

Add support for git-dch --customizations FILE. FILE must be Python
code, and for now, the only useful thing it can do is define a
format_changelog_entry() function which will override
gbp.dch.format_changelog_entry().

Add a new customization option group for --customizations.

Create a gbp.dch module and move the changelog entry formatting
functions there.  Create separate procedures to handle extracting
metadata from the git log, and use them in the default
format_changelog_entry().  These functions are also available for use
by custom formatters: extract_git_dch_cmds(),
filter_ignore_rx_matches(), extract_bts_cmds(), extract_thanks_info(),
etc.

Add a GitRepository.get_commit_info() method, and use it in git-dch
parse_commit().

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
13 years agoAdd "*.pyc" to .gitignore.
Rob Browning [Sun, 5 Dec 2010 18:46:41 +0000 (12:46 -0600)]
Add "*.pyc" to .gitignore.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
13 years agoUse "log -n1" instead of "show" to retrieve commit log information.
Rob Browning [Sun, 5 Dec 2010 18:46:40 +0000 (12:46 -0600)]
Use "log -n1" instead of "show" to retrieve commit log information.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
13 years agoRemove unused commit_msg variable from git-dch.
Rob Browning [Sun, 5 Dec 2010 18:46:38 +0000 (12:46 -0600)]
Remove unused commit_msg variable from git-dch.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
13 years agoFix off by one error by not counting
Guido Günther [Fri, 3 Dec 2010 17:19:30 +0000 (18:19 +0100)]
Fix off by one error by not counting

Thanks: Olivier Aubert for pointing this out

13 years agoAlso allow for 'issue' as bugnumber prefix
Guido Günther [Thu, 25 Nov 2010 10:55:24 +0000 (11:55 +0100)]
Also allow for 'issue' as bugnumber prefix

as used in Grml.

13 years agoDocument changes and release 0.5.11 debian/0.5.11
Guido Günther [Tue, 16 Nov 2010 12:31:44 +0000 (13:31 +0100)]
Document changes and release 0.5.11

13 years agoAdd logging functions
Guido Günther [Fri, 3 Sep 2010 11:07:10 +0000 (13:07 +0200)]
Add logging functions

This allows us to color and prefix the output.

Closes: #544332

13 years agoFix download location
Guido Günther [Mon, 8 Nov 2010 08:33:30 +0000 (09:33 +0100)]
Fix download location

Thanks: Rob Browning

13 years agoExpand environment variables and '~' in gbp.conf paths
Benoît Knecht [Tue, 26 Oct 2010 14:11:36 +0000 (16:11 +0200)]
Expand environment variables and '~' in gbp.conf paths

Options that expect a path in gbp.conf can now be given as
'~/path/to/dir' or '$HOME/path/to/dir' (or any other environment
variable for that matter).

Closes: #545692

13 years agoDon't put generated gbp/gbp_version.py into the source package
Guido Günther [Thu, 14 Oct 2010 20:48:42 +0000 (22:48 +0200)]
Don't put generated gbp/gbp_version.py into the source package

13 years agoMerge branch 'master' into experimental
Guido Günther [Thu, 7 Oct 2010 07:27:21 +0000 (09:27 +0200)]
Merge branch 'master' into experimental