summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-11-21buildpackage-rpm: look for remote upstream branchesMarkus Lehtonen2-2/+18
Consider remote branches, too, while looking for the upstream branch when trying to guess if a package is native or not. Change-Id: I3dbbb49816d1d294d81209ea5ab5870e053fd66a Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-18rpm tests: use eq_ and ok_ from nose toolsMarkus Lehtonen1-77/+74
Provides better error messages as is more consistent as eq_ was already used in some test cases. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14Tizen: change python-rpm module name to rpm_tizenMarkus Lehtonen1-1/+1
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14log: don't propagate to ancestor loggersMarkus Lehtonen1-0/+2
Change-Id: I6548dcfe5ba2f779b9d9244ad1eb88fa92c2180e Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14rpm packaging: enable CentOS 7Markus Lehtonen1-4/+8
Fix dependencies and enable git-buildpackage(-deb) subpackage for CentOS 7. Also fixes one excess dependency for Fedora: no need for dpkg-devel, dpkg-dev is enough. Change-Id: I2c3929ae623c9694aa9afcb8a4e3155696179f05 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14GitRepository/__git_inout: correctly handle input errorMarkus Lehtonen1-1/+6
Change-Id: I3c9b8851490c05719f77a9519418a98f572d68e3 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14pq-rpm: better error messageMarkus Lehtonen1-1/+1
Change-Id: Iaadc614e9ed5df2e943eed71511559d0b76e0227 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14readme: we do have manpages for rpm toolsMarkus Lehtonen1-5/+1
Change-Id: Ieeeb5dde264d220d4d457e077325c232bd3ec326 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14packaging: rebase on top of upstream version 0.6.22Markus Lehtonen3-2/+11
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14Tizen release 0.6.15-20140828Markus Lehtonen3-2/+96
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14Add PKGBUILD to support arch linuxJunchun Guan1-0/+83
Three split packages: git-buildpackage-{common,rpm,doc} Signed-off-by: Junchun Guan <junchunx.guan@intel.com>
2014-11-14rpm tests: add unit tests for buildpackage-rpmMarkus Lehtonen4-7/+757
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: fix one error messageMarkus Lehtonen1-1/+2
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: drop unneeded exceptionMarkus Lehtonen1-3/+0
We will never get here as parse_spec() always returns GbpError. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: handle invalid keys in orig prefixMarkus Lehtonen1-4/+7
Gracefully handle invalid keys in the --git-orig-prefix format string. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: minor refactorMarkus Lehtonen1-7/+4
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: get rid of prepare_export_dir()Markus Lehtonen1-7/+1
No need to mangle the export directory. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: remove some outdated/unnecessary exception handlingMarkus Lehtonen1-5/+0
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: add '--git-native' optionMarkus Lehtonen2-3/+8
Can be used to explicitly configure a package as native or non-native. Default behavior is still to guess based on the existence of upstream branch. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: remove some unused variablesMarkus Lehtonen1-5/+1
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: add missing docstringsMarkus Lehtonen1-0/+5
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: remove unused importsMarkus Lehtonen1-5/+2
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14rpm tests: update component test dataMarkus Lehtonen2-49/+49
Adds pq/devel branch and .gitignore file to gbp-test package. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14rpm tests: remove RepoManifest.add_project()Markus Lehtonen1-11/+0
This functionality is moved to the rpm testdata submodule. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: remove too general exception catchingMarkus Lehtonen1-3/+0
There should be no reason to catch general Exception here. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: don't crash on invalid vcs format stringsMarkus Lehtonen1-1/+4
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: add --git-no-build optionMarkus Lehtonen1-1/+10
Replaces and deprecates --git-export-only. The new option name is way better in line with the other option names. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage_rpm: always run cleaner hookMarkus Lehtonen1-2/+1
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage_rpm: fix crash when running prebuild hookMarkus Lehtonen1-1/+1
GitRepository.git_dir is not callable. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage_rpm: check submodules from the exported treeishMarkus Lehtonen1-1/+1
And not from the current working copy. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: always create tarball for native packagesMarkus Lehtonen1-1/+1
If the package is native, always (re-)create the source tarball, even if --git-no-create-orig is used. Not creating the tarball does not make much sense (and most probably just causes problems and confusion): for native packages there is no place for external tarball and no patches so we need to always have the correct sources (i.e. the exported revision) in the tarball. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: fix exit code in case of GitRepositoryErrorMarkus Lehtonen1-1/+1
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14rpm-ch: implement --meta-bts optionMarkus Lehtonen5-10/+53
This gives the user the possibility to define what meta tags (in git commit message) git-rpm-ch recognizes as bug tracking system references. Or, makes it possible to disable bts meta tag tracking altogether. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14rpm-ch: implement --commit-msg optionMarkus Lehtonen3-4/+39
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14rpm-ch: implement --commit optionMarkus Lehtonen3-13/+53
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: new 'commitish' keyword for spec vcs tagMarkus Lehtonen1-14/+20
Add a new keyword '%(commitish)s' that can be used in the --git-spec-vcs-tag option. This will be translated to the sha1 of the commitish (i.e. tag or commit). That is, if you export a tag you will get the sha1 of the tag object - not resolving to a commit object unlike '%(commit)s' does. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14docs: manpages for the rpm toolsMarkus Lehtonen17-0/+2262
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14Tizen release 0.6.12-20140521Markus Lehtonen3-2/+90
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14pq-rpm: don't create pq branch when switchingMarkus Lehtonen2-11/+13
Pq branch must be created with 'import'. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14packaging: Prepare for next Tizen tools releaseMarkus Lehtonen3-2/+201
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14pq-rpm: implement --retain-history optionMarkus Lehtonen2-29/+94
With this option defined gbp tries to preserve the history when converting. That is, for each commit in the old branch create one corresponding commit in the new orphan packaging branch. This works by dumping packaging files and updating patches for each commit. However, empty commits are not generated - these are caused e.g. by changes in files that are ignored by patch-generation. NOTE! Only valid for the 'convert' action. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14pq-rpm: implement --new-packaging-dir cmdline optionMarkus Lehtonen2-6/+29
Used for setting the packaging directory to be used in the new orphan packaging branch. Defaults to --packaging-dir so that the gbp.conf files are more likely to work without modification. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14pq-rpm: implement 'convert' subcommandMarkus Lehtonen2-11/+127
The new subcommand is intended to be a one-time-callable command for converting a package to use the "orphan-packaging" development model and git layout (where packaging files are maintained in a separate branch and code development in another branch). Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: patch-export from development branchMarkus Lehtonen1-27/+64
Adds git-buildpackage-rpm --patch-export support for the 'orphan packaging' development model (where packaging files and development sources are kept in separate branches). New functionality: 1. If patch-export is enabled and gbp detects that the current branch has a development/patch-queue branch it exports the patches from there, instead of the tip of the packaging branch. 2. If gbp detects that the current (or exported) branch is a development/patch-queue branch it automatically enables patch-export and exports packaging files from the base branch (instead of the development/patch-queue branch. Also, add a new '--git-patch-export-rev' command line option with which the user can explicitly set the treeish from which patches are generated (i.e. HEAD..<patch-export-rev>) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14import-orig-rpm: get archive from spec fileMarkus Lehtonen2-29/+84
Try to get archive path/filename from spec file if no file name is given on the command line. This should make version bumps more straightforward: just update version number in the spec file and run 'git-import-orig-rpm'. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14import-orig-rpm: implement automatic downloadingMarkus Lehtonen1-1/+6
Automatically try to download the archive if the archive filename points to a remote location. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14import-orig-rpm: implement --create-missing-branches optionMarkus Lehtonen2-12/+40
Create the upstream branch if it does not exist. Use the same option name that import-srpm has. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14rpm-ch: add unit tests for the command line toolMarkus Lehtonen2-0/+401
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14rpm-ch: implement '--all' optionMarkus Lehtonen1-2/+7
If defined, git-rpm-ch uses all commits in the Git history. Also, '--since' option is omitted. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14rpm-ch: add --message cmdline optionMarkus Lehtonen1-12/+37
For giving the text for new changelog entry/entries, skipping git commit messages entirely. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>