Git-buildpackage-rpm now always updates the 'VCS:' tag in the exported
spec file. A new config option 'spec-vcs-tag' controls the format:
- if empty, no 'VCS' tag is inserted and possible old 'VCS' tag is
  removed
- otherwise, a 'VCS' tag is inserted or the old 'VCS' tag is updated

- '%(tag)s' expands to the long tag name (from git-describe)

Signed-off-by: Markus Lehtonen <[email protected]>

Add a new commandline option to ignore untracked files. Untracked files
are ignored and do not cause an error. However, an error is given if
there are changes to tracked files.

Signed-off-by: Markus Lehtonen <[email protected]>

Add support for reading the local config file(s) from a given git
tree-ish.

Signed-off-by: Markus Lehtonen <[email protected]>

Read the local gbp config (.gbp.conf, debian/gbp.conf) from the exported
tree instead of the current working copy. This makes sure that we build
correctly even if building something else than the current working copy.

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

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 <[email protected]>

With this option you can either only update already tracked files to
index the (untracked=False) or add new files, too.

Signed-off-by: Markus Lehtonen <[email protected]>

Whether to ignore untracked files (untracked=False) or not
(untracked=True). Now, clones the temporary index file from the actual
index, in order to correctly update files.

Signed-off-by: Markus Lehtonen <[email protected]>
Signed-off-by: Ed Bartosh <[email protected]>

Add support for building different kind of "working copies", when using
the --git-export option:
- 'WC.TRACKED': only take files that are already tracked
- 'WC.UNTRACKED': take untracked files, too
- 'WC.IGNORED': also add files that'd normally be ignored

Using '--git-export=WC' behaves like before.

Signed-off-by: Markus Lehtonen <[email protected]>

Add new possible keywords to be used in packaging-tag format string:
'nowtime', 'authortime', 'committime', 'nowtimenum', 'authortimenum' and
'committimenum'.

The '*timenum' keyword denote the corresponding '*time' keyword appended
with an additional incremental serial number. E.g. if 'nowtime' would
produce '20120531', 'nowtimenum' would (the first time) produce
'20120531.1'. If a new tag would be created on the same date, the field
would expand to '20120531.2' etc.

What is completely missing is a way to support these new tag keywords in
git-import-srpm tool. So, if you use these tags, git-import-srpm is not
able to reproduce the tags, (and, it is not necessarily able to
correctly tell if you've already imported a certain version of the
package).

Signed-off-by: Markus Lehtonen <[email protected]>

Redirect stdout and stderr of the (child) command to sys.stdout and
sys.stderr of the caller, respectively. This change is mainly for the
unit tests. It makes Python nose to correctly capture the output of the
child command, too, which in turn suppresses a lot of spurious output
when running nosetests.

Signed-off-by: Markus Lehtonen <[email protected]>

Reduces spurious output from rpmbuild.

Signed-off-by: Markus Lehtonen <[email protected]>

Separate keywords for packaging and upstream tag names. Also, add more
tests for tagging options.

Signed-off-by: Markus Lehtonen <[email protected]>

The name of the package containing zipmerge varies, e.g. 'libzip' in
Fedora 22 vs. 'libzip-tools' in Fedora 23.

Signed-off-by: Markus Lehtonen <[email protected]>

Corresponding the --skip-debian-tag options of import-dsc.

Signed-off-by: Markus Lehtonen <[email protected]>

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 <[email protected]>

Add some missing (build) dependencies if unit tests are enabled as part
of the build process.

Signed-off-by: Markus Lehtonen <[email protected]>

Similar to what the option does in git-import-orig-[rpm].

Signed-off-by: Markus Lehtonen <[email protected]>

This updates all remote-tracking branches (for the remote that is
fetched from) whose local branch name is identical to the remote branch
name.

Signed-off-by: Markus Lehtonen <[email protected]>

Makes it possible to only checkout certain files from a branch, instead
of switching to the branch. Add a new method instead of extending
checkout() in order to keep it consistent. That is, otherwise checkout()
would have totally different outcome depending on whether paths were
defined of not.

Signed-off-by: Markus Lehtonen <[email protected]>

Treat non-checked-out branches similarly to the current branch when
forcing update. That is, do git merge, instead of just setting the ref.

Also, renames fast_forward_branch() to update_branch() to better match
the functionality.

Signed-off-by: Markus Lehtonen <[email protected]>

The new option can be used to "copy" files from the packaging branch to
the patch-queue branch when doing pq import. The files defined with this
option will appear as new files in one monolithic commit in the
development/patch-queue branch.

By default, the local gbp conf files are imported in order to try to
ensure that gbp sees the same settings on the patch-queue branch as
on the packaging branch.

NOTE: This option does not affect the importing (i.e. apply and commit)
of patches.

Signed-off-by: Markus Lehtonen <[email protected]>

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 <[email protected]>

Add a new _git_inout2() helper method that returns the git output
(stdout) as a generator - instead of all stdout data in one string.
Useful for handling git commands that are expected to have a lot of
stdout data, like git-archive.

