pijul/*: reorganize imports and remove extern crate

[?]
Nov 19, 2020, 8:07 PM
L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC

Dependencies

  • [2] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
  • [3] CVAT6LN3 Fixing git import, and adding more useful feedback (with `RUST_LOG="pijul=info"`)
  • [4] 5HF7C67M push/pull: fixed "changes" arguments
  • [5] M3VTIZCP Validate change before reset
  • [6] 76PCXGML Pushing to, and pulling from the local repository
  • [7] AN7IDX26 pijul: added ChangesNotFound error variant
  • [8] BAUL3WR2 Format, versions, README

Change contents

  • edit in pijul/src/repository.rs at line 0
    [2.21431][2.21432:21496]()
    use crate::{config, current_dir, Error};
    use libpijul::DOT_DIR;
  • edit in pijul/src/repository.rs at line 3
    [2.21541]
    [2.21541]
    use libpijul::DOT_DIR;
    use log::debug;
    use crate::{config, current_dir, Error};
  • edit in pijul/src/remote/ssh.rs at line 0
    [2.25380][2.25381:25625]()
    use super::{parse_line, RemoteRef};
    use crate::repository::Repository;
    use crate::Error;
    use byteorder::{BigEndian, ReadBytesExt};
    use libpijul::pristine::{Base32, ChannelRef, Hash, Merkle, MutTxnT};
    use libpijul::MutTxnTExt;
    use regex::Regex;
  • edit in pijul/src/remote/ssh.rs at line 5
    [2.25758]
    [2.25758]
    use byteorder::{BigEndian, ReadBytesExt};
    use lazy_static::lazy_static;
    use libpijul::pristine::{Base32, ChannelRef, Hash, Merkle, MutTxnT};
    use libpijul::MutTxnTExt;
    use log::{debug, error};
    use regex::Regex;
  • edit in pijul/src/remote/ssh.rs at line 14
    [2.25789]
    [2.25789]
    use super::{parse_line, RemoteRef};
    use crate::repository::Repository;
    use crate::Error;
  • replacement in pijul/src/remote/mod.rs at line 0
    [2.52474][2.52475:52519]()
    use crate::repository::*;
    use crate::Error;
    [2.52474]
    [2.52519]
    use std::io::Write;
    use std::path::{Path, PathBuf};
  • replacement in pijul/src/remote/mod.rs at line 6
    [2.52659][2.52659:52711]()
    use std::io::Write;
    use std::path::{Path, PathBuf};
    [2.52659]
    [2.52711]
    use log::debug;
    use crate::repository::*;
    use crate::Error;
  • replacement in pijul/src/remote/local.rs at line 0
    [2.79745][2.79746:79768]()
    use super::RemoteRef;
    [2.79745]
    [2.79768]
    use std::path::{Path, PathBuf};
  • replacement in pijul/src/remote/local.rs at line 4
    [2.79868][2.79868:79900]()
    use std::path::{Path, PathBuf};
    [2.79868]
    [2.79900]
    use log::debug;
    use super::RemoteRef;
  • edit in pijul/src/main.rs at line 0
    [2.83981][2.83982:84208]()
    #[macro_use]
    extern crate clap;
    #[macro_use]
    extern crate thiserror;
    #[macro_use]
    extern crate serde_derive;
    #[macro_use]
    extern crate log;
    #[macro_use]
    extern crate lazy_static;
    use clap::Clap;
    use human_panic::setup_panic;
  • replacement in pijul/src/main.rs at line 4
    [2.84262][2.84262:84279]()
    use commands::*;
    [2.84262]
    [2.84279]
  • edit in pijul/src/main.rs at line 6
    [2.84299]
    [2.84299]
    use std::path::PathBuf;
    use clap::{crate_authors, crate_version, AppSettings, Clap};
    use human_panic::setup_panic;
    use thiserror::Error;
    use crate::commands::*;
  • replacement in pijul/src/main.rs at line 44
    [2.85009][2.85009:85077]()
    #[clap(name = "protocol", setting = clap::AppSettings::Hidden)]
    [2.85009]
    [2.85077]
    #[clap(name = "protocol", setting = AppSettings::Hidden)]
  • replacement in pijul/src/main.rs at line 74
    [2.85778][2.85778:85845]()
    #[clap(name = "upgrade", setting = clap::AppSettings::Hidden)]
    [2.85778]
    [2.85845]
    #[clap(name = "upgrade", setting = AppSettings::Hidden)]
  • replacement in pijul/src/main.rs at line 125
    [2.87666][2.87666:87719]()
    CouldNotReadConfig { path: std::path::PathBuf },
    [2.87666]
    [2.87719]
    CouldNotReadConfig { path: PathBuf },
  • replacement in pijul/src/main.rs at line 182
    [2.89714][2.89714:89774]()
    pub fn current_dir() -> Result<std::path::PathBuf, Error> {
    [2.89714]
    [2.89774]
    pub fn current_dir() -> Result<PathBuf, Error> {
  • edit in pijul/src/config.rs at line 2
    [2.89899]
    [2.89899]
    use log::debug;
    use serde_derive::{Deserialize, Serialize};
  • replacement in pijul/src/commands/upgrade.rs at line 0
    [2.93400][2.93401:93436]()
    use crate::repository::Repository;
    [2.93400]
    [2.93436]
    use std::collections::{HashMap, HashSet};
    use std::path::PathBuf;
    use clap::Clap;
  • replacement in pijul/src/commands/upgrade.rs at line 7
    [2.93560][2.93560:93626]()
    use std::collections::{HashMap, HashSet};
    use std::path::PathBuf;
    [2.93560]
    [2.93626]
    use crate::repository::Repository;
  • edit in pijul/src/commands/unrecord.rs at line 0
    [2.95630][2.95631:95741]()
    use crate::repository::Repository;
    use libpijul::pristine::{Base32, MutTxnT, TxnT};
    use libpijul::MutTxnTExt;
  • edit in pijul/src/commands/unrecord.rs at line 2
    [2.95785]
    [2.95785]
    use clap::Clap;
    use libpijul::pristine::{Base32, MutTxnT, TxnT};
    use libpijul::MutTxnTExt;
    use log::debug;
  • edit in pijul/src/commands/unrecord.rs at line 8
    [2.95786]
    [2.95786]
    use crate::repository::Repository;
  • replacement in pijul/src/commands/reset.rs at line 0
    [2.97650][2.97651:97704]()
    use crate::repository::Repository;
    use crate::Error;
    [2.97650]
    [2.97704]
    use std::path::PathBuf;
    use clap::Clap;
  • replacement in pijul/src/commands/reset.rs at line 5
    [2.97774][2.97774:97798]()
    use std::path::PathBuf;
    [2.97774]
    [2.97798]
    use log::debug;
    use crate::repository::Repository;
    use crate::Error;
  • replacement in pijul/src/commands/record.rs at line 0
    [2.101759][2.101760:101804]()
    use crate::repository::*;
    use crate::Error;
    [2.101759]
    [2.101804]
    use std::collections::HashMap;
    use std::io::Write;
    use std::path::{Path, PathBuf};
  • edit in pijul/src/commands/record.rs at line 5
    [2.101821]
    [2.101821]
    use clap::Clap;
  • replacement in pijul/src/commands/record.rs at line 10
    [2.101974][2.101974:102057]()
    use std::collections::HashMap;
    use std::io::Write;
    use std::path::{Path, PathBuf};
    [2.101974]
    [2.102057]
    use log::{debug, error};
    use serde_derive::{Deserialize, Serialize};
  • edit in pijul/src/commands/record.rs at line 14
    [2.102093]
    [2.102093]
    use crate::repository::*;
    use crate::Error;
  • replacement in pijul/src/commands/pushpull.rs at line 0
    [2.111631][2.111632:111667]()
    use crate::repository::Repository;
    [2.111631]
    [2.111667]
    use std::collections::HashSet;
    use std::io::Write;
    use std::path::PathBuf;
    use clap::Clap;
    use lazy_static::lazy_static;
  • edit in pijul/src/commands/pushpull.rs at line 9
    [2.111785]
    [2.111785]
    use log::debug;
  • replacement in pijul/src/commands/pushpull.rs at line 11
    [2.111803][2.111803:111878]()
    use std::collections::HashSet;
    use std::io::Write;
    use std::path::PathBuf;
    [2.111803]
    [2.111878]
    use crate::repository::Repository;
  • replacement in pijul/src/commands/protocol.rs at line 0
    [2.123281][2.123282:123335]()
    use crate::repository::Repository;
    use crate::Error;
    [2.123281]
    [2.123335]
    use std::collections::HashMap;
    use std::io::BufWriter;
    use std::io::{BufRead, Read, Write};
    use std::path::PathBuf;
  • edit in pijul/src/commands/protocol.rs at line 6
    [2.123378]
    [2.123378]
    use clap::Clap;
    use lazy_static::lazy_static;
  • edit in pijul/src/commands/protocol.rs at line 10
    [2.123476]
    [2.123476]
    use log::{debug, error};
  • replacement in pijul/src/commands/protocol.rs at line 12
    [2.123494][2.123494:123610]()
    use std::collections::HashMap;
    use std::io::BufWriter;
    use std::io::{BufRead, Read, Write};
    use std::path::PathBuf;
    [2.123494]
    [2.123610]
    use crate::repository::Repository;
    use crate::Error;
  • replacement in pijul/src/commands/log.rs at line 0
    [2.134376][2.134377:134430]()
    use crate::repository::Repository;
    use crate::Error;
    [2.134376]
    [2.134430]
    use std::io::Write;
    use std::path::PathBuf;
    use clap::Clap;
  • replacement in pijul/src/commands/log.rs at line 7
    [2.134515][2.134515:134559]()
    use std::io::Write;
    use std::path::PathBuf;
    [2.134515]
    [2.134559]
    use crate::repository::Repository;
    use crate::Error;
  • edit in pijul/src/commands/init.rs at line 0
    [2.136543]
    [2.136544]
    use std::path::PathBuf;
    use clap::Clap;
    use libpijul::pristine::MutTxnT;
  • edit in pijul/src/commands/init.rs at line 6
    [2.136570][2.136570:136627]()
    use libpijul::pristine::MutTxnT;
    use std::path::PathBuf;
  • edit in pijul/src/commands/git.rs at line 0
    [2.137210][2.137211:137281]()
    use crate::repository::*;
    use libpijul::pristine::*;
    use libpijul::*;
  • edit in pijul/src/commands/git.rs at line 5
    [2.137436]
    [2.137436]
    use libpijul::pristine::*;
    use libpijul::*;
    use crate::repository::*;
  • replacement in pijul/src/commands/fork.rs at line 0
    [2.167873][2.167874:167909]()
    use crate::repository::Repository;
    [2.167873]
    [2.167909]
    use std::path::PathBuf;
    use clap::Clap;
  • replacement in pijul/src/commands/fork.rs at line 5
    [2.167976][2.167976:168000]()
    use std::path::PathBuf;
    [2.167976]
    [2.168000]
    use log::debug;
    use crate::repository::Repository;
  • edit in pijul/src/commands/file_operations.rs at line 0
    [2.169058][2.169059:169164]()
    use crate::repository::Repository;
    use libpijul::pristine::MutTxnT;
    use libpijul::{MutTxnTExt, TxnTExt};
  • edit in pijul/src/commands/file_operations.rs at line 2
    [2.169208]
    [2.169208]
    use clap::Clap;
    use libpijul::pristine::MutTxnT;
    use libpijul::{MutTxnTExt, TxnTExt};
    use log::{debug, info};
  • edit in pijul/src/commands/file_operations.rs at line 8
    [2.169209]
    [2.169209]
    use crate::repository::Repository;
  • edit in pijul/src/commands/diff.rs at line 0
    [2.173551][2.173552:173662]()
    use crate::repository::*;
    use libpijul::change::*;
    use libpijul::pristine::MutTxnT;
    use libpijul::MutTxnTExt;
  • edit in pijul/src/commands/diff.rs at line 3
    [2.173738]
    [2.173738]
    use clap::Clap;
    use libpijul::change::*;
    use libpijul::pristine::MutTxnT;
    use libpijul::MutTxnTExt;
    use serde_derive::Serialize;
  • edit in pijul/src/commands/diff.rs at line 10
    [2.173739]
    [2.173739]
    use crate::repository::*;
  • edit in pijul/src/commands/debug.rs at line 0
    [2.177758]
    [2.177759]
    use std::path::PathBuf;
    use clap::Clap;
  • edit in pijul/src/commands/debug.rs at line 6
    [2.177812][2.177812:177836]()
    use std::path::PathBuf;
  • replacement in pijul/src/commands/credit.rs at line 0
    [2.178684][2.178685:178738]()
    use crate::repository::Repository;
    use crate::Error;
    [2.178684]
    [2.178738]
    use std::collections::HashSet;
    use std::path::PathBuf;
    use clap::Clap;
  • replacement in pijul/src/commands/credit.rs at line 7
    [2.178874][2.178874:178929]()
    use std::collections::HashSet;
    use std::path::PathBuf;
    [2.178874]
    [2.178929]
    use log::debug;
  • edit in pijul/src/commands/credit.rs at line 9
    [2.178930]
    [2.178930]
    use crate::repository::Repository;
    use crate::Error;
  • replacement in pijul/src/commands/clone.rs at line 0
    [2.182891][2.182892:182918]()
    use crate::repository::*;
    [2.182891]
    [2.182918]
    use std::path::PathBuf;
    use clap::Clap;
  • replacement in pijul/src/commands/clone.rs at line 5
    [2.182977][2.182977:183001]()
    use std::path::PathBuf;
    [2.182977]
    [2.183001]
    use log::debug;
  • edit in pijul/src/commands/clone.rs at line 7
    [2.183024]
    [2.183024]
    use crate::repository::*;
  • edit in pijul/src/commands/channel.rs at line 0
    [2.186892][2.186893:186969]()
    use crate::repository::Repository;
    use libpijul::pristine::{MutTxnT, TxnT};
  • edit in pijul/src/commands/channel.rs at line 3
    [2.187014]
    [2.187014]
    use clap::Clap;
    use libpijul::pristine::{MutTxnT, TxnT};
    use crate::repository::Repository;
  • replacement in pijul/src/commands/change.rs at line 0
    [2.189306][2.189307:189333]()
    use crate::repository::*;
    [2.189306]
    [2.189333]
    use std::path::PathBuf;
    use clap::Clap;
  • replacement in pijul/src/commands/change.rs at line 7
    [2.189446][2.189446:189470]()
    use std::path::PathBuf;
    [2.189446]
    [2.189470]
    use crate::repository::*;
  • edit in pijul/src/commands/archive.rs at line 0
    [2.191083][2.191084:191202]()
    use crate::repository::Repository;
    use libpijul::pristine::{Hash, Merkle, TxnT};
    use libpijul::{MutTxnTExt, TxnTExt};
  • edit in pijul/src/commands/archive.rs at line 2
    [2.191246]
    [2.191246]
    use clap::Clap;
    use libpijul::pristine::{Hash, Merkle, TxnT};
    use libpijul::{MutTxnTExt, TxnTExt};
    use log::debug;
  • edit in pijul/src/commands/archive.rs at line 8
    [2.191247]
    [2.191247]
    use crate::repository::Repository;
  • replacement in pijul/src/commands/apply.rs at line 0
    [2.194289][2.194290:194343]()
    use crate::repository::Repository;
    use crate::Error;
    [2.194289]
    [2.194343]
    use std::collections::HashMap;
    use std::path::PathBuf;
    use clap::Clap;
  • replacement in pijul/src/commands/apply.rs at line 7
    [2.194442][2.194442:194497]()
    use std::collections::HashMap;
    use std::path::PathBuf;
    [2.194442]
    [2.194497]
    use crate::repository::Repository;
    use crate::Error;