Introduce PkgPolicy.is_valid_orig_archive()

A new method for checking if the given filename is usable as a orig
(upstream) source archive.

Also, takes this method into use in the UpstreamSource class.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/pkg/__init__.py

UpstreamSource.pack: support prefix mangling

Add support for changing the prefix directory inside the tarball that is
generated. Also, fixes a bug that caused a "prefix-less" tarball to get
one, if unpacked and then repacked.

Also, adds this support to repack_source() in common/import_orig.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/pkg/__init__.py
gbp/scripts/common/import_orig.py

import-orig: move repacked_tarball_name() out from common

Moves repacked_tarball_name() from scripts/common back to the
Debian-specific script. The logic is too Debian-specific for RPM, after
all.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/scripts/common/import_orig.py
gbp/scripts/import_orig.py

import-orig: simplify repack_source() and tmpdir handling

Now a tmpdir is always created and sources are always unpacked into
there.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/scripts/common/import_orig.py
gbp/scripts/import_orig.py

import-orig: implement --create-missing-branches option

Create the upstream branch if it does not exist. Use the same option
name that import-dsc has.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/scripts/import_orig.py

docs: enable building html docs with docbook2html

This is useful if sgml2x package is not available.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
docs/Makefile

GitRepository: add diff_status method

This is a method of getting the filename and status information of a
diff. That is, a list of files that changed and their status, "added",
"modified" etc.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

gbp.git: Reimplement rfc822 date parsing without dateutil

In order to get rid of dependency to dateutil.

Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
debian/control

pq/parse_gbp_commands: return non-matched lines

In order to make it easy to re-use this function in changelog
generation.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository.add_files: consistently update ALL tracked files

Use the --all option of git-add so that all tracked files are updated in
all conditions. Previously deletion of tracked files was not staged, for
example.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/git/repository.py

GitRepository.add_files: use GitArgs

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/git/repository.py

GitRepository: allow repo inititialization from subdir

This allows initialization of a GitRepository object, even if the
current working directory (or path given to GitRepository) is not the
top level directory of the git repository.

Don't guess the git meta data dir, but, take it as reported by git
itself.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository: Implement status method

Simple wrapper to the git-status command.

Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository: raise GitRepositoryError instead of GbpError

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository/rev_parse: use _git_inout()

instead of the deprecated _git_getoutput() method.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository/git_command: strip stderr output in case of error

In order to get rid of extra line feeds in exception message.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository/has_submodules: add treeish argument

For defining a Git treeish which to look into, instead of the current
working copy.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository.create_branch: add 'force' option

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository.commit_files: add edit argument

In order to be able to spawn an editor, similarly to other commitX
methods in GitRepository.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/git/repository.py

GitRepository.commit_all: add committer_info argument

For setting the committer name/email/date - similarly to author_info.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository.commit_files: add committer_info argument

For setting the committer name/email/date - similarly to author_info.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/git/repository.py

GbpOptionParser: allow using the default 'dest' attribute

Make it possible to add options without explicitly defining the 'dest'
attribute - in which case the default of OptionParser is used.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository: implement create_tree method

New method for creating tree objects from a directory content.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository: fix the 'edit' mode in commit methods

Previously the editor would not show in the shell because stdout was
captured.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/git/repository.py

GitRepository: allow interactive commands

Make it possible for git commands to output directly to stdout without
redirection (i.e. capturing their stdout stream).

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

buildpackage: refactor tarball compression

Introduce a new function for running the compressor commands. Unifies
exception/error handling - GbpError will be returned if the compressor
fails.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/scripts/common/buildpackage.py

buildpackage/dump_tree: add 'recursive' option

For selecting whether to dump all the files recursively or just the top
level directory of the tree.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository.archive: add 'paths' option

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

GitRepository.archive: drop the '**kwargs' argument

Unused and misleading.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/git/repository.py

common/buildpackage: use GitRepository for submodules

Initialize a GitRepository object for each submodule in
git_archive_submodules().

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

buildpackage/dump_tree: use GitRepository.archive()

Make dump_tree() utilize the GitRepository.archive() method - similarly
to git_archive_submodules() - instead of ad-hoc Python pipes. This makes
dump_tree() work independent of the callers current working directory.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/scripts/common/buildpackage.py

