Guido Günther [Sat, 26 Oct 2013 09:34:27 +0000 (11:34 +0200)]
Add missing bash completion for gbp import-dscs
Closes: #727749
Guan Junchun [Fri, 11 Oct 2013 10:16:17 +0000 (18:16 +0800)]
gbp-clone: support cloning to a specific directory
Closes: #725666
Signed-off-by: Guan Junchun <junchunx.guan@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guan Junchun [Sat, 12 Oct 2013 08:54:44 +0000 (16:54 +0800)]
gbp-clone: support repo URLs like "host:repo.git"
Previously, gbp didn't correctly parse this kind of URL and clone
failed.
Signed-off-by: Guan Junchun <junchunx.guan@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Wed, 16 Oct 2013 08:30:15 +0000 (10:30 +0200)]
Document changes and release 0.6.5
Guido Günther [Wed, 16 Oct 2013 08:29:07 +0000 (10:29 +0200)]
Bump standards version
Andrew Starr-Bochicchio [Thu, 19 Sep 2013 15:31:13 +0000 (11:31 -0400)]
Don't export DEB_VENDOR="Debian"
Tests now take Ubuntu versions into consideration.
Closes: #723756
Guido Günther [Wed, 16 Oct 2013 08:20:18 +0000 (10:20 +0200)]
Be more robust about git status output changes
by using --porcelain. Heavily based on a patch by rian m. carlson
Closes: #726260
Etienne Millon [Wed, 9 Oct 2013 14:24:47 +0000 (16:24 +0200)]
doc: Fix git-pbuilder example
Closes: #725875
Guido Günther [Sun, 6 Oct 2013 15:38:02 +0000 (17:38 +0200)]
Document changes and release 0.6.4
Guido Günther [Tue, 17 Sep 2013 16:33:00 +0000 (18:33 +0200)]
Backports got integrated into the main archive
From wheezy on we can use the main archive
Guido Günther [Tue, 17 Sep 2013 16:28:10 +0000 (18:28 +0200)]
Update to git-pbuilder 1.29
Guido Günther [Mon, 16 Sep 2013 17:20:25 +0000 (19:20 +0200)]
pq: Only print number or tries if we try more than once
Guido Günther [Mon, 16 Sep 2013 17:08:33 +0000 (19:08 +0200)]
pq: print which patch failed to apply
Osamu Aoki [Tue, 10 Sep 2013 14:38:00 +0000 (23:38 +0900)]
typo s/bei/be/
Closes: #722359
Markus Lehtonen [Thu, 5 Sep 2013 15:55:33 +0000 (18:55 +0300)]
tests: remove unused import in submodule tests
Change-Id: Ida67f9640624a92ffc1afd90dc33efe01b38db5c
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 5 Sep 2013 15:54:39 +0000 (18:54 +0300)]
tests: upper case global variables in submodule tests
Prevent some confusing name clashes.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 5 Sep 2013 15:30:07 +0000 (18:30 +0300)]
tests: add some docstrings to git submodule tests
Change-Id: I0ba9e6b59e2a819b5cde1be6fbb53b8ecbb67025
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 5 Sep 2013 16:14:32 +0000 (19:14 +0300)]
tests: use eq_ and ok_ from nose tools in submodule tests
For consistency and better assert error messages.
Change-Id: Ie6502daac6cee0176db5f099b91803292c17ceea
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 7 Aug 2012 15:35:17 +0000 (18:35 +0300)]
tests: add test for archiving without git submodules
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 5 Sep 2013 10:08:30 +0000 (13:08 +0300)]
GitRepository: deprecate the get_remote_repos method
Superceded byt the get_remotes() method.
Change-Id: I34f9e8b8188b5a40ce21d2f74e6068f2aaec9e60
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 5 Sep 2013 10:05:38 +0000 (13:05 +0300)]
GitRepository.has_remote_repo: use get_remotes method
Use the new get_remotes() method
Change-Id: Ic34cf590a6f36e6fa0af2ffbe932c8ae3a198944
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 5 Sep 2013 06:53:57 +0000 (09:53 +0300)]
git: new class and method for remote repositories
Add a new GitRemote class for representing git remote repositories.
The initial, very limited, version only contains information about the
fetch and push URLs of the remote repository.
Also, add a new GitRepository.get_remotes() method for getting remote
repositories as instances of the new GitRemote class.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Lingchaox Xin [Fri, 5 Jul 2013 09:50:48 +0000 (17:50 +0800)]
GitRepository.pull: Add 'all_remotes' option
Also changes the method to utilize the GitArgs class.
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Lingchaox Xin [Wed, 7 Aug 2013 07:16:21 +0000 (15:16 +0800)]
GitRepository.push: Add 'tags' option
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Lingchaox Xin [Fri, 5 Jul 2013 09:09:50 +0000 (17:09 +0800)]
GitRepository.push: Add 'force' option
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 6 Sep 2013 12:06:20 +0000 (15:06 +0300)]
GitRepository.list_tree: add 'paths' option
Change-Id: I9331fec6fcd0e58dad7cb4a571a683e09ce08011
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 19 Jul 2013 08:43:01 +0000 (11:43 +0300)]
GitRepository.diff: add 'ignore_submodules' option
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 27 Aug 2013 16:22:44 +0000 (19:22 +0300)]
common/buildpackage: fix handling of empty tarball prefix
Previously empty prefix in tarball generation introduced a leading slash
in all filenames in the archive.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Thu, 5 Sep 2013 10:14:28 +0000 (12:14 +0200)]
Add link to online docs
Guido Günther [Thu, 5 Sep 2013 09:53:18 +0000 (11:53 +0200)]
Remove unused import
Markus Lehtonen [Tue, 3 Sep 2013 07:03:27 +0000 (10:03 +0300)]
ComponentTestBase: use eq_() ok_() from nose.tools
For better assert messages.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 17 Jul 2013 16:13:42 +0000 (19:13 +0300)]
GitRepository.diff: prevent usage of external diff
External diff might break patch generation, for example.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 6 Jun 2013 20:24:48 +0000 (23:24 +0300)]
GitRepository.diff: add 'text' option
For generating textual diffs. Useful for Pq - for example, the 'patch'
utility does not support git binary diffs.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 4 Sep 2013 08:58:21 +0000 (11:58 +0300)]
GitRepository: Add clean() method
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Lingchaox Xin [Wed, 7 Aug 2013 07:25:21 +0000 (15:25 +0800)]
GitRepository.fetch: Add 'all_remotes' option
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Lingchaox Xin [Wed, 10 Jul 2013 03:17:46 +0000 (11:17 +0800)]
GitRepository.fetch: Add 'refspec' option
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Lingchaox Xin [Thu, 20 Jun 2013 01:34:01 +0000 (09:34 +0800)]
GitRepository.describe: add 'tags' and 'extra-match' options
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Lingchaox Xin [Wed, 7 Aug 2013 02:24:36 +0000 (10:24 +0800)]
GitRepository.has_treeish: minor pylint fix
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 29 Aug 2013 14:18:03 +0000 (17:18 +0300)]
ComponentTestBase: keep tmpdir if GBP_TESTS_NOCLEAN is in env
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 26 Aug 2013 20:18:39 +0000 (23:18 +0300)]
import-orig: import readline in the common module
Useful common functionality.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 29 Aug 2013 13:14:38 +0000 (16:14 +0300)]
ComponentTestBase: fix env restore in teardown
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 27 Aug 2013 17:17:45 +0000 (20:17 +0300)]
ComponentTestBase: more verbose output in case of branch mismatch
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 29 Nov 2012 17:17:59 +0000 (19:17 +0200)]
GitRepository/diff: add 'stat' and 'summary' options
For getting diffstat and summary in the output.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 29 Aug 2013 12:50:15 +0000 (15:50 +0300)]
config: restore mangled env in doctests
Otherwise the mangled GBP_CONF_FILES affects also other doctests when
run with python-nose.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 30 Aug 2013 17:54:11 +0000 (20:54 +0300)]
docs: minor sgml syntax fix
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Thu, 29 Aug 2013 18:11:18 +0000 (20:11 +0200)]
docs: having an upstream branch is a recommendation
rather than a hard requirement, we can use any treeish to build the
upstream tarball from.
Guido Günther [Wed, 28 Aug 2013 17:37:43 +0000 (19:37 +0200)]
Document changes and release 0.6.3
Guido Günther [Wed, 28 Aug 2013 17:30:12 +0000 (19:30 +0200)]
Use open() instead of file()
since the later doesn't exist in python3
Guido Günther [Mon, 26 Aug 2013 07:07:26 +0000 (09:07 +0200)]
docs: remove superfluous at
Guido Günther [Wed, 28 Aug 2013 17:25:37 +0000 (19:25 +0200)]
docs: Refert to gbp in the introduction
since this wraps all commands now.
Thanks: Ross Boylan for pointing out that the current wording is confusing.
Guido Günther [Sat, 24 Aug 2013 09:10:20 +0000 (11:10 +0200)]
pq: exclude patches from Debian packaging branch
When regenerating the patch queue including patches from the Debian
branch is not useful. Addresses parts of See #680705.
Thanks: Benjamin Cama for the detailed analysis
Guido Günther [Sat, 24 Aug 2013 09:06:11 +0000 (11:06 +0200)]
GitRepository: allow to use '..' instead of '...'
The symmetric difference isn't always useful since it includes changes
from both branches. See #680705.
Guido Günther [Thu, 22 Aug 2013 08:47:15 +0000 (10:47 +0200)]
docs: Add recommended branch layout
It'd be nice to have similar branch layouts among packages so recommend
one that worked well so far.
Guido Günther [Thu, 22 Aug 2013 08:22:37 +0000 (10:22 +0200)]
Minor docstring updates
Guido Günther [Wed, 21 Aug 2013 17:21:41 +0000 (19:21 +0200)]
dch: make automatic adding of new sections more robust
This code that determined if we found a snapshot header was obuscated by
the code that determines the commits to add. Split those and better
document their purpose. Also always return the commit to start from so
we don't need to repeat the logic in the uper levels.
Guido Günther [Wed, 21 Aug 2013 19:10:15 +0000 (21:10 +0200)]
Move MockedChangelog to testutils
and allow to specify the content so we can reuse it for other dch
tests.
Guido Günther [Sat, 13 Jul 2013 07:40:14 +0000 (09:40 +0200)]
--git-hooks doesn't take an argument
Guido Günther [Tue, 9 Jul 2013 19:47:51 +0000 (21:47 +0200)]
Document changes and release 0.6.2
Guido Günther [Tue, 9 Jul 2013 20:12:59 +0000 (22:12 +0200)]
Bump dephelper dependency
Guido Günther [Thu, 4 Jul 2013 15:18:29 +0000 (17:18 +0200)]
GitRepository.set_upstream_branch: use --set-upstream-to if available
since --set-upstream is deprecated.
Guido Günther [Thu, 4 Jul 2013 15:00:02 +0000 (17:00 +0200)]
GitRepository.set_upstream_branch: Catch errors to set upstream branch
Guido Günther [Thu, 4 Jul 2013 15:45:54 +0000 (17:45 +0200)]
GitRepository.set_upstream_branch: don't try to set upstream twice
Move setting of the upstream branch out of the loop. This worked by
accident.
Guido Günther [Thu, 4 Jul 2013 15:36:33 +0000 (17:36 +0200)]
GitRepository.set_upstream_branch: Newer git wants a valid remote repo entry
so set one in the tests before trying to set the upstream branch.
Found with git 1.8.3.2
Guido Günther [Thu, 4 Jul 2013 08:49:37 +0000 (10:49 +0200)]
Remove duplicate config files section
in the "gbp builpackage" man page
Guido Günther [Thu, 4 Jul 2013 08:38:30 +0000 (10:38 +0200)]
Add gbp buildpackage example
showing git-pbuilder invocation
Guido Günther [Mon, 1 Jul 2013 21:31:25 +0000 (23:31 +0200)]
Add examples for importing upstream sources
Guido Günther [Sun, 30 Jun 2013 21:37:43 +0000 (23:37 +0200)]
Fix broken xrefs
Guido Günther [Sun, 30 Jun 2013 21:21:18 +0000 (23:21 +0200)]
Add symlinks to the manpages for the deprecated commands
Closes: #714489
and make lintian happy
Guido Günther [Sun, 30 Jun 2013 14:57:46 +0000 (16:57 +0200)]
Update Vcs-Browser URL
Guido Günther [Sun, 30 Jun 2013 14:49:20 +0000 (16:49 +0200)]
Switch to debhelper level 9
which is available in Wheezy
Guido Günther [Sun, 30 Jun 2013 14:34:32 +0000 (16:34 +0200)]
Make sure we keep our test coverage
Guido Günther [Sun, 30 Jun 2013 14:06:43 +0000 (16:06 +0200)]
Test succesful import too
and make sure we don't spew to stderr during this test
Guido Günther [Sat, 29 Jun 2013 11:16:38 +0000 (13:16 +0200)]
gbp.git.GitRepository.has_branch(): use _git_command
instead of the deprecated _git_getoutput
Guido Günther [Sat, 29 Jun 2013 11:06:43 +0000 (13:06 +0200)]
gbp.git.Repository.get_branch(): use _git_command
instead of the deprecated _git_inout and clarify the return codes and
exceptions raised.
Guido Günther [Sat, 29 Jun 2013 10:40:57 +0000 (12:40 +0200)]
.gitignore docbook xref
Git-Dch: Ignore
Guido Günther [Sat, 29 Jun 2013 10:38:42 +0000 (12:38 +0200)]
Git.Repository.__git_inout: Close all other file descriptors
No need to leak fds to the child.
Guido Günther [Sat, 29 Jun 2013 10:38:42 +0000 (12:38 +0200)]
Git.Repository.__git_inout: properly set stdin
We should set stdin to subprocess.PIPE when piping input according
to the subprocess docs.
Guido Günther [Thu, 27 Jun 2013 17:14:38 +0000 (19:14 +0200)]
Use has_key
It's shorter and get's rid of the unused dummy variable.
Guido Günther [Thu, 27 Jun 2013 17:08:59 +0000 (19:08 +0200)]
Document gbp's help option
Guido Günther [Thu, 27 Jun 2013 09:23:09 +0000 (11:23 +0200)]
Document changes and release 0.6.1
Guido Günther [Thu, 27 Jun 2013 07:36:10 +0000 (09:36 +0200)]
Depend on python-pkg-resources
Closes: #714238
Guido Günther [Thu, 27 Jun 2013 07:34:46 +0000 (09:34 +0200)]
Split {Build-,}Deps per line
and sort alphabetically
Guido Günther [Wed, 26 Jun 2013 14:39:55 +0000 (16:39 +0200)]
Document changes and release 0.6.0
Guido Günther [Wed, 26 Jun 2013 17:14:32 +0000 (19:14 +0200)]
import-dsc: print filename instead of object name
Guido Günther [Wed, 26 Jun 2013 16:43:49 +0000 (18:43 +0200)]
config: Don't fill in the parser with all defaults
There's no need to fill the parser with all the built in defaults since
we can simply copy them to the config from the class dict. This allows
us to first set the values from the old {git,gbp}-* commands and then
only overwrite changed values from the newer "gbp <command>" versions.
Otherwise we'd overwite all old style config with the new style one.
This also fixes the problem where the default section wouldn't be read
at all if the command doesn't even have an empty section in any gbp.conf
file.
Guido Günther [Wed, 26 Jun 2013 16:36:20 +0000 (18:36 +0200)]
Fix typo
Git-Dch: Ignore
Guido Günther [Wed, 26 Jun 2013 16:01:09 +0000 (18:01 +0200)]
gbp-import-dscs: invoke gbp import-dsc
instead of git-import-dsc
Guido Günther [Wed, 26 Jun 2013 15:15:19 +0000 (17:15 +0200)]
Consistently call gbp the supercommand
and robustify against invalid modules names.
Guido Günther [Wed, 26 Jun 2013 14:59:52 +0000 (16:59 +0200)]
gbp: support --help
Guido Günther [Wed, 26 Jun 2013 11:47:42 +0000 (13:47 +0200)]
Update package description
Guido Günther [Wed, 26 Jun 2013 11:44:26 +0000 (13:44 +0200)]
NEWS: add a note about the new gbp super command
Guido Günther [Wed, 26 Jun 2013 11:32:32 +0000 (13:32 +0200)]
Rename the sgml files from git- to gbp-
Guido Günther [Wed, 26 Jun 2013 11:28:26 +0000 (13:28 +0200)]
gbp.conf: Use command names instead of {git,gbp}-
Guido Günther [Wed, 26 Jun 2013 11:09:51 +0000 (13:09 +0200)]
docs: Rename the entities from &git-<command>; to &gbp-<command>;
Guido Günther [Wed, 26 Jun 2013 10:54:48 +0000 (12:54 +0200)]
manpages: Changes references from git- to gbp-
Guido Günther [Wed, 26 Jun 2013 10:27:05 +0000 (12:27 +0200)]
docs: Use gbp <command> instead of {git,gbp}-<command>
Guido Günther [Wed, 26 Jun 2013 09:56:38 +0000 (11:56 +0200)]
Add gbp manpage
Guido Günther [Wed, 26 Jun 2013 09:42:27 +0000 (11:42 +0200)]
Bash complete on "gbp <command>" too
Guido Günther [Wed, 26 Jun 2013 10:09:31 +0000 (12:09 +0200)]
Git-Ignore generated gbp.conf.5 too
Guido Günther [Wed, 19 Jun 2013 09:38:21 +0000 (11:38 +0200)]
GbpOptionParser: add test for 'filter' option handling