Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improvements to rpm-ch #51

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Improvements to rpm-ch #51

wants to merge 10 commits into from

Conversation

marquiz
Copy link
Contributor

@marquiz marquiz commented Jan 22, 2018

Makes it easier to run full unit tests on rpm based systems

@agx
Copy link
Owner

agx commented Jan 23, 2018

Hi,
thanks for the patches!

  • patch 3 and 4 could move into a separate PR since they're good to go (Have to think about the --edit case a bit more)
  • -- commit behaves differently from pq --commit (which only commits patches) this is confusing. Can we make it have the same behaviour?
  • I'm not sure --tag is useful in pq since it addds even more options while we could use either gbp buildpackage --git-tag or gbp tag

Overall I tried to not add even more options to commands but rather have separate commands (likg gbp tag) since this makes it less confusing for users.

@marquiz
Copy link
Contributor Author

marquiz commented Jan 23, 2018

patch 3 and 4 could move into a separate PR since they're good to go
Done

(Have to think about the --edit case a bit more)
What are you unsure about? There is already an --edit option, but, it's broken

-- commit behaves differently from pq --commit (which only commits patches) this is confusing. Can we make it have the same behaviour?

What do you think it should commit? Just the changelog? I found it useful to be able to include other changes to the commit (by doing git-add before invoking gbp-rpm-ch)

I'm not sure --tag is useful in pq since it addds even more options while we could use either gbp buildpackage --git-tag or gbp tag

Overall I tried to not add even more options to commands but rather have separate commands (likg gbp tag) since this makes it less confusing for users.

Yes, I basically agree on that. However, the idea behind the committing/tagging options here is that you can automatically include the correct tag name in the changelog entry that you're committing/tagging. The rpm changlog entry has a version revision field and one option is to use the packaging tag there.

@marquiz
GitRepository: allow interactive commands
cfa1743 
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>
@marquiz
GitRepository: fix the 'edit' mode in commit methods
8899a97 
Previously the editor would not show in the shell because stdout was
captured.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
@marquiz
GitRepository.commit_files: add committer_info argument
2b2064d 
For setting the committer name/email/date - similarly to author_info.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
@marquiz
GitRepository.commit_staged: add committer_info argument
66caafd 
For setting the committer name/email/date - similarly to author_info.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
@marquiz
rpm-ch: implement --commit option
c97cc03 
Commit the changes to Git. Using this option will commit the changelog
modifications as well as all other staged changes, making it possible to
easily include other changes in the commit, too.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
@marquiz
rpm-ch: implement --commit-msg option
526ad6f 
Defines format string used to generate the commit message when --commit
option is used.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
@marquiz
rpm-ch: implement tagging options
5942338 
Implement '--tag' command line option (and other related options for
e.g. signing) for creating and tagging a release. These correspond the
tagging options in gbp-buildpackage-rpm.

A slight difference is that gbp buildpackage-rpm never commits anything
to git. However, in rpm-ch the '--tag' option automatically enables
--commit which 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.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
@marquiz
rpm-ch: add --message cmdline option
c5db5da 
This option can be used to directly give the text for new changelog
entry, skipping auto-generation from git commit history entirely. Thus,
'--since' or '--all' do not have any effect when '--message' is defined.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
@marquiz
rpm-ch: implement --all option
9a7c787 
If defined, rpm-ch uses all commits from the Git history. This can be
useful when creating a new changelog from scratch. Using '--all' causes
'--since' to be ignored.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
@marquiz
rpm-ch: implement --meta-bts option
b14ee9b 
This gives the user the possibility to define what meta tags (in git
commit message) gbp-rpm-ch recognizes as bug tracking system references.
Alternatively, it makes it possible to disable bts meta tag parsing
altogether.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
needsreview
Projects
None yet
Milestone
No milestone
2 participants
@marquiz @agx