diff --git a/src/ui/entry.rs b/src/ui/entry.rs index 9ee8bf6..74efc17 100644 --- a/src/ui/entry.rs +++ b/src/ui/entry.rs @@ -3,6 +3,7 @@ use gtk::prelude::*; use std::rc::Rc; use gtk::WidgetExt; use libpijul; +use libpijul::fs_representation::*; use std::path::Path; @@ -47,7 +48,7 @@ pub fn init(appstate: Rc) { { let ls = gtk::ListStore::new(&[gtk::Type::String]); - let branches = get_branches("/home/hasufell/git/pijul/.pijul/pristine"); + let branches = get_branches("/home/hasufell/git/pijul"); for branch in branches { ls.insert_with_values(None, &[0], &[&branch.as_str()]); @@ -69,7 +70,7 @@ pub fn init(appstate: Rc) { { let ls = gtk::ListStore::new(&[gtk::Type::String]); - let patches = get_patches("/home/hasufell/git/pijul/.pijul/pristine", + let patches = get_patches("/home/hasufell/git/pijul", "master"); for patch in patches { ls.insert_with_values(None, &[0], &[&patch.as_str()]); @@ -96,7 +97,7 @@ pub fn init(appstate: Rc) { fn get_branches(path: &str) -> Vec { let mut vec = Vec::new(); - let repo = libpijul::Repository::open(path, None).unwrap(); + let repo = libpijul::Repository::open(pristine_dir(path), None).unwrap(); let txn = repo.txn_begin().unwrap(); let branches = txn.iter_branches(None).map(|x| String::from(x.name.as_str())); @@ -109,13 +110,13 @@ fn get_branches(path: &str) -> Vec { fn get_patches(path: &str, branch: &str) -> Vec { let mut vec = Vec::new(); - let repo = libpijul::Repository::open(path, None).unwrap(); + let repo = libpijul::Repository::open(pristine_dir(path), None).unwrap(); let txn = repo.txn_begin().unwrap(); let branch = txn.get_branch(branch).unwrap(); let patches = txn.iter_patches(&branch, None).map(|x| { - let p = libpijul::fs_representation::read_patch(Path::new("/home/hasufell/git/pijul"), + let p = libpijul::fs_representation::read_patch(Path::new(path), txn.external_hash(x.0)).unwrap(); p.header().name.clone() });