diff options
| -rwxr-xr-x | hgimport | 6 | ||||
| -rwxr-xr-x | v4l/scripts/hg-pull-req.pl | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -104,6 +104,6 @@ done # To cherry pick all files, you can do something like: -#for i in $TMP/newpatches/*; do -# hg import $i; -#done +for i in $TMP/newpatches/*; do + hg import $i; +done diff --git a/v4l/scripts/hg-pull-req.pl b/v4l/scripts/hg-pull-req.pl index 66de967eb..09f0b513f 100755 --- a/v4l/scripts/hg-pull-req.pl +++ b/v4l/scripts/hg-pull-req.pl @@ -81,9 +81,11 @@ if (`hg outgoing $from_repo` !~ /^no changes found$/m || open IN, "hg outgoing -M $to_repo |"; while(<IN>) { - if(/^changeset:\s+\d+:([[:xdigit:]]{12})$/) { + if(/^changeset:\s+\d+:([[:xdigit:]]+)$/) { push @changesets, $1; - } elsif(/^summary:\s+(\S.*)$/) { + } elsif(/^description:$/) { + $_ = <IN>; + /^(\S.*)$/; if ($1 =~ /^merge:/) { # Skip merge changesets pop @changesets; |