Also, changes the private __git_inout() method to return a generator.

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

Return tar data as a generator object, if the 'output' option is not
defined.

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

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 <[email protected]>

This should make the usage of gbp-pq more flexible and prevent mistakes
caused by e.g. running gbp-pq import under some subdirectory.

Signed-off-by: Markus Lehtonen <[email protected]>

Makes it possible to automatically drop the pq-branch after a successful
export. Counterpart for the --drop option of (deb) gbp-pq.

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

Conflicts:
	gbp/config.py

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 <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

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 <[email protected]>

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

Signed-off-by: Markus Lehtonen <[email protected]>

Unused and misleading.

Signed-off-by: Markus Lehtonen <[email protected]>

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 <[email protected]>

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

Signed-off-by: Markus Lehtonen <[email protected]>

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

Signed-off-by: Markus Lehtonen <[email protected]>

New method for creating tree objects from a directory content.

Signed-off-by: Markus Lehtonen <[email protected]>

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 <[email protected]>

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

Signed-off-by: Markus Lehtonen <[email protected]>

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

Signed-off-by: Markus Lehtonen <[email protected]>

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

Signed-off-by: Markus Lehtonen <[email protected]>

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

Signed-off-by: Markus Lehtonen <[email protected]>

instead of the deprecated _git_getoutput() method.

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

In order to get rid of dependency to dateutil.

Signed-off-by: Ed Bartosh <[email protected]>
Signed-off-by: Markus Lehtonen <[email protected]>

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

Signed-off-by: Markus Lehtonen <[email protected]>

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

Signed-off-by: Markus Lehtonen <[email protected]>

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 <[email protected]>

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 <[email protected]>

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 <[email protected]>

New properties for easily getting the archive format (tar, zip, ...) and
compression format (gzip, bzip2, ...) of the sources.

Signed-off-by: Markus Lehtonen <[email protected]>

New method for checking if the sources are a tarball (possibly for
checking if the sources are committable by pristine-tar).

Signed-off-by: Markus Lehtonen <[email protected]>

PkgPolicy is more logical context, for example if guessing version from
a plain filename and not a real file.

Also, changes guess_version() to always return a tuple to simplify
checking its return value.

Signed-off-by: Markus Lehtonen <[email protected]>

This is more robust and reliable, e.g. in case cwd is changed.

Signed-off-by: Markus Lehtonen <[email protected]>

Change doctests to unittests in order to have more flexibility in
testing.

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

Add a new attribure 'prefix', i.e. the "leading directory name" in an
archive. For example, this usually is '<name>-<version>' in release
tarballs.

Signed-off-by: Markus Lehtonen <[email protected]>
Signed-off-by: Łukasz Stelmach <[email protected]>

Set the unpacked attribute to the source dir if the content is not
filtered.

Signed-off-by: Markus Lehtonen <[email protected]>

Trying to keep UpstreamSource in consistent state so that unpacked and
packed sources are kept in sync.

Signed-off-by: Markus Lehtonen <[email protected]>

Introduces a new function prepare_sources() that prepares upstream
sources for importing into upstream branch and pristine-tar. That
includes unpacking, filtering and re-packing sources. What somewhat
complicates the logic is that it tries to avoid excess unpacking/packing
of the sources.

Also fixes the unpacking / filtering / repacking logic which was broken
with some parameter combinations.

Signed-off-by: Markus Lehtonen <[email protected]>

Take in to use the newly added prepare_sources() function. Drop dead,
unneeded code.

Signed-off-by: Markus Lehtonen <[email protected]>

Exporting sources failed when git-buildpackage was run from a
subdirectory of the git working directory because the path of the custom
index file was not handled correctly.

Signed-off-by: Markus Lehtonen <[email protected]>

For enabling/disabling the builder script. The option is a bit
asymmetric: --git-no-build automatically disables the 'postbuild' hook
whereas --git-build does not enable it (e.g. if --git-no-hooks is
given).

Signed-off-by: Markus Lehtonen <[email protected]>

Adds support for a configurable tmpdir under which all gbp tools now
create their temporary directories and files.

NOTE: an exception is git-import-dscs which doesn't use the common
configuration system.

Signed-off-by: Markus Lehtonen <[email protected]>

All other gbp branches have configurable names. This commit adds the
readiness for user to configure/change the name of the patch-queue
branches, as well.

Patch-queue is defined in options as a format string, where '%(branch)s'
refers to the debian/packaging branch. If the pq-branch format string
does not contain '%(branch)s', there is only one patch-queue branch and
the debian/packaging branch is used as its base branch. That is, e.g. a
'gbp-pq switch' operation from the patch-queue branch always switches to
the debian/packaging branch.

Signed-off-by: Markus Lehtonen <[email protected]>
Signed-off-by: Olev Kartau <[email protected]>

Now any string fields (e.g. '%(version)s') can be used in the pq-branch
format strings - in addition to the '%(branch)s' supported before.

Signed-off-by: Markus Lehtonen <[email protected]>

The 'force' option now has two possible values:
'merge': upstream branch is merged, even if fast-forward is not
possible.

