Skip to content

Commit fcfdf53

Browse files
author
fossdd
committed
Update pijul
1 parent 4cadc91 commit fcfdf53

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Changelog
2+
3+
## 1.0.0-beta.1
4+
5+
### Fixed
6+
7+
- Fixed a failed assertion in the patch text format.
8+
- Fixed a "merged vertices" bug when moving files and editing them in the same patch, where the new name was "glued" to the new lines inside the file, causing confusion.
9+
- Fixed a performance issue on Windows, where canonicalizing paths can cause a significant slowdown (1ms for each file).

libpijul/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "libpijul"
33
description = "Core library of Pijul, a distributed version control system based on a sound theory of collaborative work."
4-
version = "1.0.0-beta"
4+
version = "1.0.0-beta.1"
55

66
repository = "https://nest.pijul.com/pijul/libpijul"
77
documentation = "https://docs.rs/libpijul"

libpijul/src/working_copy/filesystem.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -282,15 +282,13 @@ impl FileSystem {
282282
}
283283
}
284284
debug!("entry path = {:?} {:?}", entry.path(), repo_path);
285-
if let Ok(entry_path) = CanonicalPathBuf::canonicalize(entry.path()) {
286-
if let Ok(path) = entry_path.as_path().strip_prefix(&repo_path) {
287-
let is_dir = entry.file_type().unwrap().is_dir();
288-
if sender.send((path.to_path_buf(), is_dir)).is_err() {
289-
return ignore::WalkState::Quit;
290-
}
291-
} else {
292-
debug!("entry = {:?}", entry.path());
285+
if let Ok(path) = entry.path().strip_prefix(&repo_path) {
286+
let is_dir = entry.file_type().unwrap().is_dir();
287+
if sender.send((path.to_path_buf(), is_dir)).is_err() {
288+
return ignore::WalkState::Quit;
293289
}
290+
} else {
291+
debug!("entry = {:?}", entry.path());
294292
}
295293
ignore::WalkState::Continue
296294
})

0 commit comments

Comments
 (0)