From: "Vladimir D. Seleznev" <vseleznv@altlinux.org> To: devel@lists.altlinux.org Cc: legion@altlinux.org, "Vladimir D. Seleznev" <vseleznv@altlinux.org> Subject: [devel] [PATCH v4 1/2] Add diff exclude option for gear-rules Date: Fri, 27 Nov 2020 16:44:30 +0300 Message-ID: <20201127134431.3854941-1-vseleznv@altlinux.org> (raw) The option specifies a glob pattern that define files that should be excluded from diff generation. Signed-off-by: Vladimir D. Seleznev <vseleznv@altlinux.org> --- gear | 17 +++++++++++++---- gear-rules.5.in | 19 +++++++++++++++++++ gear-store-tags | 4 ++++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/gear b/gear index 6282c92..7bdddc0 100755 --- a/gear +++ b/gear @@ -337,7 +337,7 @@ make_archive() write_git_archive "$format" "$optional" "$cmd" "$tar_tree" "$dir_name" "$tar_name" "$tar_base" "$tar_suffix" } -get_diff_name() +get_diff_opts() { local old_d="$1" && shift local new_d="$1" && shift @@ -376,6 +376,13 @@ get_diff_name() ;; name=*) diff_name="${opt#name=}" ;; + exclude=*) + [ -z "$(printf %s "${opt#exclude=}" |tr -d '[:alnum:]_.?*-/![]')" ] || + rules_error "Invalid diff exclude pattern specified: ${opt#exclude=}" + [ -n "${opt#exclude=}" ] || + rules_error "Invalid diff exclude pattern specified: empty pattern" + diff_exclude="$diff_exclude :^${opt#exclude=}" + ;; *) rules_error "Unrecognized option: $opt" ;; esac @@ -402,6 +409,7 @@ write_git_diff() { local optional="$1" && shift local cmd="$1" && shift + local diff_exclude="$1" && shift local old_tree="$1" && shift local old_dir="$1" && shift local new_tree="$1" && shift @@ -423,7 +431,7 @@ write_git_diff() } git diff-tree --patch-with-stat --text --no-renames --no-ext-diff \ - "$old_id" "$new_id" >"$outdir/$name" + "$old_id" "$new_id" -- $diff_exclude >"$outdir/$name" verbose "Extracted diff: $name" compress_file "$cmd" "$name" '' @@ -449,14 +457,15 @@ make_difference() diff_new_tree="${new_dir%%:*}" new_dir="${new_dir#*:}" - get_diff_name "$old_dir" "$new_dir" "$@" + local diff_exclude= + get_diff_opts "$old_dir" "$new_dir" "$@" diff_old_tree="$(resolve_tree_base_name "$diff_old_tree")" || rules_error "Invalid old tree: $diff_old_tree" diff_new_tree="$(resolve_tree_base_name "$diff_new_tree")" || rules_error "Invalid new tree: $diff_new_tree" - write_git_diff "$optional" "$cmd" "$diff_old_tree" "$old_dir" "$diff_new_tree" "$new_dir" "$diff_name" + write_git_diff "$optional" "$cmd" "$diff_exclude" "$diff_old_tree" "$old_dir" "$diff_new_tree" "$new_dir" "$diff_name" } extract_pattern() diff --git a/gear-rules.5.in b/gear-rules.5.in index 5469199..ae79a35 100644 --- a/gear-rules.5.in +++ b/gear-rules.5.in @@ -380,6 +380,12 @@ unless the path part of .I new_tree_path is \*(lq.\*(rq, in which case the default is .BR @name@\-@version@\-@release@.patch . +.TP +.BI exclude= glob_pattern +All the files that match the +.B glob_pattern +are excluded from the patch generation. This option can be specified multiple +times. .RE .IP Value of the @@ -541,6 +547,19 @@ However, if a prerelease version is packaged, parts like \*(lqpreN\*(rq or \*(lqrcN\*(rq should not be included in the package version, therefore the rule file will need some modifications for such versions. +.PP +You can also want to exclude +.BR .gear +subdirectory and spec file from diff generation: +.RS 4 +.PP +.ft CW +.nf +tar: v@version@:. +diff: v@version@:. . exclude=.gear/** exclude=*.spec +.fi +.RE +.PP . .SS "Archive with unmodified sources and separate patch files" If you prefer to maintain patch files for local modifications instead diff --git a/gear-store-tags b/gear-store-tags index a649b66..fdb82e1 100755 --- a/gear-store-tags +++ b/gear-store-tags @@ -162,6 +162,10 @@ find_tags_in_diff_options() ;; name=*) ;; + exclude=*) + [ -z "$(printf %s "${opt#exclude=}" |tr -d '[:alnum:]_.?*-/![]')" ] || + rules_info "Invalid diff exclude pattern specified: ${opt#exclude=}" + ;; *) rules_info "Unrecognized option \"$opt\" ignored" ;; esac -- 2.29.2
next reply other threads:[~2020-11-27 13:44 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-27 13:44 Vladimir D. Seleznev [this message] 2020-11-27 13:44 ` [devel] [PATCH v4 2/2] tests: add test for diff exclude option Vladimir D. Seleznev 2020-12-07 14:30 ` [devel] [PATCH v4 1/2] Add diff exclude option for gear-rules Vladimir D. Seleznev 2020-12-07 16:58 ` Dmitry V. Levin 2020-12-07 17:07 ` Alexey Gladkov 2020-12-07 17:19 ` Dmitry V. Levin 2020-12-07 17:29 ` Alexey Gladkov 2020-12-07 17:57 ` Vladimir D. Seleznev
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201127134431.3854941-1-vseleznv@altlinux.org \ --to=vseleznv@altlinux.org \ --cc=devel@lists.altlinux.org \ --cc=legion@altlinux.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
ALT Linux Team development discussions This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \ devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru public-inbox-index devel Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git