Attachment #61907 for bug #134937

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 134937
Collapse All | Expand All

Lines 866-871 public class FileStatusCache { Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/FileStatusCache.java (+4 lines)
866	listenerSupport.firePropertyChange(PROP_FILE_STATUS_CHANGED, null, new ChangedEvent(file, oldInfo, newInfo));	866	listenerSupport.firePropertyChange(PROP_FILE_STATUS_CHANGED, null, new ChangedEvent(file, oldInfo, newInfo));
867	}	867	}
868		868
		869	public void notifyFileChanged(File file) {
		870	fireFileStatusChanged(file, null, FILE_INFORMATION_UPTODATE);
		871	}
		872
869	public void refreshDirtyFileSystems() {	873	public void refreshDirtyFileSystems() {
870	Set<FileSystem> filesystems = getFilesystemsToRefresh();	874	Set<FileSystem> filesystems = getFilesystemsToRefresh();
871	FileSystem[] filesystemsToRefresh = new FileSystem[filesystems.size()];	875	FileSystem[] filesystemsToRefresh = new FileSystem[filesystems.size()];

Lines 405-410 public class Mercurial { Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/Mercurial.java (+4 lines)
405	}	405	}
406	}	406	}
407		407
		408	public void notifyFileChanged(File file) {
		409	fileStatusCache.notifyFileChanged(file);
		410	}
		411
408	/**	412	/**
409	*	413	*
410	* @param repositoryRoot String of Mercurial repository so that logger writes to correct output tab. Can be null	414	* @param repositoryRoot String of Mercurial repository so that logger writes to correct output tab. Can be null

Lines 123-128 public class PushAction extends ContextA Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/ui/push/PushAction.java (+17 lines)
123		123
124	}	124	}
125		125
		126	private static void notifyUpdatedFiles(File pushFile, List<String> list){
		127	// When hg output -v is called the output is
		128	// resolving manifests
		129	// getting file
		130	// ...
		131	//
		132	for (String line : list) {
		133	if (line.startsWith("getting ")) {
		134	String name = line.substring(8);
		135	File file = new File (pushFile, name);
		136	Mercurial.getInstance().notifyFileChanged(file);
		137	}
		138	}
		139	}
		140
126	static void getDefaultAndPerformPush(VCSContext ctx, File root, OutputLogger logger) {	141	static void getDefaultAndPerformPush(VCSContext ctx, File root, OutputLogger logger) {
127	// If the repository has no default pull path then inform user	142	// If the repository has no default pull path then inform user
128	String tmpPushPath = HgRepositoryContextCache.getPushDefault(ctx);	143	String tmpPushPath = HgRepositoryContextCache.getPushDefault(ctx);
Lines 258-263 public class PushAction extends ContextA Link Here
258	boolean bOutStandingUncommittedMerges = HgCommand.isMergeAbortUncommittedMsg(list.get(list.size() - 1));	273	boolean bOutStandingUncommittedMerges = HgCommand.isMergeAbortUncommittedMsg(list.get(list.size() - 1));
259	if (bOutStandingUncommittedMerges) {	274	if (bOutStandingUncommittedMerges) {
260	bConfirmMerge = HgUtils.confirmDialog(PushAction.class, "MSG_PUSH_MERGE_CONFIRM_TITLE", "MSG_PUSH_MERGE_UNCOMMITTED_CONFIRM_QUERY"); // NOI18N	275	bConfirmMerge = HgUtils.confirmDialog(PushAction.class, "MSG_PUSH_MERGE_CONFIRM_TITLE", "MSG_PUSH_MERGE_UNCOMMITTED_CONFIRM_QUERY"); // NOI18N
		276	} else {
		277	notifyUpdatedFiles(pushFile, list);
261	}	278	}
262	}	279	}
263	} else {	280	} else {

Lines 339-344 public class HgCommand { Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java (+1 lines)
339		339
340	command.add(getHgCommand());	340	command.add(getHgCommand());
341	command.add(HG_UPDATE_ALL_CMD);	341	command.add(HG_UPDATE_ALL_CMD);
		342	command.add(HG_VERBOSE_CMD);
342	if (bForce) command.add(HG_UPDATE_FORCE_ALL_CMD);	343	if (bForce) command.add(HG_UPDATE_FORCE_ALL_CMD);
343	command.add(HG_OPT_REPOSITORY);	344	command.add(HG_OPT_REPOSITORY);
344	command.add(repository.getAbsolutePath());	345	command.add(repository.getAbsolutePath());

Return to bug 134937