Guido Günther [Wed, 19 Sep 2012 20:28:56 +0000 (22:28 +0200)]
PEP-8 and pyflakes cleanups
Guido Günther [Sun, 26 Aug 2012 15:57:07 +0000 (17:57 +0200)]
Add debian/source/format parser
Guido Günther [Wed, 22 Aug 2012 08:59:24 +0000 (10:59 +0200)]
Document changes and release 0.6.0~git20120822
Markus Lehtonen [Fri, 6 Jul 2012 13:25:37 +0000 (16:25 +0300)]
GitArgs/add: support iterable and non-string args
Support giving iterables (other than basestring, e.g. list(s)) as an
argument to GitArgs.add(). Also, add support non-iterable arguments that
support the str() conversion.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Ed Bartosh [Fri, 3 Aug 2012 13:20:28 +0000 (16:20 +0300)]
GitRepository: Implement set_upstream_branch and get_upstream_branch methods
set_upstream_branch sets upstream branch for the local branch using
git branch --set-upstream
get_upstream_branch returns info about upstream branches
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Guido Günther [Wed, 22 Aug 2012 08:31:43 +0000 (10:31 +0200)]
manpages: correct manual section and remove duplicate entry
Markus Lehtonen [Tue, 14 Aug 2012 08:05:57 +0000 (11:05 +0300)]
docs: make refentry ids of manpages more consistent
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 14 Aug 2012 08:03:22 +0000 (11:03 +0300)]
docs: fix cross-referencing in manpages
Docbook2man has to be run twice to make sure the cross-references are
correct. First pass is just to update the cross-reference file
(manpage.refs). The second the builds the actual manpages. Otherwise
forward-references might be broken.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Zhang Qiang [Wed, 1 Aug 2012 06:14:20 +0000 (14:14 +0800)]
GitRepository/branch_contains: remove prefix '*' in branch name
The git output always prefixes the current branch name with '*'. Without
this fix branch_contains() always fails for the currently active branch.
Signed-off-by: Zhang Qiang <qiang.z.zhang@intel.com>
Guido Günther [Sat, 18 Aug 2012 16:43:00 +0000 (18:43 +0200)]
manpage: Fix typo in git-dch's multimain-merge option
Closes: #684322
Guido Günther [Mon, 13 Aug 2012 06:36:39 +0000 (08:36 +0200)]
dch: Fix error reporting on parsing errors
Guido Günther [Fri, 3 Aug 2012 17:29:00 +0000 (19:29 +0200)]
Document changes and release 0.6.0~git20120803
Guido Günther [Thu, 2 Aug 2012 16:50:11 +0000 (18:50 +0200)]
Improve error reporting from uscan
by parsing out the warnings and error fields from the dehs output.
Guido Günther [Thu, 2 Aug 2012 09:27:22 +0000 (11:27 +0200)]
Move uscan to separate class
Guido Günther [Thu, 2 Aug 2012 08:03:06 +0000 (10:03 +0200)]
Add tests for gbp.deb.{DpkgCompareVersions,DscFile}
Guido Günther [Thu, 2 Aug 2012 07:57:21 +0000 (09:57 +0200)]
gbp.command_wrappers: Reformat to 80 chars line length
Guido Günther [Wed, 1 Aug 2012 13:28:27 +0000 (15:28 +0200)]
Test help output by importing the modules
so we get correct coverage information for the scripts
Guido Günther [Wed, 1 Aug 2012 12:45:33 +0000 (14:45 +0200)]
Skip tests requiring devscripts if dch is not there
so tests don't fail on rpm based systems.
Daniel Dehennin [Thu, 31 May 2012 08:17:52 +0000 (10:17 +0200)]
Test behavior of gbp.scripts.dch.main().
* tests/11_test_dch_main.py: Test common cases with "--release" and
"--snapshot". Try 2 consecutive snapshots to check for merged entries.
Guido Günther [Tue, 31 Jul 2012 14:28:32 +0000 (16:28 +0200)]
Remove multiple spaces
Guido Günther [Sun, 29 Jul 2012 19:31:08 +0000 (21:31 +0200)]
GitModifier: add tests for dict interface
Guido Günther [Sun, 29 Jul 2012 07:12:04 +0000 (09:12 +0200)]
GitModifier: use __getitem__ to fetch date
instead of accessing __dict__ directly which only has _date.
Guido Günther [Tue, 3 Jul 2012 08:48:21 +0000 (11:48 +0300)]
GitRepository: raise GitRepositoryError on git errors
Raise GitRepositoryError in cases where CommandExecFailed (from
GitCommand) was previously silently passed forward.
Heavily based on a patch by Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 19 Jun 2012 06:09:11 +0000 (09:09 +0300)]
GitRepository/get_commit_info: add file status
Add file status and name to the info returned by the get_commit_info()
method.
Signed-off-by: Zhang Qiang <qiang.z.zhang@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 2 Jul 2012 08:21:03 +0000 (11:21 +0300)]
GitRepository/get_commit_info: add committer info
Add committer to the info returned by get_commit_info() method. Returns
committer name, email and timestamp as a GitModifier object.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 31 May 2012 07:20:36 +0000 (10:20 +0300)]
GitRepository/get_commit_info: add author timestamp
Add author timestamps to the info returned by get_commit_info() method.
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Tue, 3 Jul 2012 19:47:54 +0000 (21:47 +0200)]
GitModifier: More flexible date handling
Allow to pass in the date as datetime object, timestamp or git raw date.
and allow to retrieve these values. This make constructing GitModifiers
from python simpler.
Guido Günther [Fri, 27 Jul 2012 10:52:31 +0000 (12:52 +0200)]
Fix variable renaming
Markus Lehtonen [Wed, 30 May 2012 06:06:59 +0000 (09:06 +0300)]
GitRepository: option to ignore untracked in is_clean()
Add an option to ignore untracked files when checking if the repository
is clean.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 4 Jul 2012 09:48:54 +0000 (12:48 +0300)]
GitRepository/get_author_info: return user.name as name
Return users full name (user.name) instead of email (user.email) as the
'name' of the author when taking the value from git config.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Mon, 23 Jul 2012 11:11:35 +0000 (11:11 +0000)]
gbp.git.GitRepository: Add remove_remote
Guido Günther [Mon, 23 Jul 2012 11:11:33 +0000 (11:11 +0000)]
git.repository.GitRepository.add_remote_repo: use GitArgs
Guido Günther [Tue, 3 Jul 2012 19:49:05 +0000 (21:49 +0200)]
GitRepository: Make rev_parse's short option an int everywhere
Markus Lehtonen [Tue, 3 Jul 2012 07:06:54 +0000 (10:06 +0300)]
GitRepository/rev_parse: add new argument 'short'
Adds a new argument to get abbreviated SHA1.
Also, modifies rev_parse() to use GitArgs class.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 2 Jul 2012 08:59:33 +0000 (11:59 +0300)]
GitRepository/get_commit_info: check return value of git command correctly
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Mon, 2 Jul 2012 06:05:06 +0000 (08:05 +0200)]
Make exception syntax consistent
Guido Günther [Sat, 30 Jun 2012 10:43:26 +0000 (12:43 +0200)]
GitRepository: Add test that covers remote branches in has_branch()
Guido Günther [Sat, 30 Jun 2012 07:40:18 +0000 (09:40 +0200)]
GitRepository: return GitModifier object instead of separate fields
this make sure the number of return values doesn't stays sane when
also returning timestamps and committer information.
Markus Lehtonen [Mon, 18 Jun 2012 13:20:39 +0000 (16:20 +0300)]
GitRepository: make get_commit_info() more robust
Now uses git-show instead of git-log. This is needed for further
enhancements (namely to get name-status for merge commits). Also, use
null-character as the field separator which makes parsing more reliable.
The method now returns 'body' of the commit message as is, without
stripping or splitting to lines.
In addition, get_commit_info() now uses GitArgs and _git_inout() instead
of the deprecated _git_getoutput().
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Sat, 30 Jun 2012 07:32:43 +0000 (09:32 +0200)]
tests: test GitRepository.get_commit_info()
Markus Lehtonen [Tue, 5 Jun 2012 11:48:03 +0000 (14:48 +0300)]
GitRepository: fix process cwd in _git_inout()
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 8 Feb 2012 12:54:59 +0000 (14:54 +0200)]
PristineTar: move Debian-specific stuff to DebianPristineTar
Continuation to the PristineTar refactoring, makes the "common"
PristineTar independent of DebianPkgPolicy. This commit moves the
Debian-specific has_commit() and checkout() methods to DebianPristineTar
class and replaces them with more generic functions in the base class.
Also, drops the Debian-specific get_commit() method completely, as it
was not used outside the PristineTar class itself.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Mon, 25 Jun 2012 09:30:25 +0000 (11:30 +0200)]
UpstreamSource: automatically detect package name and versions from directories
of the form packagename-<version>
Guido Günther [Mon, 25 Jun 2012 09:27:13 +0000 (11:27 +0200)]
Make TestDir testcase use a newly created directory
neeeded for the upcoming packagename/version parsing support
Ed Bartosh [Tue, 5 Jun 2012 11:39:40 +0000 (14:39 +0300)]
deb.git: Fixed typo in method name
the double underscore prefix was dropped ages ago.
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Markus Lehtonen [Fri, 18 May 2012 11:33:18 +0000 (14:33 +0300)]
common/pq: use strip in apply_and_commit_patch()
Use the strip information of the patch when applying patches. Also,
changes GitRepository.apply_patch() to accept integer values as 'strip'
argument.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 12 Jan 2012 13:24:42 +0000 (15:24 +0200)]
import-orig: move is_link_target() to common module
This change makes is_link_target() re-usable in the upcoming RPM-tools.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Fri, 8 Jun 2012 10:56:38 +0000 (12:56 +0200)]
gbp.conf: Make config option printing more consistent
Guido Günther [Fri, 1 Jun 2012 21:46:08 +0000 (23:46 +0200)]
Document changes and release 0.6.0~git20120601
Guido Günther [Fri, 1 Jun 2012 21:09:42 +0000 (23:09 +0200)]
git-buildpackage: allow to build packages from detached HEAD state
with --git-ignore-branch.
Closes: #661598
Guido Günther [Fri, 1 Jun 2012 20:36:07 +0000 (22:36 +0200)]
git-buildpackage overlay-mode: don't fail on files named like tarball
Instead of moving individual files around simply rename the directories.
This is faster and independent of the tarballs content.
Closes: #675412
Guido Günther [Fri, 1 Jun 2012 20:14:53 +0000 (22:14 +0200)]
git-buildpackage: add missing import
so move_old_export works again
Guido Günther [Thu, 31 May 2012 12:55:54 +0000 (14:55 +0200)]
gbp.git.repository: add GitRepository.make_tree
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Guido Günther [Thu, 31 May 2012 12:40:12 +0000 (14:40 +0200)]
gbp.git.repository: Add GitRepository.write_file
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Guido Günther [Thu, 31 May 2012 12:30:22 +0000 (14:30 +0200)]
gbp.git.repository: Add GitRepository.list_tree
Guido Günther [Fri, 25 May 2012 08:35:06 +0000 (10:35 +0200)]
Refactor deb helpers: move PristineTar class
Based on a patch by Markus Lehtonen
This refactor is preparation to the upcoming rpm support.
Guido Günther [Thu, 24 May 2012 12:29:52 +0000 (14:29 +0200)]
import_dsc: add --allow-unauthenticated
Closes: #670623
Guido Günther [Thu, 24 May 2012 12:07:49 +0000 (14:07 +0200)]
Document changes and release 0.6.0~git20120524
Daniel Dehennin [Sun, 20 May 2012 15:36:59 +0000 (17:36 +0200)]
Provide minimalist debian/control object
Closes: #673473
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Guido Günther [Sun, 20 May 2012 14:36:17 +0000 (16:36 +0200)]
gbp.deb.ChangeLog: Add filename property
Guido Günther [Sun, 20 May 2012 14:32:20 +0000 (16:32 +0200)]
gbp.deb.changelog: Split parsing into a separate function
this will allow us to reparse the changelog after manipulation with dch.
Guido Günther [Sun, 20 May 2012 10:51:13 +0000 (12:51 +0200)]
Don't explicitly refer to lenny-backports
Thanks: Salvatore Bonaccorso
Salvatore Bonaccorso [Fri, 18 May 2012 15:17:54 +0000 (17:17 +0200)]
Document --bpo, --nmu and --qa in git-dch's manpage
Closes: #673422
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Salvatore Bonaccorso [Fri, 18 May 2012 12:44:37 +0000 (14:44 +0200)]
git-dch: Add support for --team switch for Team uploads
Closes: #673368
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Guido Günther [Tue, 15 May 2012 19:03:10 +0000 (21:03 +0200)]
Fix typo in doctest that made epydoc fail.
Git-Dch: Ignore
Guido Günther [Tue, 15 May 2012 19:00:57 +0000 (21:00 +0200)]
Add gbp.deb.ChangeLogSection
to parse package and version out of a changelog section
Daniel Dehennin [Sun, 13 May 2012 18:37:11 +0000 (20:37 +0200)]
gbp.git.repository: Add a "git merge-base" wrapper
Closes: #672642
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Jérémy Lal [Sat, 12 May 2012 08:26:40 +0000 (10:26 +0200)]
Config help fix
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Guido Günther [Sun, 6 May 2012 20:54:23 +0000 (22:54 +0200)]
docs: compolete git-dch synopsis
Guido Günther [Fri, 4 May 2012 16:23:12 +0000 (18:23 +0200)]
GitRepository.format_patches: allow to set threading format
and disable it by default.
Markus Lehtonen [Wed, 8 Feb 2012 12:42:00 +0000 (14:42 +0200)]
Refactor deb helpers: move UpstreamSource class
to pkg base module. This refactor is preparation to the upcoming rpm
support.
Markus Lehtonen [Wed, 8 Feb 2012 12:26:24 +0000 (14:26 +0200)]
Refactor deb helpers: move build_tarball_name()
from UpstreamSource class to DebianPkgPolicy.
Markus Lehtonen [Thu, 12 Jan 2012 13:43:32 +0000 (15:43 +0200)]
Refactor deb helpers: introduce PkgPolicy class
Create a new 'pkg' basemodule, intended to be re-used by the upcoming
rpm package helpers. Move some deb functionality to a new pkg.PkgPolicy
class, to be used as a base for different package types. Introduces
Deb-specific deb.DebianPkgPolicy.
Guido Günther [Wed, 18 Apr 2012 22:24:39 +0000 (00:24 +0200)]
Document changes and release 0.6.0~git20120419
Matthijs Kooijman [Tue, 17 Apr 2012 20:17:20 +0000 (22:17 +0200)]
Bug#669145: [PATCH] Add git-dch --commit and --commit-msg options
Closes: #669145
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Markus Lehtonen [Thu, 12 Jan 2012 13:44:23 +0000 (15:44 +0200)]
Refactor git-import-orig as preparation for rpm support
Separate some functions of git-import-orig into a baselib, intended to
be re-used by the upcoming rpm variant of the tool.
Markus Lehtonen [Thu, 12 Jan 2012 13:24:42 +0000 (15:24 +0200)]
import-orig: refactor args of ask_package_* functions
Makes ask_package_name() and ask_package_version() more generic and
re-usable in the upcoming RPM-tools.
Markus Lehtonen [Thu, 12 Jan 2012 13:42:42 +0000 (15:42 +0200)]
Refactor git-buildpackage as preparation for rpm support
Separate some functions of git-buildpackage into a basemodule, intended
to be re-used by the upcoming rpm variant of the tool.
Markus Lehtonen [Thu, 12 Jan 2012 13:41:46 +0000 (15:41 +0200)]
Refactor gbp-pq as preparation for rpm support
Separate some functions of gbp-pq into a basemodule, intended to be
re-used by the upcoming rpm variant of the tool.
Also, introduces a new python subpackage gbp.scripts.common to be used
for the re-usable parts of the scripts in the refactoring work.
Markus Lehtonen [Thu, 12 Apr 2012 11:28:59 +0000 (14:28 +0300)]
docs: add some missing tags to sgml files
Matthijs Kooijman [Tue, 17 Apr 2012 20:41:48 +0000 (22:41 +0200)]
Git-Dch: Full in commit messages
This new tag makes git-dch use the full commit message when generating
the Debian changelog file, even when --full is not given.
Closes: #669159
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Guido Günther [Wed, 18 Apr 2012 06:14:40 +0000 (08:14 +0200)]
Make building with DEB_BUILD_OPTIONS=nocheck skip all tests
heavily based on a patch by Matthijs Kooijman
Guido Günther [Sun, 15 Apr 2012 17:06:10 +0000 (19:06 +0200)]
Document changes and release 0.6.0~git20120415
Guido Günther [Sun, 15 Apr 2012 17:04:48 +0000 (19:04 +0200)]
Ignore locale when checking for a clean repository
Closes: #668896
Guido Günther [Thu, 12 Apr 2012 21:03:21 +0000 (23:03 +0200)]
Make the upstream version check match policy
Closes: #668554
Jö Fahlke [Thu, 12 Apr 2012 18:47:54 +0000 (20:47 +0200)]
docs: correct --git-builder default value
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Guido Günther [Tue, 10 Apr 2012 09:39:09 +0000 (11:39 +0200)]
ALlow to set the output directory via GIT_PBUILDER_OUTPUT_DIR
Helps with #657277
Guido Günther [Thu, 5 Apr 2012 12:49:58 +0000 (14:49 +0200)]
gbp.git.repository: don't append a second .git
when mirroring a repository
Guido Günther [Wed, 4 Apr 2012 16:51:08 +0000 (18:51 +0200)]
Document changes and release 0.6.0~git20120404
Guido Günther [Wed, 28 Mar 2012 11:56:05 +0000 (13:56 +0200)]
gbp-add-patch: Fix typo
Guido Günther [Tue, 27 Mar 2012 19:46:32 +0000 (21:46 +0200)]
gbp-posttag-push: Tighten branch regexp
so we don't push to branches ending with the same name accidentally.
Guido Günther [Sat, 24 Mar 2012 12:27:31 +0000 (13:27 +0100)]
Start documenting useful options when upstream uses git.
This is quiet terse yet so follow up bugs are welcome.
Closes: #664771
Guido Günther [Sat, 24 Mar 2012 11:48:29 +0000 (12:48 +0100)]
docs: add --git-upstream-tag to git-buildpackage's manpage
Guido Günther [Fri, 23 Mar 2012 23:00:40 +0000 (00:00 +0100)]
Document changes and release 0.6.0~git20120324
Guido Günther [Fri, 23 Mar 2012 19:55:57 +0000 (20:55 +0100)]
git-import-orig: Allow to pass in an upstream vcs tag
This allows to link the import-orig commit with the corresponding
upstream vcs tag. See #664771 for a discussion.
Guido Günther [Wed, 21 Mar 2012 08:52:34 +0000 (09:52 +0100)]
gbp-create-remote-repo: add --remote-config
This specifies an additional config file section that can be used
to preconfigure different remote locations.
Guido Günther [Wed, 21 Mar 2012 22:17:29 +0000 (23:17 +0100)]
gbp.config: add list of config file sections to constructor
This makes it possible to parse additional mandatory sections
from config files to prefill defaults.
Git-Dch: Ignore
Guido Günther [Wed, 21 Mar 2012 21:43:42 +0000 (22:43 +0100)]
gbp-create-remote-repo: move option parsing to separate function
Git-Dch: Ignore
Guido Günther [Wed, 21 Mar 2012 08:58:33 +0000 (09:58 +0100)]
gbp.confing: add docstring
Git-Dch: Ignore
Guido Günther [Mon, 19 Mar 2012 13:46:05 +0000 (14:46 +0100)]
gbp create-remote-repo: allow to pass template directory
to git init so it's possible to set up remote hooks.