patch: new -B/--no-bump option to only sync patches

New -B/--no-bump option makes rdopkg patch only update patches from patches
branch without bumping .spec Release and generating %changelog.

You can use it with -l/--local-patches to get behavior of deprecated
update-patches:

    rdopkg patch --no-bump --local-patches

is an equivalent of deprecated

    rdopkg update-patches

but with extra benefits of rdopkg patch, such as ability to operate on both
local and remote patches branch.

Also update manual and references from `rdopkg update-patches`.

Change-Id: Id15c0d872f3fcef4f4f6c75a299951a813c02c58

Author: Jakub Ruzicka

doc/rdopkg.1.adoc

@@ -99,13 +99,15 @@ Introduce new patches to the package.
 
 This action works with patches branch
 (see <<patches-branch,AUTOMAGIC -> patches branch>>).
+
 By default, `rdopkg` resets local patches branch to remote patches branch.
-You can skip this this with `--local-patches` to directly use local patches
-branch as is.
+You can skip this this with `-l`/`--local-patches` to directly use local
+patches branch as is.
 
 Don't forget to `git fetch` before running the action.
 
-After running `rdopkg patch`, new commit will contain the changes.
+After running `rdopkg patch`, new commit will contain the changes if there are
+any.
 
 You can use `-C`/`--changelog` option to select how `rdopkg` detects new/old
 patches and changelog message:
@@ -115,13 +117,21 @@ patches and changelog message:
      removal & addition of patches and rewriting -patches history)
   * `plain`: just use generic "- Update patches" message
 
+Or you can use `-B`/`--no-bump` to skip Release bump and changelog generation
+and only update patch files and their references in the .spec file. This is
+useful when you only need to align distgit with patches branch.
+
 *Flow:*
 
   * Unless `-l`/`--local-patches` was used, reset local patches branch to
     remote patches branch.
-  * Update .spec file: bump Release, create new %changelog entry with new
-    patches' titles and create a commit.
-  * Update patches from local patches branch (`update-patches` action)
+  * Update patch files from local patches branch.
+  * Update .spec file with correct patch files references.
+  * Unless `-B`/`--no-bump` was used, update .spec file: bump Release, create
+    new %changelog entry with new patches' titles depending on
+    `-C`/`--changelog` option.
+  * Create new commit with the changes using %changelog to generate commit
+    message if available.
   * Display the diff.
 
 ACTION: new-version

rdopkg/actions/distgit/__init__.py

@@ -70,6 +70,9 @@
                    help="top gerrit review id of the patch chain"),
                Arg('force', shortcut='-f', action='store_true',
                    help="use patch even if it was not validated in CI"),
+               Arg('no_bump', shortcut='-B', action='store_true',
+                   help="don't bump release and generate changelog "
+                        "(update patches only)"),
                Arg('changelog', shortcut='-C',
                    choices=['detect', 'count', 'plain'],
                    help="how to generate changelog from patches"),
@@ -140,8 +143,7 @@
            description=(
                "WARNING: This is a low-level action for backward "
                "compatibility with ancient update-patches.sh script.\n\n"
-               "Please use `rdopkg patch [--local-patches]` instead.\n\n"
-               "This action is deprecated and will be removed eventually."),
+               "Please use `rdopkg patch -lB` instead.\n\n"),
            steps=[
                Action('update_patches_deprecated'),
                Action('get_package_env'),

rdopkg/actions/distgit/actions.py

@@ -512,7 +512,10 @@ def rebase_patches_branch(new_version, local_patches_branch,
 def check_new_patches(version, local_patches_branch,
                       patches_style=None, local_patches=False,
                       patches_branch=None, changes=None,
-                      version_tag_style=None, changelog=None):
+                      version_tag_style=None, changelog=None,
+                      no_bump=False):
+    if no_bump:
+        return
     if not changes:
         changes = []
     if changelog:
@@ -615,7 +618,11 @@ def get_upstream_patches(version, local_patches_branch,
 
 def update_spec(branch=None, changes=None,
                 new_rpm_version=None, new_release=None,
-                new_milestone=None, new_patches_base=None):
+                new_milestone=None, new_patches_base=None,
+                no_bump=False):
+
+    if no_bump:
+        return
     if not changes:
         changes = []
     _ensure_branch(branch)
@@ -908,7 +915,5 @@ def update_patches_deprecated():
     msg = ("\n{t.warn}DEPRECATION WARNING{t.normal}\n\n"
            "This is a low-level action for backward "
            "compatibility with ancient update-patches.sh script.\n\n"
-           "Please use {t.cmd}rdopkg patch [--local-patches]{t.normal} "
-           "instead.\n\n"
-           "This action is deprecated and will be removed eventually.\n")
+           "Please use {t.cmd}rdopkg patch -lB{t.normal} instead.\n\n")
     print(msg.format(t=log.term))

tests/test_patch.py

@@ -137,7 +137,11 @@ def test_patch_noop_plain(tmpdir):
     _test_patch_noop(tmpdir, 'patched', ['patch', '-l', '-C', 'plain'])
 
 
-def _test_patch_regen(tmpdir, distgit, distgit_after, cmd):
+def test_patch_noop_no_bump(tmpdir):
+    _test_patch_noop(tmpdir, 'patched', ['patch', '-l', '--no-bump'])
+
+
+def _test_patch_regen(tmpdir, distgit, distgit_after, cmd, norm_changelog=True):
     dist_path = common.prep_spec_test(tmpdir, distgit)
     with dist_path.as_cwd():
         common.prep_patches_branch()
@@ -146,7 +150,8 @@ def _test_patch_regen(tmpdir, distgit, distgit_after, cmd):
         rdopkg(*cmd)
         commit_after = git('rev-parse', 'HEAD')
         git_clean = git.is_clean()
-        common.norm_changelog()
+        if norm_changelog:
+            common.norm_changelog()
     common.assert_distgit(dist_path, distgit_after)
     assert commit_before != commit_after, "New commit not created after patch regen"
     assert git_clean, "git not clean after action"
@@ -166,3 +171,7 @@ def test_patch_regen_count(tmpdir):
 
 def test_patch_regen_plain(tmpdir):
     _test_patch_regen(tmpdir, 'patched', 'patched-regen', ['patch', '-l', '--changelog', 'plain'])
+
+
+def test_patch_regen_no_bump(tmpdir):
+    _test_patch_regen(tmpdir, 'patched', 'patched', ['patch', '-l', '--no-bump'], norm_changelog=False)