Fix vc-pijul-state

sellout

Oct 9, 2022, 5:19 PM

NSNBNI5SHINOBOYDEWGSLDRXSPMTPA2GSLU26WKVUO72TZUDUEYQC

Dependencies

• [2] VBTAFJFK Switch from DARCS to Pijul
• [3] 73T7XRXZ get state of file during rebase
• [4] MAGPFPZB init
• [5] CJQZS55X working annotation
• [6] ITWH4477 reindentation
• [7] PQKTNYVZ header + reindentation

Change contents

• edit in vc-pijul.el at line 240
  [3.29]→[3.29:50](∅→∅)
  − (forward-line 1)
• edit in vc-pijul.el at line 241
  [3.8925]→[3.1728:1760](∅→∅),[3.1760]→[2.4671:4736](∅→∅)
  − ((looking-at "No changes")

  − (if (vc-pijul-registered file) 'up-to-date 'unregistered))
• replacement in vc-pijul.el at line 243
  [2.4820]→[3.1910:1967](∅→∅),[3.1910]→[3.1910:1967](∅→∅),[3.1967]→[2.4821:4923](∅→∅),[2.4923]→[3.2069:2343](∅→∅),[3.2069]→[3.2069:2343](∅→∅)
  − ((looking-at " * \\([^ \n]+\\) *-> *\\([^ \n]+\\)")

  − ;; The paths printed by Pijul are relative to the root

  − (let* ((root (vc-pijul-root file))

  − (f (expand-file-name file))

  − (f1 (expand-file-name (match-string 1) root))

  − (f2 (expand-file-name (match-string 2) root)))

  − (cond

  − ((equal f f1) 'removed)

  − ((equal f f2) 'added)

  − (t nil))))

  − (t nil))))
  [2.4820]

  [3.9558]
  + ((progn (forward-line 1) (looking-at "Error: Path not in repository: "))

  + nil)

  + (t 'up-to-date))))
• replacement in vc-pijul.el at line 493
  [2.9535]→[2.9535:9578](∅→∅)
  − (vc-pijul-do-command 'mv 0 nil old new))
  [2.9535]

  [3.17868]
  + (vc-pijul-do-command 'move 0 nil old new))