simplify outputting with no touched paths

rohan
Oct 16, 2021, 8:10 AM
ILZ44DEYAPNWZRHHEML2GPNSMGP4QXXI4GCL4T24R7A4LKGRV23AC

Dependencies

  • [2] 6ZPDI7QG pull uses None as the base case path when outputing repo
  • [3] I24UEJQL Various post-fire fixes
  • [4] EUZFFJSO Updating Pijul with the latest changes in Libpijul
  • [5] 2RXOCWUW Making libpijul deterministic (and getting rid of `rand`)
  • [6] LGEJSLTY Fixing output (including its uses in reset and pull)
  • [7] Y6EVFMTA Don't output files if they aren't in the current channel
  • [8] MDADYULS Fix a panic when switching between channels that have different files
  • [*] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

  • edit in "pijul/src/commands/pushpull.rs" at line 493
    [3.1301]
    [2.151]
    if touched_paths.is_empty() {
    touched_paths.insert(String::from(""));
    }
  • edit in "pijul/src/commands/pushpull.rs" at line 527
    [2.358][3.1002:1016](),[3.1859][3.1002:1016](),[3.1002][3.1002:1016](),[3.1016][3.1860:1902](),[3.1902][3.17017:17119](),[3.17119][3.11186:11230](),[3.11230][3.17170:17209](),[3.17170][3.17170:17209](),[3.17209][3.11231:11295](),[3.11295][3.17287:17416](),[3.17287][3.17287:17416](),[3.17416][3.703:730](),[3.730][3.17416:17492](),[3.17416][3.17416:17492]()
    }
    if touched_paths.is_empty() {
    conflicts.extend(
    libpijul::output::output_repository_no_pending(
    &repo.working_copy,
    &repo.changes,
    &txn,
    &channel,
    "",
    true,
    None,
    num_cpus::get(),
    0,
    )?
    .into_iter(),
    );