buildpackage/git_archive_single: use GitRepository.archive()

Use GitRepository.archive() method like git_archive_submodules() does.
This makes it possible to call git_archive_single() independent of the
callers current working directory.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/scripts/common/buildpackage.py

Change compressor cmdline opts in compressor_opts to a list

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/scripts/common/buildpackage.py

common/buildpackage: support for different archive formats

Adds support for defining the archive format of the output of
git_archive_single(), e.g. 'zip'. Defaults to 'tar', as before.

Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
debian/control
gbp/scripts/common/buildpackage.py

docs: document the --customizations option of gbp dch

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

docs: document the --interactive option of gbp-import-orig

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

notifications: make notify() more generic

In order to be able to re-use it in other tools than git-buildpackage.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

pq: make sure we always get a sane author

Prevent a crash when the author (for a raw diff) was None because no
name/email could be determined from git config or environment variables.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

pq: deprecate the usage of 'gbp-pq-topic:'

Replaced by the "Gbp[-Pq]: Topic <topic>" command.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/scripts/pq.py

log: don't automatically setup gbp-specific logger

This makes it nicer to use gbp.* modules (e.g. gbp.git) in other
software projects which may have their own logging setup. After this
change, just importing gbp.* modules won't forcibly setup gbp-specific
logging. However, gbp logging is initialized whenever the
gbp.log.getLogger function is called which makes logging in existing gbp
commands behave just like before.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

import-srpm: support --upstream-vcs-tag cmdline option

Similar to the corresponding option in gbp import-orig.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/scripts/import_srpm.py

tests: add tests for UpstreamSource.guess_version()

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
tests/06_test_upstream_source.py

UpstreamSource.guess_version: recognise debian native tarballs

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

ComponentTestBase: add dirs argument to _check_repo_state()

Make difference between regular files and directories, eliminating the
requirement of listing directories in the file list.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
tests/component/rpm/test_import_srpm.py

ComponentTestBase: add ls_tree() method

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

ComponentTestBase: add check_files() method

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
tests/component/__init__.py

ComponentTestBase: add a per-class toplevel temp dir

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

ComponentTestBase: ignore system and user config

User might have a system and/or user specific gbp config files. Disable
these config files so that they don't affect the component tests.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
tests/component/__init__.py

log: fix auto colorizing for custom streams

Check for existence of isatty() method in the stream object. Some custom
streams (e.g. in nose) do not necessarily have this.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

notify: catch RuntimeError when importing pynotify

Work around a problem in some distros (e.g. Fedora) where "import
pynotify" crashes in RuntimeError in some cases, e.g. when DISPLAY env
variable is not set.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

gbp-dch: fix handling of the '--meta' option

Make it effective again - previously it was totally ignored. Also,
change it's default value to True to match the current behavior.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

Document changes and release 0.6.22

Conflicts:
debian/changelog

git.vfs: fix close method

Preventing a infinite recursion which can be triggered by gbp pq export
--commit.

Document changes and release 0.6.21

Conflicts:
debian/changelog

Update README a bit

Git-Dch: Ignore

Conflicts:
README

Complete setup.py for pypi

Improve change reporting a bit

man: fix option argument for --git-pbuilder-options

pq: Don't fail commit if the series file is empty on the source branch

Document changes and release 0.6.20

Conflicts:
debian/changelog

pq: Add "pq export --commit" option

This commits the changes in the pq right away. This is currently
experimental and subject to change.

Conflicts:
gbp/scripts/pq.py

meta-closes: Move help text to GbpOptionParser.help

pq: document --drop

Allow to always drop pq branch after export

Closes: #761160

Conflicts:
gbp/config.py

Document changes and release 0.6.19

Conflicts:
debian/changelog

Update to git-pbuilder 1.33

Document changes and release 0.6.18

Conflicts:
debian/changelog

Mention --no-merge

Closes: #760091

Don't delete *_source.changes on source only builds

Closes: #758726

Document changes and release 0.6.17

Conflicts:
debian/changelog

bash completion: make command list dynamic

Use "gbp --list-cmds" so we don't have to hardcode the available
commands and get support for the RPM ones as they show up.

Unify doc strings a bit

since they now show up with --list-cmds

Allow to list all available commands

