summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-04-03Release, update changelogtizen/0.6.8-20140403release-for-gbsV0.21Markus Lehtonen3-1/+14
Change-Id: Id3b2f1caeaf12747401c33e25d9f697bf53138e0
2014-04-03CentOS compatibility: fix cherry-picked testsMarkus Lehtonen1-1/+5
Change-Id: I821ba7173ba0abc4251edd987a0bce5b13e2fd33 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-04-03Test option parser fallbacks more thoroughlyGuido Günther3-1/+99
revealing another bug where we overwrote parsed values with defaults Closes: #733759 (cherry picked from commit 14f6ded0143a3e82d04cad2614d705ca3a5b5c7e)
2014-04-03config: Don't pull in config defaults twiceGuido Günther2-2/+5
This would otherwise overwrite values set in the legacy config sections. Closes: #733759 (cherry picked from commit f1bc54279b6f2a9b8848196044ba5312e2af9aaf)
2014-04-02Release, update changelogtizen/0.6.8-20140402Markus Lehtonen3-1/+14
Change-Id: I19bce2de51ff74a05ef844867e1777d360bb6414
2014-04-02Revert "GitRepository/add_remote_repo: fix the 'tags' argument"Markus Lehtonen1-1/+1
Which caused an unwanted behavior of not fetching refs/heads at all -- only tags were fetched. This reverts commit a574027f445ac1558aa292985236fe58113bd8de. Change-Id: Ic2a1afd26b70102b7e4f1209a397c4c144f710dd Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-04-02Revert "CentOS compatibility: fix GitRepository.add_remote_repo"Markus Lehtonen1-1/+1
This reverts commit d7ed865a5acf965f439f7c6b8a0f4fe6f62d0cbf. Gbp-Rpm: If 0%{?centos_ver} Change-Id: Id79507712b9709c85fb6f94253892e18926952f9 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-03-06packaging: Prepare for next Tizen tools releasetizen/0.6.8-20140306Markus Lehtonen3-4/+194
Change-Id: Iee86168a04155c61d1e2d3b24c161030eb46cd4b Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-03-06gbp.conf: ignore current branchMarkus Lehtonen1-0/+2
Change-Id: I3937f8b6584486ba4e87c4509bf7f7f666ceda29 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-03-06rpm-ch: fix parsing of the "real name" from gecos field of pw dataMarkus Lehtonen1-1/+3
Change-Id: Ie640a6b847b75dce95590c432c4aca89339eb7e9 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-03-05gbp.conf: add rpm changelog revision field formatMarkus Lehtonen1-0/+3
Change-Id: I56476d6a832a755c7b56b2a5395785dea60df6b1 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-03-05rpm-ch: add unit tests for the command line toolMarkus Lehtonen2-0/+368
Change-Id: I7592bc624cee78b5072ab43e1a85c52bd2ae106c Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-03-05rpm-ch: use login name as author as the last resortMarkus Lehtonen1-1/+3
If name cannot be determined from pw_gecos field use the login name as the author. Change-Id: I7450d8e9369036f8298af94761341ae5e6bddc14 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-03-05rpm-ch: fix revision field mathching in guess_commit()Markus Lehtonen1-1/+1
Be non-greedy when matching string format fields. Change-Id: I2821830fb32fbdb77740bc06de4cb93c29d039e4 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-03-05rpm-ch: fix --git-authorMarkus Lehtonen1-11/+7
Use GitRepository.get_author_info() for getting the author name and email if --git-author is specified. Fallback to default method for determining name and/or email if they cannot be determined with get_author_info(). Change-Id: Ife3c3d4358e0bb5c55ba7b6b850bba470e4e06b6 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-28rpm-ch: fix crash in guessing start commitMarkus Lehtonen1-1/+1
The script crashed if changelog revision format did not contain any string fields. Change-Id: I2331e7ca995aed59a1f88bdc60b7643f5cad84c1 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-28rpm-ch: drop unused '--upstream-tag' optionMarkus Lehtonen1-2/+0
Change-Id: I9490092f2f3430789c29c93b443c68e76beea1ed Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-27rpm.changelog: fix dumb mistake in changelog parsingMarkus Lehtonen1-3/+3
Change-Id: Id0f4e270c666fb2c823a1a7745bd70e5a41568e0 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-27rpm-ch: implement '--spawn-editor' command line optionMarkus Lehtonen2-7/+21
Enables non-interactive invocation. Change-Id: Id4d083cdda4f0fa5c83f778101fe998fcee00bce Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-27gbp.conf: add packaging tag formatMarkus Lehtonen1-0/+2
Change-Id: I8d4ffe1da8668ba7f94089482d00e7bdcbf23feb Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-27rpm-ch: commit all staged files with --tagMarkus Lehtonen1-2/+2
This way you can update multiple files in the same commit (e.g. spec file or debian changelog). Change-Id: I27c91dfd4c2d920b7f334253959d2aeae3dba8ea Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-27GitRepository.commit_all: add committer_info argumentMarkus Lehtonen1-2/+6
For setting the committer name/email/date - similarly to author_info. Change-Id: I18ae467623d73148145cc5d4e314d14abb327b4f Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-27pq: fix stupid mistake parse_gbp_commands()Markus Lehtonen1-1/+1
Change-Id: Ib61ad117ee7b0697de66e7e0da17f5b7d58ab808 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-25rpm-ch: better error messageMarkus Lehtonen1-1/+1
Change-Id: Ia8681dfdeeebaf5aaeecda348ee6d3121e772a6d Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-25rpm tests: refactor test repository initializationMarkus Lehtonen2-50/+54
Create a baseclass for tests that are run in a git repository containing valid packaging for an rpm package. Makes it possible to re-use the repository initializations (from the test data manifest file). Change-Id: Ia034c6f8f82e8732efcbd2b9f7f852bd19eba500 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-25rpm tests: trivial pylint fix (wrap line)Markus Lehtonen1-1/+2
Change-Id: I08dd576f6f4924e70682810b6a0886b8b368e1fc Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-25rpm tests: trivial pylint fix for pq-rpm testsMarkus Lehtonen1-1/+1
Mark one string that contains a backslash as raw. Change-Id: Id95d7642a3741794698d3ff1310076c4558f5a5c Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-25rpm tests: trivial typo fixes for pq-rpm testsMarkus Lehtonen1-2/+2
Change-Id: I6e19c0af49d7484b7165b88f9454159c2d0a1a7e Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-25rpm-ch: update packaging-dir from spec file locationMarkus Lehtonen1-1/+1
So that the changelog is searched/created in the correct directory. Change-Id: I6c6db01da2be566101cd7b547a60902ef92ec779 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-24pq-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. Change-Id: I990ccf59216cc1f62105136004bfbd03074d1d9e Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-24pq-rpm: implement 'convert' subcommandMarkus Lehtonen2-11/+126
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). Change-Id: I7ffcb17bc893d59864e10b40ecb69f7b0b293b21 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-24buildpackage-rpm: patch-export from development branchMarkus Lehtonen1-14/+53
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>) Change-Id: Ic7cfc9759c5e453ace1669e2c2726cd9363e6ecc Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-24pq-rpm: implement '--import-files' command line optionMarkus Lehtonen3-14/+47
For defining the packaging file(s) that will be imported into the development/patch-queue branch. By default, the local gbp conf files are imported. NOTE: This option does not affect the patch files that are imported. The files defined with this option will appear as one monolithic commit in the development/patch-queue branch. Change-Id: Ia1967d77d2be5a8afc41e8d32c84b3386bc45924 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-24rpm: correctly handle 'NoSource' and 'NoPatch' tags in specMarkus Lehtonen2-4/+5
NoSource and NoPatch should be lists, thus not currently fully supported by us. However, rpm-python used to return them as long values in case only one NoSource/NoPatch tag was defined (RH Bug: 991329). Change-Id: Id99205a68f2c8862a4d9fa141c4507a287a90a6b Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-13import-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'. Change-Id: I3222f5f699ffc61e39755a89f667f8db92bb4681 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-13import-orig-rpm: implement automatic downloadingMarkus Lehtonen1-1/+6
Automatically try to download the archive if the archive filename points to a remote location. Change-Id: I387cab9f7ec53d268010367517f22f02055e01b7 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-13import-srpm: move file download to a separate functionMarkus Lehtonen1-1/+15
So that this functionality can be easily re-used elsewhere. Change-Id: I6f0f3e6efcbd6462810d0116da6d06bef57919cf Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-13rpm: store full path of spec file sourcesMarkus Lehtonen3-4/+7
Change-Id: I6f8a4bd98aa6051556cacb7ec7a771025c5f3880 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-13import-orig-rpm: drop references to uscanMarkus Lehtonen1-3/+3
Change-Id: Ia8b0d4775ea5ac6c5e1ead224f976a2b7e3dcce3 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-12import-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. Change-Id: I2e55a2d88348776e9f2d9110a33e36a79b26ffff Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-12import-orig: implement --create-missing-branches optionMarkus Lehtonen2-6/+14
Create the upstream branch if it does not exist. Use the same option name that import-dsc has. Change-Id: I32769cb3c03fd2e63f743b7a3aa0b18465bb7ce7 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-12buildpackage-rpm: change default export directoryMarkus Lehtonen1-1/+1
So that the git working directory is not dirtied, by default. Change-Id: Ic0b1455566bcc27e83d7171aa9b67f4311a6a066 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-12import-orig-rpm: disable --merge by defaultMarkus Lehtonen2-47/+87
Merging upstream to packaging does not usually make sense with rpm packages. Merely, it can create confusion cause unapplicable patches to be generated. Change-Id: Id053643d4045522ff3e5ac7444501252bbf2d77f Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-10rpm-policy: fix erroneous importMarkus Lehtonen1-1/+1
Fixes: #1642 Change-Id: I6e0dc851daa5daee9bf1185b927f87d47482c1eb Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-07rpm-ch: make it possible to commit/tag the changesMarkus Lehtonen1-10/+60
Implement '--tag' command line option (and other related options for signing) for creating and tagging a release. These correspond the tagging options in git-buildpackage-rpm. The git-buildpackage-rpm tool does not commit anything to git. However, in rpm-ch the '--tag' option causes the changelog modifications (and, all other staged changes) to be committed to git before creating the tag. This makes it possible to create a release and document the packaging/release tag name in the rpm changelog. Change-Id: I0fe44b9ef98a4ea5d26320913cd9d8aa552aecfb Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-07GitRepository.commit_files: add edit argumentMarkus Lehtonen1-5/+8
In order to be able to spawn an editor, similarly to other commitX methods in GitRepository. Change-Id: Ie110cd36dde90b5d1ead5da219f0be00d49830dd Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-07GitRepository.commit_files: add committer_info argumentMarkus Lehtonen1-3/+9
For setting the committer name/email/date - similarly to author_info. Change-Id: I5f085eb5f23bacd7494620726024f09b48c23f19 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-07GitRepository: fix the 'edit' mode in commit methodsMarkus Lehtonen1-8/+6
Previously the editor would not show in the shell because stdout was captured. Change-Id: I0732cfb8ff429ea008a2a927f44ba46cbcbb6874 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-07GitRepository: allow interactive commandsMarkus Lehtonen1-10/+19
Make it possible for git commands to output directly to stdout without redirection (i.e. capturing their stdout stream). Change-Id: I157b004c03452802a162fbf1765c81168b448b66 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-02-07buildpackage-rpm: function for creating packaging tagMarkus Lehtonen1-3/+9
Implement a function for creating the packaging tag in the Git repository. In order to re-use the functionality elsewhere. Change-Id: I0b475b541b2bda0df4f5e99b989aa369cc05d7aa Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 21:18:52 +0000