Show More
@@ -184,7 +184,13 b' fn dispatch_found(' | |||||
184 | || other_parent |
|
184 | || other_parent | |
185 | || copy_map.contains_key(filename.as_ref()) |
|
185 | || copy_map.contains_key(filename.as_ref()) | |
186 | { |
|
186 | { | |
187 | Dispatch::Modified |
|
187 | if metadata.is_symlink() && size_changed { | |
|
188 | // issue6456: Size returned may be longer due to encryption | |||
|
189 | // on EXT-4 fscrypt. TODO maybe only do it on EXT4? | |||
|
190 | Dispatch::Unsure | |||
|
191 | } else { | |||
|
192 | Dispatch::Modified | |||
|
193 | } | |||
188 | } else if mod_compare(mtime, st_mtime as i32) |
|
194 | } else if mod_compare(mtime, st_mtime as i32) | |
189 | || st_mtime == options.last_normal_time |
|
195 | || st_mtime == options.last_normal_time | |
190 | { |
|
196 | { |
@@ -199,6 +199,12 b' impl HgMetadata {' | |||||
199 | st_ctime: metadata.ctime(), |
|
199 | st_ctime: metadata.ctime(), | |
200 | } |
|
200 | } | |
201 | } |
|
201 | } | |
|
202 | ||||
|
203 | pub fn is_symlink(&self) -> bool { | |||
|
204 | // This is way too manual, but `HgMetadata` will go away in the | |||
|
205 | // near-future dirstate rewrite anyway. | |||
|
206 | self.st_mode & 0170000 == 0120000 | |||
|
207 | } | |||
202 | } |
|
208 | } | |
203 |
|
209 | |||
204 | /// Returns the canonical path of `name`, given `cwd` and `root` |
|
210 | /// Returns the canonical path of `name`, given `cwd` and `root` |
General Comments 0
You need to be logged in to leave comments.
Login now