| @@ -12,7 +12,7 public class MercurialPlugin implements | |||||
| 12 | def tagVersion; |
|
12 | def tagVersion; | |
| 13 | def tagDistance; |
|
13 | def tagDistance; | |
| 14 |
|
14 | |||
| 15 | def match = (rev =~ /^v(\d+\.\d+\.\d+).*-(\d+)$/); |
|
15 | def match = (rev =~ /^v(\d+\.\d+\.\d+(?:-\w+)?).*-(\d+)$/); | |
| 16 |
|
16 | |||
| 17 | if (match.size()) { |
|
17 | if (match.size()) { | |
| 18 | tagVersion = match[0][1]; |
|
18 | tagVersion = match[0][1]; | |
| @@ -166,7 +166,7 export function each(obj: any, cb: any, | |||||
| 166 | * own properties of the source are entirely copied to the destination. |
|
166 | * own properties of the source are entirely copied to the destination. | |
| 167 | * |
|
167 | * | |
| 168 | */ |
|
168 | */ | |
| 169 | export function mixin<T extends object, S extends object>(dest: T, source: S, template?: keyof S[]): T & S; |
|
169 | export function mixin<T extends object, S extends object>(dest: T, source: S, template?: (keyof S)[]): T & S; | |
| 170 | export function mixin<T extends object, S extends object, R extends object = T>(dest: T, source: S, template: { [p in keyof S]?: keyof R; }): T & R; |
|
170 | export function mixin<T extends object, S extends object, R extends object = T>(dest: T, source: S, template: { [p in keyof S]?: keyof R; }): T & R; | |
| 171 | export function mixin<T extends object, S extends object>(dest: T, source: S, template?: any): any { |
|
171 | export function mixin<T extends object, S extends object>(dest: T, source: S, template?: any): any { | |
| 172 | argumentNotNull(dest, "dest"); |
|
172 | argumentNotNull(dest, "dest"); | |
General Comments 0
You need to be logged in to leave comments.
Login now
