|
Lines 3930-3937
Link Here
|
| 3930 |
if (isCallEditFilesOn()) { |
3930 |
if (isCallEditFilesOn()) { |
| 3931 |
if (!file.canWrite ()) { |
3931 |
if (!file.canWrite ()) { |
| 3932 |
FileObject fo = findResource(name); |
3932 |
FileObject fo = findResource(name); |
| 3933 |
FileProperties fprops = Turbo.getCachedMeta(fo); |
3933 |
// Get really cached attribute in any case (from memory or disk layer). |
| 3934 |
if (fprops != null && !fprops.isLocal () && !name.endsWith (".orig")) { // NOI18N |
3934 |
FileProperties fprops = (FileProperties) FileAttributeQuery.getDefault().readAttribute(fo, FileProperties.ID); |
|
|
3935 |
boolean local = (fprops != null) ? fprops.isLocal() : false; |
| 3936 |
if (!local && !name.endsWith (".orig")) { // NOI18N |
| 3935 |
if (isPromptForEditOn()) { |
3937 |
if (isPromptForEditOn()) { |
| 3936 |
VcsConfigVariable msgVar = (VcsConfigVariable) variablesByName.get(Variables.MSG_PROMPT_FOR_AUTO_EDIT); |
3938 |
VcsConfigVariable msgVar = (VcsConfigVariable) variablesByName.get(Variables.MSG_PROMPT_FOR_AUTO_EDIT); |
| 3937 |
String message; |
3939 |
String message; |
|
Lines 3946-3952
Link Here
|
| 3946 |
} |
3948 |
} |
| 3947 |
if (isLockFilesOn()) { |
3949 |
if (isLockFilesOn()) { |
| 3948 |
FileObject fo = findResource(name); |
3950 |
FileObject fo = findResource(name); |
| 3949 |
FileProperties fprops = Turbo.getCachedMeta(fo); |
3951 |
// Get really cached attribute in any case (from memory or disk layer). |
|
|
3952 |
FileProperties fprops = (FileProperties) FileAttributeQuery.getDefault().readAttribute(fo, FileProperties.ID); |
| 3950 |
boolean local = fprops != null ? fprops.isLocal() : false; |
3953 |
boolean local = fprops != null ? fprops.isLocal() : false; |
| 3951 |
// *.orig is a temporary file created by AbstractFileObject |
3954 |
// *.orig is a temporary file created by AbstractFileObject |
| 3952 |
// on saving every file to enable undo if saving fails |
3955 |
// on saving every file to enable undo if saving fails |
|
Lines 4105-4112
Link Here
|
| 4105 |
if(isLockFilesOn ()) { |
4108 |
if(isLockFilesOn ()) { |
| 4106 |
FileObject fo = findResource(name); |
4109 |
FileObject fo = findResource(name); |
| 4107 |
assert fo != null : "No resource for '"+name+"'"; // NOI18N |
4110 |
assert fo != null : "No resource for '"+name+"'"; // NOI18N |
| 4108 |
FileProperties fprops = Turbo.getCachedMeta(fo); |
4111 |
// Get really cached attribute in any case (from memory or disk layer). |
| 4109 |
if (fprops != null && !fprops.isLocal () && !name.endsWith (".orig")) { // NOI18N |
4112 |
FileProperties fprops = (FileProperties) FileAttributeQuery.getDefault().readAttribute(fo, FileProperties.ID); |
|
|
4113 |
boolean local = (fprops != null) ? fprops.isLocal() : false; |
| 4114 |
if (!local && !name.endsWith (".orig")) { // NOI18N |
| 4110 |
Command command = createCommand("UNLOCK", name, null); |
4115 |
Command command = createCommand("UNLOCK", name, null); |
| 4111 |
if (command != null) { |
4116 |
if (command != null) { |
| 4112 |
boolean customized = VcsManager.getDefault().showCustomizer(command); |
4117 |
boolean customized = VcsManager.getDefault().showCustomizer(command); |