# This patch file was generated by NetBeans IDE # This patch can be applied using context Tools: Apply Diff Patch action on respective folder. # It uses platform neutral UTF-8 encoding. # Above lines and this line are ignored by the patching process. Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiff.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiff.java Base (1.6) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiff.java Locally Modified (Based On 1.6) Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffPanel.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffPanel.java Base (1.5) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffPanel.java Locally Modified (Based On 1.5) @@ -83,7 +83,9 @@ public String getSelectedRevision() { String revStr = (String) revisionsComboBox.getSelectedItem(); + if (revStr != null) { revStr = revStr.substring(0, revStr.indexOf(" ")); // NOI18N + } return revStr; } @@ -176,7 +178,7 @@ } private void refreshRevisions() { - java.util.List targetRevsList = HgCommand.getAllRevisions(repository); + java.util.List targetRevsList = HgCommand.getRevisions(repository, HG_REVISION_TARGET_LIMIT); Set targetRevsSet = new LinkedHashSet(); @@ -187,7 +189,7 @@ }else{ size = targetRevsList.size(); int i = 0 ; - while( i < size && i < HG_REVISION_TARGET_LIMIT){ + while(i < size){ targetRevsSet.add(targetRevsList.get(i)); i++; } @@ -217,15 +219,6 @@ fileChooser.removeChoosableFileFilter(fileFilter); } - //fileChooser.addChoosableFileFilter(new FileFilter() { - // public boolean accept(File f) { - // return f.isDirectory(); - // } - // public String getDescription() { - // return NbBundle.getMessage(ExportDiffPanel.class, "Folders");// NOI18N - // } - //}); - //fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); fileChooser.showDialog(this, NbBundle.getMessage(ExportDiffPanel.class, "OK_Button")); // NO I18N File f = fileChooser.getSelectedFile(); if (f != null) { Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/status/VersioningPanel.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/status/VersioningPanel.java Base (1.12) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/status/VersioningPanel.java Locally Modified (Based On 1.12) @@ -139,7 +139,7 @@ public void refreshUpdateTargets(File repository) { if( repository == null) return; - java.util.List targetRevsList = HgCommand.getAllRevisions(repository); + java.util.List targetRevsList = HgCommand.getRevisions(repository, HG_UPDATE_TARGET_LIMIT); Set targetRevsSet = new LinkedHashSet(); int size; @@ -149,7 +149,7 @@ }else{ size = targetRevsList.size(); int i = 0 ; - while( i < size && i < HG_UPDATE_TARGET_LIMIT){ + while(i < size){ targetRevsSet.add(targetRevsList.get(i)); i++; } Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/update/RevertModificationsPanel.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/update/RevertModificationsPanel.java Base (1.8) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/update/RevertModificationsPanel.java Locally Modified (Based On 1.8) @@ -149,7 +149,7 @@ } private void refreshRevisions() { - java.util.List targetRevsList = HgCommand.getAllRevisionsForFile(repository, revertFiles); + java.util.List targetRevsList = HgCommand.getRevisionsForFile(repository, revertFiles, HG_REVERT_TARGET_LIMIT); Set targetRevsSet = new LinkedHashSet(); @@ -160,7 +160,7 @@ }else{ size = targetRevsList.size(); int i = 0 ; - while( i < size && i < HG_REVERT_TARGET_LIMIT){ + while(i < size){ targetRevsSet.add(targetRevsList.get(i)); i++; } Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java Base (1.66) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java Locally Modified (Based On 1.66) @@ -122,7 +122,8 @@ private static final String HG_REMOVE_FLAG_FORCE_CMD = "--force"; // NOI18N private static final String HG_LOG_CMD = "log"; // NOI18N - private static final String HG_LOG_LIMIT_CMD = "-l 1"; // NOI18N + private static final String HG_LOG_LIMIT_ONE_CMD = "-l 1"; // NOI18N + private static final String HG_LOG_LIMIT_CMD = "-l"; // NOI18N private static final String HG_LOG_TEMPLATE_SHORT_CMD = "--template={rev}\\n{desc|firstline}\\n{date|hgdate}\\n{node|short}\\n"; // NOI18N private static final String HG_LOG_TEMPLATE_LONG_CMD = "--template={rev}\\n{desc}\\n{date|hgdate}\\n{node|short}\\n"; // NOI18N private static final String HG_CSET_TEMPLATE_CMD = "--template={rev}:{node|short}\\n"; // NOI18N @@ -608,7 +609,7 @@ command.add(getHgCommand()); command.add(HG_LOG_CMD); - command.add(HG_LOG_LIMIT_CMD); + command.add(HG_LOG_LIMIT_ONE_CMD); command.add(HG_OPT_REPOSITORY); command.add(repository.getAbsolutePath()); @@ -1197,15 +1198,20 @@ * * @param File repository of the mercurial repository's root directory * @param files to query revisions for + * @param Int limit on nunmber of revisions (-1 for no limit) * @return List list of the revisions of the file - {:} * or null if no commits made yet. */ - public static List getAllRevisionsForFile(File repository, File[] files) { + public static List getRevisionsForFile(File repository, File[] files, int limit) { if (repository == null) return null; List command = new ArrayList(); command.add(getHgCommand()); command.add(HG_LOG_CMD); + if (limit >= 0) { + command.add(HG_LOG_LIMIT_CMD); + command.add(Integer.toString(limit)); + } command.add(HG_OPT_REPOSITORY); command.add(repository.getAbsolutePath()); command.add(HG_CSET_TARGET_TEMPLATE_CMD); @@ -1225,15 +1231,15 @@ } /** - * Get all the revisions for a repository + * Get the revisions for a repository * * @param File repository of the mercurial repository's root directory * @return List list of the revisions of the repository - {:} * or null if no commits made yet. */ - public static List getAllRevisions(File repository) { + public static List getRevisions(File repository, int limit) { if (repository == null) return null; - return getAllRevisionsForFile(repository, null); + return getRevisionsForFile(repository, null, limit); } /** @@ -1470,7 +1476,7 @@ command.add(getHgCommand()); command.add(HG_LOG_CMD); - command.add(HG_LOG_LIMIT_CMD); + command.add(HG_LOG_LIMIT_ONE_CMD); command.add(HG_OPT_REPOSITORY); command.add(repository.getAbsolutePath()); command.add(template);