Skip to content

Fix branch latest update on explicit remote sync #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
piyushbag wants to merge 1 commit into
base: main
Choose a base branch
from
+62 −12
Open

Fix branch latest update on explicit remote sync #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lore-revision/src/revision/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,11 @@ pub async fn sync(

let mut revision;
if let Some(revision_string) = options.revision.as_ref() {
location = match execution_context().globals().search_location() {
revision::ResolveSearchLocation::Remote => LoreBranchLocation::Remote,
revision::ResolveSearchLocation::Local
| revision::ResolveSearchLocation::RemoteOrLocal => LoreBranchLocation::Local,
};
revision = revision::resolve(
repository.clone(),
revision_string,
Expand Down Expand Up @@ -632,14 +637,14 @@ pub async fn sync(
if location == LoreBranchLocation::Remote {
branch::store_latest(
repository.clone(),
branch_id,
synced_branch,
revision,
BranchLatestStatus::Convergent,
)
.await
.internal("Failed to store revision as current branch latest")?;

branch::store_last_sync(repository, branch_id, revision).await;
branch::store_last_sync(repository, synced_branch, revision).await;
}
}

Expand Down
65 changes: 55 additions & 10 deletions lore-revision/tests/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ mod tests {
use lore_revision::commit;
use lore_revision::commit::CommitOptions;
use lore_revision::file;
use lore_revision::instance;
use lore_revision::interface::ExecutionContext;
use lore_revision::interface::LoreArray;
use lore_revision::interface::LoreString;
use lore_revision::lore::RepositoryId;
use lore_revision::node::NodeFlags;
use lore_revision::relay::EventDispatcher;
use lore_revision::repository;
use lore_revision::revision::sync;
use lore_revision::revision::sync::SyncOptions;
Expand Down Expand Up @@ -134,7 +137,11 @@ mod tests {
.await
.expect("Failed to commit revision");

// Sync back to first revision
let (_current_revision, branch_id) = instance::load_current_anchor(&repository)
.await
.expect("Failed to load current anchor");

// Sync back to first revision (local search keeps branch latest unchanged)
Box::pin(sync::sync(
repository.clone(),
&write_token,
Expand All @@ -147,6 +154,14 @@ mod tests {
.await
.expect("Failed to sync back to first revision");

let latest_after_back = branch::load_latest(repository.clone(), branch_id)
.await
.expect("Failed to load branch latest after sync back");
assert_eq!(
latest_after_back, second_signature,
"Local explicit sync should not move branch latest backwards"
);

// Verify file added in first revision is still there
assert!(
fs::metadata(file_path.as_path())
Expand All @@ -159,18 +174,48 @@ mod tests {
"File added in second revision was not removed as expected after sync back",
);

// Sync forward to second revision
Box::pin(sync::sync(
// Simulate stale branch latest after an explicit remote sync bug
branch::store_latest(
repository.clone(),
&write_token,
SyncOptions {
revision: Some(second_signature.to_string()),
filter_mode: lore_revision::filter::FilterMode::Full,
branch_id,
first_signature,
branch::BranchLatestStatus::Convergent,
)
.await
.expect("Failed to seed stale branch latest");

let remote_execution = std::sync::Arc::new(ExecutionContext::new_client(
LoreGlobalArgs {
remote: 1,
..Default::default()
},
))
.await
.expect("Failed to sync forward to second revision");
EventDispatcher::no_dispatch(),
));

// Sync forward to second revision with explicit remote search location
LORE_CONTEXT
.scope(
remote_execution,
Box::pin(sync::sync(
repository.clone(),
&write_token,
SyncOptions {
revision: Some(second_signature.to_string()),
filter_mode: lore_revision::filter::FilterMode::Full,
..Default::default()
},
)),
)
.await
.expect("Failed to sync forward to second revision");

let latest_after_forward = branch::load_latest(repository.clone(), branch_id)
.await
.expect("Failed to load branch latest after sync forward");
assert_eq!(
latest_after_forward, second_signature,
"Explicit remote sync should update branch latest pointer"
);

// Verify file added in first revision is still there
assert!(
Expand Down