oridb / git9 Goto Github PK
View Code? Open in Web Editor NEWGit implementation for plan 9
License: MIT License
Git implementation for plan 9
License: MIT License
Git for Plan 9: git/fs ====================== All commits in this repository were made with git9 running on 9front. About ----- Plan 9 is a non-posix system. Upstream git has been ported, but feels distinctly un-plan9ish, and even in its native environment, has been justifiably tarred and feathered for its user experience. Git/fs implements a git client for plan 9. The intent is to support working with git repositories, without cloning the git interface directly. Git/fs is my daily driver. It's solid, and works well for my needs. Getting Started --------------- Get a bootstrap copy: % cd /tmp % hget https://orib.dev/git/git9/HEAD/snap.tar.gz | tar xvz % cd git9 % mk all % mk install Then get an updatable version from git: % cd $home/src % git/clone gits://orib.dev/git9 % cd git9 % mk all % mk install Configure your user name and email: % mkdir -p $home/lib/git % echo ' [user] name=Ori Bernstein [email protected] ' > $home/lib/git/config Read the docs: % man 1 git % man 4 gitfs And start committing! Structure --------- The git/fs program provides a file system mounted on $repo/.git/fs. It provides a read-only view into the repository contents to allow scripts to inspect the data. Surrounding scripts and binaries will manipulate the repository contents directly. These changes will be immediately mirrored in the file system. Scripts will generally mount git/fs as needed to do their work, but if you want to browse the repository manually, run it yourself. You'll get `$repo/.git/fs` mounted, with the following contents: $repo/.git/fs/object: The objects in the repo. $repo/.git/fs/branch: The branches in the repo. $repo/.git/fs/ctl: A file showing the status of the repo. Currently, it only shows the current branch. $repo/.git/fs/HEAD An alias for the currently checked out commit directory. Visible Differences ------------------- The most obvious difference is that Git's index is a bit boneheaded, so I'm ignoring it. The index doesn't affect the wire protocol, so this isn't an interoperability issue, unless you share the same physical repository on both Plan 9 and Unix. If you do, expect them to disagree about the files that have been modified in the working copy. In fact, the entire concept of the staging area has been dropped, as it's both confusing and clunky. There are now only three states that files can be in: 'untracked', 'dirty', and 'committed'. Tracking is done with empty files under .git/index9/{removed,tracked}/path/to/file. It's implemented in Plan 9 flavor C, and provides tools for writing repository contents, and a file system for read-only access, which will mirror the current state of the repository. Installation ------------ Install with `mk install`. Examples -------- Some usage examples: git/clone git://git.eigenstate.org/ori/mc.git git/log cd subdir/name git/add foo.c diff bar.c $repo/.git/fs/HEAD/ git/commit foo.c git/push Commits are presented as directories with the following contents: author: A file containing the author name hash: A file containing the commit hash parent: A file containing the commit parents, one per line. msg: A file containing the log message for that commit tree: A directory containing a view of the repository. So, for example: % ls $repo/.git/fs/branch/heads/master $repo/.git/fs/branch/heads/master/author $repo/.git/fs/branch/heads/master/hash $repo/.git/fs/branch/heads/master/msg $repo/.git/fs/branch/heads/master/parent $repo/.git/fs/branch/heads/master/tree % cat $repo/.git/fs/branch/heads/master/hash 7d539a7c08aba3f31b3913e0efef11c43ea9 # This is the same commit, with the same contents. % ls $repo/.git/fs/object/7d539a7c08aba3f31b3913e0efef11c43ea9f9ef $repo/.git/fs/object/7d539a7c08aba3f31b3913e0efef11c43ea9f9ef/author $repo/.git/fs/object/7d539a7c08aba3f31b3913e0efef11c43ea9f9ef/hash $repo/.git/fs/object/7d539a7c08aba3f31b3913e0efef11c43ea9f9ef/msg $repo/.git/fs/object/7d539a7c08aba3f31b3913e0efef11c43ea9f9ef/parent $repo/.git/fs/object/7d539a7c08aba3f31b3913e0efef11c43ea9f9ef/tree # what git/diff will hopefully do more concisely soon, filtering # out the non-git files. ape/diff -ur $repo/.git/fs/branch/heads/master/tree . Only in .: .git Only in .: debug diff -ur $repo/.git/fs/branch/heads/master/tree/fold.myr ./fold.myr --- $repo/.git/fs/branch/heads/master/tree/fold.myr Wed Dec 31 16:00:00 1969 +++ ./fold.myr Mon Apr 1 21:39:06 2019 @@ -6,6 +6,8 @@ const foldexpr : (e : expr# -> std.option(constval)) ;; +/* Look, diffing files just works, and I don't need any fancy glue! */ + const foldexpr = {e match e | &(`Eident &[.sc=`Sclassenum, .name=name, .ty=`Tyenum &(`Body enum)]): Only in .: refs The following utilities and binaries are provided: fs: The git filesystem. fetch: The protocol bits for getting data from a git server. send: The protocol bits for sending data to a git server. save: The gnarly bits for storing the files for a commit. conf: A program to extract information from a config file. clone: Clones a repository. commit: Commits a snapshot of the selected files. log: Prints the contents of a commmit log. add: Tells the repository to add a file to the next commit. walk: `du`, but for git status. ... and more Supported protocols: git:// and git+ssh://. If someone implements others, I'll gladly accept patches. 9legacy Notes ------------- To use git9 on 9legacy, these patches are necessary. - rc-line-split: implement delim{...} syntax for rc - walk: port walk command to 9legacy. - aux/getflags: 9front updated it with support for named args Additionally, git9 defaults to editing with hold(1). This command is not present on 9legacy. Import it, or set $editor to your choice of editor.
In the specs for git, trees should use the mode 040000 for the filemode on subdirectories however, repositories created by git9 seem to often use 040755 instead (ie the templates directory of this repo, or certain directories of the netsurf fork)
9legacy needs these changes from 9front:
delim{...}
syntax for rchold
commandI'll update the list as I find more issues.
(I assume after commit c9a4dbe)
git/pull fails if $upstream is not set in the beginning of the script.
Here is my attempt of fixing it:
--- /mnt/git/object/718290ffe0bbf965abf0c4e4941fae78e1d1e23f/tree/pull Mon Nov 16 07:45:47 2020
+++ pull Mon Nov 16 01:46:36 2020
@@ -40,8 +40,10 @@ if(~ $#branch 0)
if(~ $allbranch 1)
branch=''
-if(~ $#upstream 0)
+if(~ $#upstream 0) {
remote=`{git/conf 'remote "origin".url'}
+ upstream=origin
+}
if not
remote=`{git/conf 'remote "'$upstream'".url'}
if(~ $#remote 0)
Set up a namespace where normal git commands work
cpu% git/clone 'git://git.savannah.gnu.org/guix.git'
fetching...
indexing (0/288594):......................fetch 2966: Killed: Insufficient physical memory
clone failed.
cleaning up guix
Is this expected?
Compilation fails:
% mk install
for (i in conf fetch fs query save send walk)
mk $MKFLAGS $i.install
for (i in add branch clone commit diff export import init log merge pull push)
mk $MKFLAGS $i.rcinstall
cp git.1 /sys/man/1/git
mk $MKFLAGS /sys/lib/git/template
mk: no recipe to make 'date.8' in directory /<...>/git9-master
mk: mkdir -p /386/bin/git ... : exit status=rc 30861: mk 30864: error
Removing the date.$O\
line from $OFILES
works.
I was happily cloning repositories the other day but after upgrading today I came across this error:
term% git/clone gits://orib.dev/git9
fetching...
indexing 1712 objects: 100%
checking out repository...
drop: './drop' directory entry not found
failed to clone gits://orib.dev/git9: cleaning git9
Lines 89 to 92 in 1b4c50b
When running mk install
from both this git repo and 9front ports:
for (i in add branch clone commit diff export import init log merge pull push revert)
mk $MKFLAGS $i.rcinstall
cp git.1 /sys/man/1/git
cp gitfs.4 /sys/man/4/gitfs
cp common.rc /sys/lib/git/common.rc
mk $MKFLAGS /sys/lib/git/template
7l -o 7.conf conf.7 objset.7 ols.7 pack.7 proto.7 util.7 ref.7
??none??: incompatible type signatures 4c61292b(pack.7) and 6f310e8d(/arm64/lib/libbio.a(Bwrite)) for Bwrite
??none??: incompatible type signatures 9dd3ea4c(pack.7) and c0a3cfae(/arm64/lib/libbio.a(Bseek)) for Bseek
Bseek: incompatible type signatures 3ca7f837(pack.7) and e8a7e2d9(/arm64/lib/libbio.a(Bseek)) for Boffset
??none??: incompatible type signatures 4c61292b(pack.7) and 6f310e8d(/arm64/lib/libbio.a(Bread)) for Bread
badd: incompatible type signatures 34728a43(conf.7) and e8001435(/arm64/lib/libbio.a(Brdstr)) for Brdstr
Bfdopen: incompatible type signatures 63f5472a(pack.7) and 29f5223c(/arm64/lib/libbio.a(Bopen)) for Bopen
Bopen: incompatible type signatures f9b3864(pack.7) and bb9b2306(/arm64/lib/libbio.a(Bopen)) for Bterm
??none??: incompatible type signatures f9b3864(pack.7) and bb9b2306(/arm64/lib/libbio.a(Bgetc)) for Bgetc
mk: 7l -o ... : exit status=rc 18216: 7l 18218: error
mk: mkdir -p /arm64/bin/git ... : exit status=rc 18210: mk 18215: error
mk: . /sys/ports/Mk/lib.rc if(! ... : exit status=rc 18199: rc 18208: mk 18209: error
this is on an RPI3 and I ran sysupdate
earlier today.
thanks for your work, as always :)
Following the flow of:
git/clone git://git.eigenstate.org/ori/mc.git
git/log
cd subdir/name
git/add foo.c
diff bar.c /mnt/git/HEAD/
git/commit foo.c
git/push
Results in: refs/heads/master: 05b6274d9dd09127c34dee2650d4f10027235de8 => e7b4a4512dd46ae6b8eb46b25396c1a263c0e1b9
And git/log
shows:
cpu% git/log
Hash: e7b4a4512dd46ae6b8eb46b25396c1a263c0e1b9
Author: glenda <[email protected]>
Date: Thu Jan 16 02:10:40 CET 2020
9front
Hash: 05b6274d9dd09127c34dee2650d4f10027235de8
Author: Nicolas Montanaro <[email protected]>
Date: Thu Jan 16 02:08:48 CET 2020
test
However, no push is ever made, as the changes aren't reflected on GitHub - also tested with SourceHut, same thing. Repos were cloned with git+ssh
.
Thanks for your work on this btw and looking forward to IWP9 :)
The snap.tar.gz file (48 bytes) mentioned in the bootstrap instructions is not extractable on either Plan 9 (fails with “bad gzip file magic”) or macOS where various unzippers complain of invalid archives.
Line 241 in 6586b50
Typo. It looks like a dot, but it isn't.
A declarative, efficient, and flexible JavaScript library for building user interfaces.
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google ❤️ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.