configs  Check-in [65f43c9c86]

Overview
Comment:zshrc: Add fl2git command to export Fossil -> Git
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 65f43c9c869165565c702f36e376b1c325186165a9e6484214606e971d5da478
User & Date: js 2020-06-01 09:34:31
Context
2020-06-02
20:29
vim: Add of_mutable_file_attributes_t to syntax check-in: 6bfe1f0f90 user: js tags: trunk
2020-06-01
09:34
zshrc: Add fl2git command to export Fossil -> Git check-in: 65f43c9c86 user: js tags: trunk
2020-05-30
15:41
git2fl: Fix incremental import check-in: be955ae008 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to zshrc.

︙︙
243
244
245
246
247
248
249



























250
251
252
253
254
255
256

			--git					\
			$=incremental				\
			--rename-master trunk			\
			--export-marks $gitdir/fossil.marks	\
			$=importmarks_fossil			\
			$repo
	}



























fi

# pkgsrc does not like MAKEFLAGS including -j
which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk"
which pkg_rolling-replace &>/dev/null &&
	alias pkg_rolling-replace="MAKEFLAGS= pkg_rolling-replace"
which url2pkg &>/dev/null && alias url2pkg="MAKEFLAGS= url2pkg"








>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>








243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283

			--git					\
			$=incremental				\
			--rename-master trunk			\
			--export-marks $gitdir/fossil.marks	\
			$=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
which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk"
which pkg_rolling-replace &>/dev/null &&
	alias pkg_rolling-replace="MAKEFLAGS= pkg_rolling-replace"
which url2pkg &>/dev/null && alias url2pkg="MAKEFLAGS= url2pkg"
︙︙