From 39eb3eaaf01c8e34323b5208b352b15607e507eb Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Mon, 1 Jun 2020 09:34:31 +0000 Subject: [PATCH] zshrc: Add fl2git command to export Fossil -> Git --- zshrc | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/zshrc b/zshrc index 90868e0..b288a54 100644 --- a/zshrc +++ b/zshrc @@ -247,6 +247,33 @@ if which fossil &>/dev/null; then $=importmarks_fossil \ $repo } + + fl2git() { + if [ -n "$1" ]; then + local gitdir="$1/.git" + else + local gitdir=$(git rev-parse --show-toplevel)/.git + fi + + [ -f "$gitdir/git.marks" ] && + local importmarks_git="--import-marks=$gitdir/git.marks" + + if [ -f "$gitdir/fossil.marks" ]; then + local incremental="--incremental" + local importmarks_fossil + importmarks_fossil="--import-marks $gitdir/fossil.marks" + fi + + LC_ALL=C fossil export \ + --git \ + $=incremental \ + --rename-trunk master \ + --export-marks $gitdir/fossil.marks \ + $=importmarks_fossil | + LC_ALL=C git fast-import \ + --export-marks=$gitdir/git.marks \ + $=importmarks_git + } fi # pkgsrc does not like MAKEFLAGS including -j