gbp: add --version option

Closes: #758909

Improve error messages on formatting errors

Make it easier for the user to detect misformated replacement strings in
config files and command line options.

Conflicts:
debian/git-buildpackage.install
gbp/scripts/import_orig.py

buildpackage: Make debian-tag message configurable

New config option --git-debian-tag-msg allows for the specification of
the message format string for signed debian-tags.

When left unset, the default debian-tag-msg format is still:

    %(pkg)s Debian release %(version)s

Signed-off-by: Kamal Mostafa <kamal@whence.com>
Conflicts:
gbp/scripts/buildpackage.py

dch: Only modify the mainttrailer when --git-author is in use

Use better variable name

It's a boolean indicating wether we fetch the author information from
git not the author information itself.

Git-Dch: Ignore

Brown paper bag, please

Gbp-Dch: Ignore

Make sure we fixup the changelog trailer with newer devscripts

We don't change any mainttrailer options if already given.

Thanks: James McCoy for the detailed explanation
Closes: #740566

Document changes and release 0.6.16

Conflicts:
debian/changelog

Remove all other log handlers when capturing logs

This avoids spurious error messages during test runs.

linkeList: turn the bug printouts to debug level

We don't take any action anyway so no need to confuse users.

Introduce git-buildpackage-rpm

Currently only including "gbp import-srpm"

Conflicts:
debian/control
debian/git-buildpackage-rpm.install
debian/git-buildpackage.install

import-srpm: add 'vendor' config option

Intended to represent the distribution vendor (e.g. 'Debian').
Currently, this can be used in tag format strings.

NOTE: the vendor name is converted to lowercase when used in tag names.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/config.py

Pass --no-pristine-tar to SRPM compnent tests

to avoid pristine-tar showing up in the matched branches

Conflicts:
tests/component/rpm/test_import_srpm.py

Introduce git-import-srpm tool

Initial version of the git-import-srpm: a tool for importing source
rpms.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Conflicts:
.gitmodules
gbp/config.py
gbp/scripts/import_srpm.py
tests/01_test_help.py
tests/component/rpm/__init__.py
tests/component/rpm/data
tests/component/rpm/test_import_srpm.py

Merge commit '1a8e6d12cc94d2b40324fe8f99de012cf2cf5913' into release-201501

Merge from devel dbfc6276c4aa50b79f1cf27cfc24badc0b18da8f

Merge from devel e374ee5a2381ba30056c1fa33bdb515d99ec704e

Merge to 7f6b72e039efa5e2c3517b9336f9b29b4cb65c71

Merge to 36c8e5cd00fd600be63160b0ef9427a70ab45870

merge to 0b1fc0d602d75da30748bbc979fed48aab805503

merger to 655a6f0528afcebe1b4493abe865ee568c505bbf

modify .gitmodule
Signed-off-by: shuai.fu <shuai01.fu@samsung.com>
Change-Id: I93c6a4eccb8d62b0a164c13902726cf3c92ac039

Upgrade version to 0.6.25

Change-Id: I1d62032a98e91130c35ceccff576262709d806b3
Signed-off-by: Rong Jinhui <jinhui.rong@samsung.com>

Tizen release 0.6.15-20140828

Change-Id: Ida5b65020a0e9f566aef3d86f5536c7581fdbd01
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

rpm packaging: use macro for python binary

For fedora distro, when building git-buildpackage rpm packages in the buildroot,
/bin/python is called to do python setup.py actions during rpmbuild,which leads
to /bin/python is taken as requirement of git-buildpackage-rpm-0.6.15-0.noarch.rpm
automatically, resulting in:

Install gbs with dnf command in fedora distro will raise error:
nothing provides /bin/python needed by git-buildpackage-rpm-0.6.12-59.1.noarch

Fixes: DEVT-197

Change-Id: I30169a506d7f92aed759124c40beb2803c196218
Signed-off-by: Li Jinjing <jinjingx.li@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

Add PKGBUILD to support arch linux

Three split packages: git-buildpackage-{common,rpm,doc}

Signed-off-by: Junchun Guan <junchunx.guan@intel.com>

rpm tests: add unit tests for buildpackage-rpm

Change-Id: If8a5cce2d43a8dffed6999059a84b3f6040eebdd
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>