'clean': check out a clean copy from the upstream if fast-forward is not
possible (i.e. no merge). Local changes are lost in this case.

Signed-off-by: Markus Lehtonen <[email protected]>

This is done in sake of more general purpose naming, intended for
enabling rpm support.

Signed-off-by: Markus Lehtonen <[email protected]>

This is the counterpart of 'debian-branch' (basically identical to that)
to not confuse rpm maintainers.

Also, adds this option to gbp-clone and gbp-pull commands (as an
alternative to the 'debian-branch option), which are usable for RPM in
their current form.

Signed-off-by: Markus Lehtonen <[email protected]>

This is done in sake of more general purpose naming, intended for
enabling rpm support: to allow logical naming for rpm and to
share as much code between debian and rpm tools as possible.

Signed-off-by: Markus Lehtonen <[email protected]>

This option allows generating patches from any git tree-ish (instead of
the default that is HEAD of patch-queue branch).

Signed-off-by: Markus Lehtonen <[email protected]>

Adds a new command line option '--pq-branch' to set the name of
patch-queue branches. Changes the defaults pq-branch name for rpm tools
to 'development/%(branch)s' (instead of the old
'patch-queue/%(branch)s').

Signed-off-by: Markus Lehtonen <[email protected]>

Adds a new commandline option '--patch-import' for importing patches
into the source tree in packaging branch. When enabled, gbp applies and
commits all patches (not marked for manual maintenance) into the
packaging branch. If this succeeds, it also removes all imported patch
files from the packaging directory and the spec file.

Currently only supported for non-orphan-packaging.

This setting is true by default which should make more sense as the
developer wants to do code development in the packaging branch (if
he/she selects to use non-orphan packaging).

However, patch-import is force-disabled if in bare git repository. We
cannot support this, currently.

Signed-off-by: Markus Lehtonen <[email protected]>

Initial version of import-orig-rpm: version of import-orig intended for
maintaining rpm packages.

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

Make the package buildable from Tizen repository.

Signed-off-by: Markus Lehtonen <[email protected]>

Split the git-buildpackage into git-buildpackage and
git-buildpackage-common. Now there are three binary packages:
- git-buildpackage-common contains the common code for Deb and RPM tools
- git-buildpackage contains the Debian-specific modules/tools
- git-buildpackage-rpm contains the RPM-specific modules/tools

After this change the Debian packaging resembles the RPM side packaging.

Signed-off-by: Zhang Qiang <[email protected]>
Signed-off-by: Ed Bartosh <[email protected]>
Signed-off-by: Markus Lehtonen <[email protected]>

No need to depend on the latest version.

Signed-off-by: Markus Lehtonen <[email protected]>

Enable the "joint packaging" development model where packaging and
source code changes are maintained in one single branch. In this case
'--git-patch-export' must be enabled, preferably in .gbp.conf. This will
instruct gbp to generate patches from the upstream tag up to the HEAD
commit.

Signed-off-by: Markus Lehtonen <[email protected]>

This patch adds the support to generate compressed patches. User can
define the patch file size limit after which patches gzipped.

Re-writes the write_patch() function(s) and now uses the same-and-only
write_patch() for buildpackage-rpm and pq-rpm.

Signed-off-by: Markus Lehtonen <[email protected]>

Adds a new option --orig-prefix that affects the prefix of the
generated/imported orig tarballs.

For git-buildpackage-rpm, it defines the prefix of tarballs generated by
the tool, 'auto' (default) makes gbp to guess the prefix, as before.
NOTE: this doesn't affect the tarballs checked out from pristine-tar
(i.e. if --pristine-tar is defined) or tarballs that are already present
(see --git-tarball-dir option).

For git-import-orig, this new option affects the prefix of tarballs
imported into pristine-tar branch. If set to 'auto' (default) gbp
doesn't mangle the prefix.

Other tools (e.g. git-import-srpm) are not affected.

Signed-off-by: Markus Lehtonen <[email protected]>

Implements an option for git-buildpackage-rpm and gbp-pq to squash
commits (from upstream) up to certain tree-ish into one monolithic diff.
Useful e.g. if you wan't to auto-generate a stable update patch.

The new format of the cmdline option filename is commit-ish followed by
(optionally) a colon and the desired diff filename base. Suffix '.diff'
is added by GBP.

Magic word 'HEAD' translates to the end-commit when given as the
squash-point.  This allows one to configure gbp to always squash all
commits into one monolithic diff.

Signed-off-by: Markus Lehtonen <[email protected]>

Implements a filter option allows one to filter out changes to certain
files/paths in the patch-generation. A commit is totally ignored if all
files would be filtered out. The path filter is given as a Python
regexp.

This option is useful for example in filtering out the changes to
packaging files when maintaining packaging and sources in the same
branch.

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

Make patch export fail if local patch files (not marked for manual
maintenance) exist.

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

This is just a workaround, this should be fixed in nicer way by
refactoring the code.

Signed-off-by: Zhang Qiang <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>

Signed-off-by: Markus Lehtonen <[email protected]>