[GitHub] matthiasblaesing closed pull request #508: [NETBEANS-643] Mercurial Annotate fails on files with spaces in them …

[GitBox <gi...@apache.org>]

matthiasblaesing closed pull request #508: [NETBEANS-643] Mercurial Annotate fails on files with spaces in them …
URL: https://github.com/apache/incubator-netbeans/pull/508
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/annotate/AnnotateAction.java b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/annotate/AnnotateAction.java
index ea9470a54b..981fd7106f 100644
--- a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/annotate/AnnotateAction.java
+++ b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/annotate/AnnotateAction.java
@@ -292,7 +292,10 @@ private static void fillCommitMessages(AnnotateLine [] annotations, HgLogMessage
         
         List<AnnotateLine> lines = new ArrayList<AnnotateLine>();
         int i = 0;
-        Pattern p = Pattern.compile("^\\s*(\\S+\\b)\\s+(\\d+)\\s+(\\b\\S*):\\s*(\\d+):\\s(.*)$"); //NOI18N
+        //using "(\S.*?)" instead of "(\b\S*)" since files can contain spaces
+        //and start with dots. "\S" will match the first character and
+        //will lazily match the rest of the file.
+        Pattern p = Pattern.compile("^\\s*(\\S+\\b)\\s+(\\d+)\\s+(\\S.*?):\\s*(\\d+):\\s(.*)$"); //NOI18N
         for (String line : annotations) {
             i++;
             Matcher m = p.matcher(line);


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists