# HG changeset patch # User padraigob@netbeans.org # Date 1202384792 0 # Node ID d69d0b2af66a43e3ae33d263743ea1bb3d2e6743 # Parent 985f801f9126ff95cca21880e12b5beba05a56b3 123735: Correct isIgnored for .hgignore diff -r 985f801f9126 -r d69d0b2af66a mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java --- a/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java Thu Feb 07 09:28:14 2008 +0000 +++ b/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java Thu Feb 07 11:46:32 2008 +0000 @@ -246,7 +246,8 @@ public class HgUtils { public static boolean isIgnored(File file, boolean checkSharability){ if (file == null) return false; - String name = file.getPath(); + String path = file.getPath(); + String name = file.getName(); File topFile = Mercurial.getInstance().getTopmostManagedParent(file); // We assume that the toplevel directory should not be ignored. @@ -266,7 +267,7 @@ public class HgUtils { for (Iterator i = patterns.iterator(); i.hasNext();) { Pattern pattern = (Pattern) i.next(); - if (pattern.matcher(name).find()) { + if (pattern.matcher(path).find()) { return true; } }