Attachment 855797 Details for Bug 1058076 – Proposed patch

[patch] Proposed patch

implement_macros_with_inline_shell_command.patch (text/plain), 1.71 KB, created by Igor Gnatenko on 2014-01-26 21:46:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Gnatenko

Created: 2014-01-26 21:46:11 UTC

Size: 1.71 KB

patch

obsolete

># HG changeset patch
># User Igor Gnatenko <i.gnatenko.brain@gmail.com>
># Date 1390772482 -14400
>#      Mon Jan 27 01:41:22 2014 +0400
># Node ID 092c0d01eec6b3579e9e9313d747b41b383da526
># Parent  c9cad40b418113f62ce3481f66351137b90910ef
>spec: implement macros with inline shell command
>
>test spec:
>%define shortcommit %(c=0bff2a6fb8f9c879aa72e3b11e48e022b5bac790; echo ${c:0:7})
>Name:           cmd
>Version:        0.1
>Release:        1.git%{shortcommit}%{?dist}
>%changelog
>
>Command inside %() is shell command, which we should execute
>
>diff -r c9cad40b4181 -r 092c0d01eec6 runtime/ftplugin/spec.vim
>--- a/runtime/ftplugin/spec.vim	Fri Jan 24 19:55:37 2014 +0100
>+++ b/runtime/ftplugin/spec.vim	Mon Jan 27 01:41:22 2014 +0400
>@@ -151,7 +151,26 @@
> 		let definestr = "^[ \t]*%define[ \t]\\+" . varname . "[ \t]\\+\$.*\$$"
> 		let linenum = search(definestr, "bW")
> 		if (linenum != -1)
>-			let ret = ret .  substitute(getline(linenum), definestr, "\\1", "")
>+			let macro = substitute(getline(linenum), definestr, "\\1", "")
>+			let start = match(macro, "^%(")
>+			if (start != -1)
>+				let end = match(macro, ")$")
>+				let cmd = strpart(macro, start+2, end-(start+2))
>+				let ans = ""
>+				while (ans !~? '^[yn]$')
>+					let msg = "cmd: Execute " . cmd . "? ([y]es/[n]o) "
>+					let ans = input(msg)
>+				endwhile
>+				if (ans =~? "^y$")
>+					" TODO: Implement using with inside variables like this:
>+					" %define commit      0bff2a6fb8f9c879aa72e3b11e48e022b5bac790
>+					" %define shortcommit %(c=%{commit}; echo ${c:0:7})
>+					let cmd_output = join(split(system(cmd), "\n"))
>+					let ret = ret . cmd_output
>+				else
>+					let ret = ret . macro
>+				endif
>+			endif
> 		else
> 			let ret = ret . strpart(str, start, end+1-start)
> 		endif

Actions: View | Diff

Attachments on bug 1058076: 855786 | 855797 | 855798 | 855810