Attachment #54821 for bug #124323

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 124323
Collapse All | Expand All




     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static FileInformation getSingleStatus(File repository, String cwd, String filename)  throws HgException{
        if(HgUtils.isIgnored(new File(cwd))){
            return new FileInformation(FileInformation.STATUS_NOTVERSIONED_EXCLUDED,null, false);
        }
        
        FileInformation info = null;
        List<String> list = doSingleStatusCmd(repository, cwd, filename);
        if(list == null || list.isEmpty())
            return new FileInformation(FileInformation.STATUS_UNKNOWN,null, false);
        
        if(HgUtils.isIgnored(new File(cwd))){
            Mercurial.LOG.log(Level.FINE, "getSingleStatus(): Excluded File - StatusLine: {0} Status: EXCLUDED  RepoPath:{2} cwd:{3}", // NOI18N
                    new Object[] {list.get(0), filename, repository.getAbsolutePath(), cwd} );
            return new FileInformation(FileInformation.STATUS_NOTVERSIONED_EXCLUDED,null, false);
        }
        
        info =  getFileInformationFromStatusLine(list.get(0));
        // Handles Copy status
        // Could save copy source in FileStatus but for now we don't need it.

Return to bug 124323

Lines 1495-1512 Link Here

(-)versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java (-6 / +3 lines)
1495	* @throws org.netbeans.modules.mercurial.HgException	1495	* @throws org.netbeans.modules.mercurial.HgException
1496	*/	1496	*/
1497	public static FileInformation getSingleStatus(File repository, String cwd, String filename) throws HgException{	1497	public static FileInformation getSingleStatus(File repository, String cwd, String filename) throws HgException{
		1498	if(HgUtils.isIgnored(new File(cwd))){
		1499	return new FileInformation(FileInformation.STATUS_NOTVERSIONED_EXCLUDED,null, false);
		1500	}
1498		1501
1499	FileInformation info = null;	1502	FileInformation info = null;
1500	List<String> list = doSingleStatusCmd(repository, cwd, filename);	1503	List<String> list = doSingleStatusCmd(repository, cwd, filename);
1501	if(list == null \|\| list.isEmpty())	1504	if(list == null \|\| list.isEmpty())
1502	return new FileInformation(FileInformation.STATUS_UNKNOWN,null, false);	1505	return new FileInformation(FileInformation.STATUS_UNKNOWN,null, false);
1503		1506
1504	if(HgUtils.isIgnored(new File(cwd))){
1505	Mercurial.LOG.log(Level.FINE, "getSingleStatus(): Excluded File - StatusLine: {0} Status: EXCLUDED RepoPath:{2} cwd:{3}", // NOI18N
1506	new Object[] {list.get(0), filename, repository.getAbsolutePath(), cwd} );
1507	return new FileInformation(FileInformation.STATUS_NOTVERSIONED_EXCLUDED,null, false);
1508	}
1509
1510	info = getFileInformationFromStatusLine(list.get(0));	1507	info = getFileInformationFromStatusLine(list.get(0));
1511	// Handles Copy status	1508	// Handles Copy status
1512	// Could save copy source in FileStatus but for now we don't need it.	1509	// Could save copy source in FileStatus but for now we don't need it.