commit 0113e9b117121c8945bbce0cfb7ad192608e191f from: Rafael M date: Mon Mar 23 18:17:16 2026 UTC import commit - /dev/null commit + 0113e9b117121c8945bbce0cfb7ad192608e191f blob - /dev/null blob + e4be0f570e597b264f054029c9db8a119a054e9c (mode 644) --- /dev/null +++ .git/COMMIT_EDITMSG @@ -0,0 +1 @@ +emacs blob - /dev/null blob + 619a50f55ee831f9a95fea371af07a70e3292ef4 (mode 644) --- /dev/null +++ .git/COMMIT_EDITMSG~ @@ -0,0 +1,10 @@ + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# On branch main +# Your branch is up to date with 'origin/main'. +# +# Changes to be committed: +# modified: init.el +# blob - /dev/null blob + 2efeea4964cd1231343417149acaf7c8ce54f6e7 (mode 644) --- /dev/null +++ .git/FETCH_HEAD @@ -0,0 +1 @@ +63d3f09aad70a5dbf942075b65dff754ae00c7db branch 'main' of codeberg.org:rafaelm7o/emacs.d blob - /dev/null blob + b870d82622c1a9ca6bcaf5df639680424a1904b0 (mode 644) --- /dev/null +++ .git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/main blob - /dev/null blob + 09e12195635dc02679640dd243825ea6e9233662 (mode 644) --- /dev/null +++ .git/ORIG_HEAD @@ -0,0 +1 @@ +aa17b89749318df52c2f3edb800454235434244d blob - /dev/null blob + 0fde06054a632f44b2108577284f7822ac3339c9 (mode 644) --- /dev/null +++ .git/config @@ -0,0 +1,13 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[remote "origin"] + url = git@codeberg.org:rafaelm7o/emacs.d.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "main"] + remote = origin + merge = refs/heads/main +[pull] + rebase = false blob - /dev/null blob + 498b267a8c7812490d6479839c5577eaaec79d62 (mode 644) --- /dev/null +++ .git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. blob - /dev/null blob + a5d7b84a673458d14d9aab082183a1968c2c7492 (mode 755) --- /dev/null +++ .git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: blob - /dev/null blob + b58d1184a9d43a39c0d95f32453efc78581877d6 (mode 755) --- /dev/null +++ .git/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} blob - /dev/null blob + 23e856f5deeb7f564afc22f2beed54449c2d3afb (mode 755) --- /dev/null +++ .git/hooks/fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} blob - /dev/null blob + ff565eb3d8811d04356c590e8d0a5c92288eb30b (mode 644) --- /dev/null +++ .git/hooks/post-receive-email.sample @@ -0,0 +1,759 @@ +#!/bin/sh +# +# Copyright (c) 2007 Andy Parkins +# +# An example hook script to mail out commit update information. +# +# NOTE: This script is no longer under active development. There +# is another script, git-multimail, which is more capable and +# configurable and is largely backwards-compatible with this script; +# please see "contrib/hooks/multimail/". For instructions on how to +# migrate from post-receive-email to git-multimail, please see +# "README.migrate-from-post-receive-email" in that directory. +# +# This hook sends emails listing new revisions to the repository +# introduced by the change being reported. The rule is that (for +# branch updates) each commit will appear on one email and one email +# only. +# +# This hook is stored in the contrib/hooks directory. Your distribution +# will have put this somewhere standard. You should make this script +# executable then link to it in the repository you would like to use it in. +# For example, on debian the hook is stored in +# /usr/share/git-core/contrib/hooks/post-receive-email: +# +# cd /path/to/your/repository.git +# ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive +# +# This hook script assumes it is enabled on the central repository of a +# project, with all users pushing only to it and not between each other. It +# will still work if you don't operate in that style, but it would become +# possible for the email to be from someone other than the person doing the +# push. +# +# To help with debugging and use on pre-v1.5.1 git servers, this script will +# also obey the interface of hooks/update, taking its arguments on the +# command line. Unfortunately, hooks/update is called once for each ref. +# To avoid firing one email per ref, this script just prints its output to +# the screen when used in this mode. The output can then be redirected if +# wanted. +# +# Config +# ------ +# hooks.mailinglist +# This is the list that all pushes will go to; leave it blank to not send +# emails for every ref update. +# hooks.announcelist +# This is the list that all pushes of annotated tags will go to. Leave it +# blank to default to the mailinglist field. The announce emails lists +# the short log summary of the changes since the last annotated tag. +# hooks.envelopesender +# If set then the -f option is passed to sendmail to allow the envelope +# sender address to be set +# hooks.emailprefix +# All emails have their subjects prefixed with this prefix, or "[SCM]" +# if emailprefix is unset, to aid filtering +# hooks.showrev +# The shell command used to format each revision in the email, with +# "%s" replaced with the commit id. Defaults to "git rev-list -1 +# --pretty %s", displaying the commit id, author, date and log +# message. To list full patches separated by a blank line, you +# could set this to "git show -C %s; echo". +# To list a gitweb/cgit URL *and* a full patch for each change set, use this: +# "t=%s; printf 'http://.../?id=%%s' \$t; echo;echo; git show -C \$t; echo" +# Be careful if "..." contains things that will be expanded by shell "eval" +# or printf. +# hooks.emailmaxlines +# The maximum number of lines that should be included in the generated +# email body. If not specified, there is no limit. +# Lines beyond the limit are suppressed and counted, and a final +# line is added indicating the number of suppressed lines. +# hooks.diffopts +# Alternate options for the git diff-tree invocation that shows changes. +# Default is "--stat --summary --find-copies-harder". Add -p to those +# options to include a unified diff of changes in addition to the usual +# summary output. +# +# Notes +# ----- +# All emails include the headers "X-Git-Refname", "X-Git-Oldrev", +# "X-Git-Newrev", and "X-Git-Reftype" to enable fine tuned filtering and +# give information for debugging. +# + +# ---------------------------- Functions + +# +# Function to prepare for email generation. This decides what type +# of update this is and whether an email should even be generated. +# +prep_for_email() +{ + # --- Arguments + oldrev=$(git rev-parse $1) + newrev=$(git rev-parse $2) + refname="$3" + + # --- Interpret + # 0000->1234 (create) + # 1234->2345 (update) + # 2345->0000 (delete) + if expr "$oldrev" : '0*$' >/dev/null + then + change_type="create" + else + if expr "$newrev" : '0*$' >/dev/null + then + change_type="delete" + else + change_type="update" + fi + fi + + # --- Get the revision types + newrev_type=$(git cat-file -t $newrev 2> /dev/null) + oldrev_type=$(git cat-file -t "$oldrev" 2> /dev/null) + case "$change_type" in + create|update) + rev="$newrev" + rev_type="$newrev_type" + ;; + delete) + rev="$oldrev" + rev_type="$oldrev_type" + ;; + esac + + # The revision type tells us what type the commit is, combined with + # the location of the ref we can decide between + # - working branch + # - tracking branch + # - unannoted tag + # - annotated tag + case "$refname","$rev_type" in + refs/tags/*,commit) + # un-annotated tag + refname_type="tag" + short_refname=${refname##refs/tags/} + ;; + refs/tags/*,tag) + # annotated tag + refname_type="annotated tag" + short_refname=${refname##refs/tags/} + # change recipients + if [ -n "$announcerecipients" ]; then + recipients="$announcerecipients" + fi + ;; + refs/heads/*,commit) + # branch + refname_type="branch" + short_refname=${refname##refs/heads/} + ;; + refs/remotes/*,commit) + # tracking branch + refname_type="tracking branch" + short_refname=${refname##refs/remotes/} + echo >&2 "*** Push-update of tracking branch, $refname" + echo >&2 "*** - no email generated." + return 1 + ;; + *) + # Anything else (is there anything else?) + echo >&2 "*** Unknown type of update to $refname ($rev_type)" + echo >&2 "*** - no email generated" + return 1 + ;; + esac + + # Check if we've got anyone to send to + if [ -z "$recipients" ]; then + case "$refname_type" in + "annotated tag") + config_name="hooks.announcelist" + ;; + *) + config_name="hooks.mailinglist" + ;; + esac + echo >&2 "*** $config_name is not set so no email will be sent" + echo >&2 "*** for $refname update $oldrev->$newrev" + return 1 + fi + + return 0 +} + +# +# Top level email generation function. This calls the appropriate +# body-generation routine after outputting the common header. +# +# Note this function doesn't actually generate any email output, that is +# taken care of by the functions it calls: +# - generate_email_header +# - generate_create_XXXX_email +# - generate_update_XXXX_email +# - generate_delete_XXXX_email +# - generate_email_footer +# +# Note also that this function cannot 'exit' from the script; when this +# function is running (in hook script mode), the send_mail() function +# is already executing in another process, connected via a pipe, and +# if this function exits without, whatever has been generated to that +# point will be sent as an email... even if nothing has been generated. +# +generate_email() +{ + # Email parameters + # The email subject will contain the best description of the ref + # that we can build from the parameters + describe=$(git describe $rev 2>/dev/null) + if [ -z "$describe" ]; then + describe=$rev + fi + + generate_email_header + + # Call the correct body generation function + fn_name=general + case "$refname_type" in + "tracking branch"|branch) + fn_name=branch + ;; + "annotated tag") + fn_name=atag + ;; + esac + + if [ -z "$maxlines" ]; then + generate_${change_type}_${fn_name}_email + else + generate_${change_type}_${fn_name}_email | limit_lines $maxlines + fi + + generate_email_footer +} + +generate_email_header() +{ + # --- Email (all stdout will be the email) + # Generate header + cat <<-EOF + To: $recipients + Subject: ${emailprefix}$projectdesc $refname_type $short_refname ${change_type}d. $describe + MIME-Version: 1.0 + Content-Type: text/plain; charset=utf-8 + Content-Transfer-Encoding: 8bit + X-Git-Refname: $refname + X-Git-Reftype: $refname_type + X-Git-Oldrev: $oldrev + X-Git-Newrev: $newrev + Auto-Submitted: auto-generated + + This is an automated email from the git hooks/post-receive script. It was + generated because a ref change was pushed to the repository containing + the project "$projectdesc". + + The $refname_type, $short_refname has been ${change_type}d + EOF +} + +generate_email_footer() +{ + SPACE=" " + cat <<-EOF + + + hooks/post-receive + --${SPACE} + $projectdesc + EOF +} + +# --------------- Branches + +# +# Called for the creation of a branch +# +generate_create_branch_email() +{ + # This is a new branch and so oldrev is not valid + echo " at $newrev ($newrev_type)" + echo "" + + echo $LOGBEGIN + show_new_revisions + echo $LOGEND +} + +# +# Called for the change of a pre-existing branch +# +generate_update_branch_email() +{ + # Consider this: + # 1 --- 2 --- O --- X --- 3 --- 4 --- N + # + # O is $oldrev for $refname + # N is $newrev for $refname + # X is a revision pointed to by some other ref, for which we may + # assume that an email has already been generated. + # In this case we want to issue an email containing only revisions + # 3, 4, and N. Given (almost) by + # + # git rev-list N ^O --not --all + # + # The reason for the "almost", is that the "--not --all" will take + # precedence over the "N", and effectively will translate to + # + # git rev-list N ^O ^X ^N + # + # So, we need to build up the list more carefully. git rev-parse + # will generate a list of revs that may be fed into git rev-list. + # We can get it to make the "--not --all" part and then filter out + # the "^N" with: + # + # git rev-parse --not --all | grep -v N + # + # Then, using the --stdin switch to git rev-list we have effectively + # manufactured + # + # git rev-list N ^O ^X + # + # This leaves a problem when someone else updates the repository + # while this script is running. Their new value of the ref we're + # working on would be included in the "--not --all" output; and as + # our $newrev would be an ancestor of that commit, it would exclude + # all of our commits. What we really want is to exclude the current + # value of $refname from the --not list, rather than N itself. So: + # + # git rev-parse --not --all | grep -v $(git rev-parse $refname) + # + # Gets us to something pretty safe (apart from the small time + # between refname being read, and git rev-parse running - for that, + # I give up) + # + # + # Next problem, consider this: + # * --- B --- * --- O ($oldrev) + # \ + # * --- X --- * --- N ($newrev) + # + # That is to say, there is no guarantee that oldrev is a strict + # subset of newrev (it would have required a --force, but that's + # allowed). So, we can't simply say rev-list $oldrev..$newrev. + # Instead we find the common base of the two revs and list from + # there. + # + # As above, we need to take into account the presence of X; if + # another branch is already in the repository and points at some of + # the revisions that we are about to output - we don't want them. + # The solution is as before: git rev-parse output filtered. + # + # Finally, tags: 1 --- 2 --- O --- T --- 3 --- 4 --- N + # + # Tags pushed into the repository generate nice shortlog emails that + # summarise the commits between them and the previous tag. However, + # those emails don't include the full commit messages that we output + # for a branch update. Therefore we still want to output revisions + # that have been output on a tag email. + # + # Luckily, git rev-parse includes just the tool. Instead of using + # "--all" we use "--branches"; this has the added benefit that + # "remotes/" will be ignored as well. + + # List all of the revisions that were removed by this update, in a + # fast-forward update, this list will be empty, because rev-list O + # ^N is empty. For a non-fast-forward, O ^N is the list of removed + # revisions + fast_forward="" + rev="" + for rev in $(git rev-list $newrev..$oldrev) + do + revtype=$(git cat-file -t "$rev") + echo " discards $rev ($revtype)" + done + if [ -z "$rev" ]; then + fast_forward=1 + fi + + # List all the revisions from baserev to newrev in a kind of + # "table-of-contents"; note this list can include revisions that + # have already had notification emails and is present to show the + # full detail of the change from rolling back the old revision to + # the base revision and then forward to the new revision + for rev in $(git rev-list $oldrev..$newrev) + do + revtype=$(git cat-file -t "$rev") + echo " via $rev ($revtype)" + done + + if [ "$fast_forward" ]; then + echo " from $oldrev ($oldrev_type)" + else + # 1. Existing revisions were removed. In this case newrev + # is a subset of oldrev - this is the reverse of a + # fast-forward, a rewind + # 2. New revisions were added on top of an old revision, + # this is a rewind and addition. + + # (1) certainly happened, (2) possibly. When (2) hasn't + # happened, we set a flag to indicate that no log printout + # is required. + + echo "" + + # Find the common ancestor of the old and new revisions and + # compare it with newrev + baserev=$(git merge-base $oldrev $newrev) + rewind_only="" + if [ "$baserev" = "$newrev" ]; then + echo "This update discarded existing revisions and left the branch pointing at" + echo "a previous point in the repository history." + echo "" + echo " * -- * -- N ($newrev)" + echo " \\" + echo " O -- O -- O ($oldrev)" + echo "" + echo "The removed revisions are not necessarily gone - if another reference" + echo "still refers to them they will stay in the repository." + rewind_only=1 + else + echo "This update added new revisions after undoing existing revisions. That is" + echo "to say, the old revision is not a strict subset of the new revision. This" + echo "situation occurs when you --force push a change and generate a repository" + echo "containing something like this:" + echo "" + echo " * -- * -- B -- O -- O -- O ($oldrev)" + echo " \\" + echo " N -- N -- N ($newrev)" + echo "" + echo "When this happens we assume that you've already had alert emails for all" + echo "of the O revisions, and so we here report only the revisions in the N" + echo "branch from the common base, B." + fi + fi + + echo "" + if [ -z "$rewind_only" ]; then + echo "Those revisions listed above that are new to this repository have" + echo "not appeared on any other notification email; so we list those" + echo "revisions in full, below." + + echo "" + echo $LOGBEGIN + show_new_revisions + + # XXX: Need a way of detecting whether git rev-list actually + # outputted anything, so that we can issue a "no new + # revisions added by this update" message + + echo $LOGEND + else + echo "No new revisions were added by this update." + fi + + # The diffstat is shown from the old revision to the new revision. + # This is to show the truth of what happened in this change. + # There's no point showing the stat from the base to the new + # revision because the base is effectively a random revision at this + # point - the user will be interested in what this revision changed + # - including the undoing of previous revisions in the case of + # non-fast-forward updates. + echo "" + echo "Summary of changes:" + git diff-tree $diffopts $oldrev..$newrev +} + +# +# Called for the deletion of a branch +# +generate_delete_branch_email() +{ + echo " was $oldrev" + echo "" + echo $LOGBEGIN + git diff-tree -s --always --encoding=UTF-8 --pretty=oneline $oldrev + echo $LOGEND +} + +# --------------- Annotated tags + +# +# Called for the creation of an annotated tag +# +generate_create_atag_email() +{ + echo " at $newrev ($newrev_type)" + + generate_atag_email +} + +# +# Called for the update of an annotated tag (this is probably a rare event +# and may not even be allowed) +# +generate_update_atag_email() +{ + echo " to $newrev ($newrev_type)" + echo " from $oldrev (which is now obsolete)" + + generate_atag_email +} + +# +# Called when an annotated tag is created or changed +# +generate_atag_email() +{ + # Use git for-each-ref to pull out the individual fields from the + # tag + eval $(git for-each-ref --shell --format=' + tagobject=%(*objectname) + tagtype=%(*objecttype) + tagger=%(taggername) + tagged=%(taggerdate)' $refname + ) + + echo " tagging $tagobject ($tagtype)" + case "$tagtype" in + commit) + + # If the tagged object is a commit, then we assume this is a + # release, and so we calculate which tag this tag is + # replacing + prevtag=$(git describe --abbrev=0 $newrev^ 2>/dev/null) + + if [ -n "$prevtag" ]; then + echo " replaces $prevtag" + fi + ;; + *) + echo " length $(git cat-file -s $tagobject) bytes" + ;; + esac + echo " tagged by $tagger" + echo " on $tagged" + + echo "" + echo $LOGBEGIN + + # Show the content of the tag message; this might contain a change + # log or release notes so is worth displaying. + git cat-file tag $newrev | sed -e '1,/^$/d' + + echo "" + case "$tagtype" in + commit) + # Only commit tags make sense to have rev-list operations + # performed on them + if [ -n "$prevtag" ]; then + # Show changes since the previous release + git shortlog "$prevtag..$newrev" + else + # No previous tag, show all the changes since time + # began + git shortlog $newrev + fi + ;; + *) + # XXX: Is there anything useful we can do for non-commit + # objects? + ;; + esac + + echo $LOGEND +} + +# +# Called for the deletion of an annotated tag +# +generate_delete_atag_email() +{ + echo " was $oldrev" + echo "" + echo $LOGBEGIN + git diff-tree -s --always --encoding=UTF-8 --pretty=oneline $oldrev + echo $LOGEND +} + +# --------------- General references + +# +# Called when any other type of reference is created (most likely a +# non-annotated tag) +# +generate_create_general_email() +{ + echo " at $newrev ($newrev_type)" + + generate_general_email +} + +# +# Called when any other type of reference is updated (most likely a +# non-annotated tag) +# +generate_update_general_email() +{ + echo " to $newrev ($newrev_type)" + echo " from $oldrev" + + generate_general_email +} + +# +# Called for creation or update of any other type of reference +# +generate_general_email() +{ + # Unannotated tags are more about marking a point than releasing a + # version; therefore we don't do the shortlog summary that we do for + # annotated tags above - we simply show that the point has been + # marked, and print the log message for the marked point for + # reference purposes + # + # Note this section also catches any other reference type (although + # there aren't any) and deals with them in the same way. + + echo "" + if [ "$newrev_type" = "commit" ]; then + echo $LOGBEGIN + git diff-tree -s --always --encoding=UTF-8 --pretty=medium $newrev + echo $LOGEND + else + # What can we do here? The tag marks an object that is not + # a commit, so there is no log for us to display. It's + # probably not wise to output git cat-file as it could be a + # binary blob. We'll just say how big it is + echo "$newrev is a $newrev_type, and is $(git cat-file -s $newrev) bytes long." + fi +} + +# +# Called for the deletion of any other type of reference +# +generate_delete_general_email() +{ + echo " was $oldrev" + echo "" + echo $LOGBEGIN + git diff-tree -s --always --encoding=UTF-8 --pretty=oneline $oldrev + echo $LOGEND +} + + +# --------------- Miscellaneous utilities + +# +# Show new revisions as the user would like to see them in the email. +# +show_new_revisions() +{ + # This shows all log entries that are not already covered by + # another ref - i.e. commits that are now accessible from this + # ref that were previously not accessible + # (see generate_update_branch_email for the explanation of this + # command) + + # Revision range passed to rev-list differs for new vs. updated + # branches. + if [ "$change_type" = create ] + then + # Show all revisions exclusive to this (new) branch. + revspec=$newrev + else + # Branch update; show revisions not part of $oldrev. + revspec=$oldrev..$newrev + fi + + other_branches=$(git for-each-ref --format='%(refname)' refs/heads/ | + grep -F -v $refname) + git rev-parse --not $other_branches | + if [ -z "$custom_showrev" ] + then + git rev-list --pretty --stdin $revspec + else + git rev-list --stdin $revspec | + while read onerev + do + eval $(printf "$custom_showrev" $onerev) + done + fi +} + + +limit_lines() +{ + lines=0 + skipped=0 + while IFS="" read -r line; do + lines=$((lines + 1)) + if [ $lines -gt $1 ]; then + skipped=$((skipped + 1)) + else + printf "%s\n" "$line" + fi + done + if [ $skipped -ne 0 ]; then + echo "... $skipped lines suppressed ..." + fi +} + + +send_mail() +{ + if [ -n "$envelopesender" ]; then + /usr/sbin/sendmail -t -f "$envelopesender" + else + /usr/sbin/sendmail -t + fi +} + +# ---------------------------- main() + +# --- Constants +LOGBEGIN="- Log -----------------------------------------------------------------" +LOGEND="-----------------------------------------------------------------------" + +# --- Config +# Set GIT_DIR either from the working directory, or from the environment +# variable. +GIT_DIR=$(git rev-parse --git-dir 2>/dev/null) +if [ -z "$GIT_DIR" ]; then + echo >&2 "fatal: post-receive: GIT_DIR not set" + exit 1 +fi + +projectdesc=$(sed -ne '1p' "$GIT_DIR/description" 2>/dev/null) +# Check if the description is unchanged from it's default, and shorten it to +# a more manageable length if it is +if expr "$projectdesc" : "Unnamed repository.*$" >/dev/null +then + projectdesc="UNNAMED PROJECT" +fi + +recipients=$(git config hooks.mailinglist) +announcerecipients=$(git config hooks.announcelist) +envelopesender=$(git config hooks.envelopesender) +emailprefix=$(git config hooks.emailprefix || echo '[SCM] ') +custom_showrev=$(git config hooks.showrev) +maxlines=$(git config hooks.emailmaxlines) +diffopts=$(git config hooks.diffopts) +: ${diffopts:="--stat --summary --find-copies-harder"} + +# --- Main loop +# Allow dual mode: run from the command line just like the update hook, or +# if no arguments are given then run as a hook script +if [ -n "$1" -a -n "$2" -a -n "$3" ]; then + # Output to the terminal in command line mode - if someone wanted to + # resend an email; they could redirect the output to sendmail + # themselves + prep_for_email $2 $3 $1 && PAGER= generate_email +else + while read oldrev newrev refname + do + prep_for_email $oldrev $newrev $refname || continue + generate_email $maxlines | send_mail + done +fi blob - /dev/null blob + ec17ec1939b7c3e86b7cb6c0c4de6b0818a7e75e (mode 755) --- /dev/null +++ .git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info blob - /dev/null blob + 4142082bcb939bbc17985a69ba748491ac6b62a5 (mode 755) --- /dev/null +++ .git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: blob - /dev/null blob + 29ed5ee486a4f07c3f0558101ef8efc46f3d6ab7 (mode 755) --- /dev/null +++ .git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff-index --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- blob - /dev/null blob + 399eab1924e39da570b389b0bef1ca713b3b05c3 (mode 755) --- /dev/null +++ .git/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: blob - /dev/null blob + 4ce688d32b7532862767345f2b991ae856f7d4a8 (mode 755) --- /dev/null +++ .git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 blob - /dev/null blob + 6cbef5c370d8c3486ca85423dd70440c5e0a2aa2 (mode 755) --- /dev/null +++ .git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END blob - /dev/null blob + a1fd29ec14823d8bc4a8d1a2cfe35451580f5118 (mode 755) --- /dev/null +++ .git/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi blob - /dev/null blob + 10fa14c5ab0134436e2ae435138bf921eb477c60 (mode 755) --- /dev/null +++ .git/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi blob - /dev/null blob + af5a0c0018b5e9c04b56ac52f21b4d28f48d99ea (mode 755) --- /dev/null +++ .git/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi blob - /dev/null blob + 2770a1b1d205ee6b6edaec291a7dce3fc417027f (mode 644) --- /dev/null +++ .git/hooks/setgitperms.perl @@ -0,0 +1,214 @@ +#!/usr/bin/perl +# +# Copyright (c) 2006 Josh England +# +# This script can be used to save/restore full permissions and ownership data +# within a git working tree. +# +# To save permissions/ownership data, place this script in your .git/hooks +# directory and enable a `pre-commit` hook with the following lines: +# #!/bin/sh +# SUBDIRECTORY_OK=1 . git-sh-setup +# $GIT_DIR/hooks/setgitperms.perl -r +# +# To restore permissions/ownership data, place this script in your .git/hooks +# directory and enable a `post-merge` and `post-checkout` hook with the +# following lines: +# #!/bin/sh +# SUBDIRECTORY_OK=1 . git-sh-setup +# $GIT_DIR/hooks/setgitperms.perl -w +# +use strict; +use Getopt::Long; +use File::Find; +use File::Basename; + +my $usage = +"usage: setgitperms.perl [OPTION]... <--read|--write> +This program uses a file `.gitmeta` to store/restore permissions and uid/gid +info for all files/dirs tracked by git in the repository. + +---------------------------------Read Mode------------------------------------- +-r, --read Reads perms/etc from working dir into a .gitmeta file +-s, --stdout Output to stdout instead of .gitmeta +-d, --diff Show unified diff of perms file (XOR with --stdout) + +---------------------------------Write Mode------------------------------------ +-w, --write Modify perms/etc in working dir to match the .gitmeta file +-v, --verbose Be verbose + +\n"; + +my ($stdout, $showdiff, $verbose, $read_mode, $write_mode); + +if ((@ARGV < 0) || !GetOptions( + "stdout", \$stdout, + "diff", \$showdiff, + "read", \$read_mode, + "write", \$write_mode, + "verbose", \$verbose, + )) { die $usage; } +die $usage unless ($read_mode xor $write_mode); + +my $topdir = `git rev-parse --show-cdup` or die "\n"; chomp $topdir; +my $gitdir = $topdir . '.git'; +my $gitmeta = $topdir . '.gitmeta'; + +if ($write_mode) { + # Update the working dir permissions/ownership based on data from .gitmeta + open (IN, "<$gitmeta") or die "Could not open $gitmeta for reading: $!\n"; + while (defined ($_ = )) { + chomp; + if (/^(.*) mode=(\S+)\s+uid=(\d+)\s+gid=(\d+)/) { + # Compare recorded perms to actual perms in the working dir + my ($path, $mode, $uid, $gid) = ($1, $2, $3, $4); + my $fullpath = $topdir . $path; + my (undef,undef,$wmode,undef,$wuid,$wgid) = lstat($fullpath); + $wmode = sprintf "%04o", $wmode & 07777; + if ($mode ne $wmode) { + $verbose && print "Updating permissions on $path: old=$wmode, new=$mode\n"; + chmod oct($mode), $fullpath; + } + if ($uid != $wuid || $gid != $wgid) { + if ($verbose) { + # Print out user/group names instead of uid/gid + my $pwname = getpwuid($uid); + my $grpname = getgrgid($gid); + my $wpwname = getpwuid($wuid); + my $wgrpname = getgrgid($wgid); + $pwname = $uid if !defined $pwname; + $grpname = $gid if !defined $grpname; + $wpwname = $wuid if !defined $wpwname; + $wgrpname = $wgid if !defined $wgrpname; + + print "Updating uid/gid on $path: old=$wpwname/$wgrpname, new=$pwname/$grpname\n"; + } + chown $uid, $gid, $fullpath; + } + } + else { + warn "Invalid input format in $gitmeta:\n\t$_\n"; + } + } + close IN; +} +elsif ($read_mode) { + # Handle merge conflicts in the .gitperms file + if (-e "$gitdir/MERGE_MSG") { + if (`grep ====== $gitmeta`) { + # Conflict not resolved -- abort the commit + print "PERMISSIONS/OWNERSHIP CONFLICT\n"; + print " Resolve the conflict in the $gitmeta file and then run\n"; + print " `.git/hooks/setgitperms.perl --write` to reconcile.\n"; + exit 1; + } + elsif (`grep $gitmeta $gitdir/MERGE_MSG`) { + # A conflict in .gitmeta has been manually resolved. Verify that + # the working dir perms matches the current .gitmeta perms for + # each file/dir that conflicted. + # This is here because a `setgitperms.perl --write` was not + # performed due to a merge conflict, so permissions/ownership + # may not be consistent with the manually merged .gitmeta file. + my @conflict_diff = `git show \$(cat $gitdir/MERGE_HEAD)`; + my @conflict_files; + my $metadiff = 0; + + # Build a list of files that conflicted from the .gitmeta diff + foreach my $line (@conflict_diff) { + if ($line =~ m|^diff --git a/$gitmeta b/$gitmeta|) { + $metadiff = 1; + } + elsif ($line =~ /^diff --git/) { + $metadiff = 0; + } + elsif ($metadiff && $line =~ /^\+(.*) mode=/) { + push @conflict_files, $1; + } + } + + # Verify that each conflict file now has permissions consistent + # with the .gitmeta file + foreach my $file (@conflict_files) { + my $absfile = $topdir . $file; + my $gm_entry = `grep "^$file mode=" $gitmeta`; + if ($gm_entry =~ /mode=(\d+) uid=(\d+) gid=(\d+)/) { + my ($gm_mode, $gm_uid, $gm_gid) = ($1, $2, $3); + my (undef,undef,$mode,undef,$uid,$gid) = lstat("$absfile"); + $mode = sprintf("%04o", $mode & 07777); + if (($gm_mode ne $mode) || ($gm_uid != $uid) + || ($gm_gid != $gid)) { + print "PERMISSIONS/OWNERSHIP CONFLICT\n"; + print " Mismatch found for file: $file\n"; + print " Run `.git/hooks/setgitperms.perl --write` to reconcile.\n"; + exit 1; + } + } + else { + print "Warning! Permissions/ownership no longer being tracked for file: $file\n"; + } + } + } + } + + # No merge conflicts -- write out perms/ownership data to .gitmeta file + unless ($stdout) { + open (OUT, ">$gitmeta.tmp") or die "Could not open $gitmeta.tmp for writing: $!\n"; + } + + my @files = `git ls-files`; + my %dirs; + + foreach my $path (@files) { + chomp $path; + # We have to manually add stats for parent directories + my $parent = dirname($path); + while (!exists $dirs{$parent}) { + $dirs{$parent} = 1; + next if $parent eq '.'; + printstats($parent); + $parent = dirname($parent); + } + # Now the git-tracked file + printstats($path); + } + + # diff the temporary metadata file to see if anything has changed + # If no metadata has changed, don't overwrite the real file + # This is just so `git commit -a` doesn't try to commit a bogus update + unless ($stdout) { + if (! -e $gitmeta) { + rename "$gitmeta.tmp", $gitmeta; + } + else { + my $diff = `diff -U 0 $gitmeta $gitmeta.tmp`; + if ($diff ne '') { + rename "$gitmeta.tmp", $gitmeta; + } + else { + unlink "$gitmeta.tmp"; + } + if ($showdiff) { + print $diff; + } + } + close OUT; + } + # Make sure the .gitmeta file is tracked + system("git add $gitmeta"); +} + + +sub printstats { + my $path = $_[0]; + $path =~ s/@/\@/g; + my (undef,undef,$mode,undef,$uid,$gid) = lstat($path); + $path =~ s/%/\%/g; + if ($stdout) { + print $path; + printf " mode=%04o uid=$uid gid=$gid\n", $mode & 07777; + } + else { + print OUT $path; + printf OUT " mode=%04o uid=$uid gid=$gid\n", $mode & 07777; + } +} blob - /dev/null blob + c4d426bc6ee9430ee7813263ce6d5da7ec78c3c6 (mode 755) --- /dev/null +++ .git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 blob - /dev/null blob + f384f2896adf7a754ae542ba5e5b2289b5491890 (mode 644) Binary files /dev/null and .git/index differ blob - /dev/null blob + a5196d1be8fb59edf8062bef36d3a602e0812139 (mode 644) --- /dev/null +++ .git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ blob - /dev/null blob + 3b264dcccbf2dcb102223bc00645630512fdf6a0 (mode 644) --- /dev/null +++ .git/logs/HEAD @@ -0,0 +1,17 @@ +0000000000000000000000000000000000000000 c430df494b10dbf0252578bfe17db89321355a59 sp 1754697360 -0600 commit (initial): First emacs version +c430df494b10dbf0252578bfe17db89321355a59 d27d0730cd3ad383a9c2ecf66edcd1547d30c497 Rafael M 1754697380 -0600 commit (amend): First emacs version +d27d0730cd3ad383a9c2ecf66edcd1547d30c497 3390d6d6b8faed2f57516d1e0f2d1fab7fe4cc64 Rafael M 1754714901 -0600 commit: winum and golang +3390d6d6b8faed2f57516d1e0f2d1fab7fe4cc64 95c9a9298078529e1595113f2313b2a52d5dfe2f Rafael M 1754716693 -0600 commit: Golang +95c9a9298078529e1595113f2313b2a52d5dfe2f 67b9740e08aeca5ee37a77de810f6e90bfbef0df Rafael M 1754716790 -0600 commit: Not needed +67b9740e08aeca5ee37a77de810f6e90bfbef0df 63d3f09aad70a5dbf942075b65dff754ae00c7db Rafael M 1754771940 -0600 commit: Gitignore +63d3f09aad70a5dbf942075b65dff754ae00c7db aa17b89749318df52c2f3edb800454235434244d Rafael M 1754786530 -0600 commit: emacs keyboard +aa17b89749318df52c2f3edb800454235434244d aa17b89749318df52c2f3edb800454235434244d Rafael M 1754786777 -0600 reset: moving to HEAD +aa17b89749318df52c2f3edb800454235434244d 17bf010c0c4011e8d0b1f257871951d1c2e9098e Rafael M 1754940887 -0600 commit: flycheck +17bf010c0c4011e8d0b1f257871951d1c2e9098e 4c921e7c41b8c84b5da14aad56db73633e257074 Rafael M 1755491788 -0600 commit: Winum - use Super +4c921e7c41b8c84b5da14aad56db73633e257074 45cfc79acef442a258c164751c8076fe0b66dd3b Rafael M 1755491832 -0600 commit: .cache > gitignore +45cfc79acef442a258c164751c8076fe0b66dd3b 99c290700e284b1044519981da0a02fb9858d535 Rafael M 1755887901 -0600 commit: go tests +99c290700e284b1044519981da0a02fb9858d535 ee321a8e771665bff78a8add9c3af7bbf485286a Rafael M 1757828083 -0600 commit: Changes +ee321a8e771665bff78a8add9c3af7bbf485286a 5f71613310ac2a93ee1d0d82bc140adf3deee5a4 Rafael M 1758246324 -0600 commit: Testing local plugins +5f71613310ac2a93ee1d0d82bc140adf3deee5a4 d082c43b745787882e35bc12efd7c31b070d5480 Rafael M 1769390381 -0600 commit: Font fix +d082c43b745787882e35bc12efd7c31b070d5480 004903b0d89f9f8c5e7d0236dab44844669abf42 Rafael M 1772118698 -0600 commit: Other configs +004903b0d89f9f8c5e7d0236dab44844669abf42 470736f144158f60ac52df255899c431fc5a7542 Rafael M 1774285950 -0600 commit: emacs blob - /dev/null blob + 163d63af26ee5d47a6003da77268e9d11d14088f (mode 644) --- /dev/null +++ .git/logs/refs/heads/main @@ -0,0 +1,16 @@ +0000000000000000000000000000000000000000 c430df494b10dbf0252578bfe17db89321355a59 sp 1754697360 -0600 commit (initial): First emacs version +c430df494b10dbf0252578bfe17db89321355a59 d27d0730cd3ad383a9c2ecf66edcd1547d30c497 Rafael M 1754697380 -0600 commit (amend): First emacs version +d27d0730cd3ad383a9c2ecf66edcd1547d30c497 3390d6d6b8faed2f57516d1e0f2d1fab7fe4cc64 Rafael M 1754714901 -0600 commit: winum and golang +3390d6d6b8faed2f57516d1e0f2d1fab7fe4cc64 95c9a9298078529e1595113f2313b2a52d5dfe2f Rafael M 1754716693 -0600 commit: Golang +95c9a9298078529e1595113f2313b2a52d5dfe2f 67b9740e08aeca5ee37a77de810f6e90bfbef0df Rafael M 1754716790 -0600 commit: Not needed +67b9740e08aeca5ee37a77de810f6e90bfbef0df 63d3f09aad70a5dbf942075b65dff754ae00c7db Rafael M 1754771940 -0600 commit: Gitignore +63d3f09aad70a5dbf942075b65dff754ae00c7db aa17b89749318df52c2f3edb800454235434244d Rafael M 1754786530 -0600 commit: emacs keyboard +aa17b89749318df52c2f3edb800454235434244d 17bf010c0c4011e8d0b1f257871951d1c2e9098e Rafael M 1754940887 -0600 commit: flycheck +17bf010c0c4011e8d0b1f257871951d1c2e9098e 4c921e7c41b8c84b5da14aad56db73633e257074 Rafael M 1755491788 -0600 commit: Winum - use Super +4c921e7c41b8c84b5da14aad56db73633e257074 45cfc79acef442a258c164751c8076fe0b66dd3b Rafael M 1755491832 -0600 commit: .cache > gitignore +45cfc79acef442a258c164751c8076fe0b66dd3b 99c290700e284b1044519981da0a02fb9858d535 Rafael M 1755887901 -0600 commit: go tests +99c290700e284b1044519981da0a02fb9858d535 ee321a8e771665bff78a8add9c3af7bbf485286a Rafael M 1757828083 -0600 commit: Changes +ee321a8e771665bff78a8add9c3af7bbf485286a 5f71613310ac2a93ee1d0d82bc140adf3deee5a4 Rafael M 1758246324 -0600 commit: Testing local plugins +5f71613310ac2a93ee1d0d82bc140adf3deee5a4 d082c43b745787882e35bc12efd7c31b070d5480 Rafael M 1769390381 -0600 commit: Font fix +d082c43b745787882e35bc12efd7c31b070d5480 004903b0d89f9f8c5e7d0236dab44844669abf42 Rafael M 1772118698 -0600 commit: Other configs +004903b0d89f9f8c5e7d0236dab44844669abf42 470736f144158f60ac52df255899c431fc5a7542 Rafael M 1774285950 -0600 commit: emacs blob - /dev/null blob + 413580afc3f206b53b9896e7f288ade63d580e05 (mode 644) --- /dev/null +++ .git/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 a2d44df2b513380bda43b57243e41bdbb4c97fb5 Rafael M 1754772854 -0600 fetch blob - /dev/null blob + 52e921943cf6b3c11abb4942485dec0fa929fdfa (mode 644) --- /dev/null +++ .git/logs/refs/remotes/origin/main @@ -0,0 +1,18 @@ +0000000000000000000000000000000000000000 d27d0730cd3ad383a9c2ecf66edcd1547d30c497 Rafael M 1754697446 -0600 update by push +d27d0730cd3ad383a9c2ecf66edcd1547d30c497 3390d6d6b8faed2f57516d1e0f2d1fab7fe4cc64 Rafael M 1754714913 -0600 update by push +3390d6d6b8faed2f57516d1e0f2d1fab7fe4cc64 67b9740e08aeca5ee37a77de810f6e90bfbef0df Rafael M 1754716795 -0600 update by push +67b9740e08aeca5ee37a77de810f6e90bfbef0df 63d3f09aad70a5dbf942075b65dff754ae00c7db Rafael M 1754771945 -0600 update by push +63d3f09aad70a5dbf942075b65dff754ae00c7db a2d44df2b513380bda43b57243e41bdbb4c97fb5 Rafael M 1754772854 -0600 pull: forced-update +a2d44df2b513380bda43b57243e41bdbb4c97fb5 63d3f09aad70a5dbf942075b65dff754ae00c7db Rafael M 1754772868 -0600 update by push +63d3f09aad70a5dbf942075b65dff754ae00c7db a3021cfe4dffab37e82464e9c2a4aea6964f920a Rafael M 1754786615 -0600 pull: forced-update +a3021cfe4dffab37e82464e9c2a4aea6964f920a 63d3f09aad70a5dbf942075b65dff754ae00c7db Rafael M 1754786800 -0600 pull: forced-update +63d3f09aad70a5dbf942075b65dff754ae00c7db aa17b89749318df52c2f3edb800454235434244d Rafael M 1754786813 -0600 update by push +aa17b89749318df52c2f3edb800454235434244d 17bf010c0c4011e8d0b1f257871951d1c2e9098e Rafael M 1754940895 -0600 update by push +17bf010c0c4011e8d0b1f257871951d1c2e9098e 4c921e7c41b8c84b5da14aad56db73633e257074 Rafael M 1755491802 -0600 update by push +4c921e7c41b8c84b5da14aad56db73633e257074 45cfc79acef442a258c164751c8076fe0b66dd3b Rafael M 1755491837 -0600 update by push +45cfc79acef442a258c164751c8076fe0b66dd3b 99c290700e284b1044519981da0a02fb9858d535 Rafael M 1755887912 -0600 update by push +99c290700e284b1044519981da0a02fb9858d535 ee321a8e771665bff78a8add9c3af7bbf485286a Rafael M 1757828089 -0600 update by push +ee321a8e771665bff78a8add9c3af7bbf485286a 5f71613310ac2a93ee1d0d82bc140adf3deee5a4 Rafael M 1758246330 -0600 update by push +5f71613310ac2a93ee1d0d82bc140adf3deee5a4 d082c43b745787882e35bc12efd7c31b070d5480 Rafael M 1769390388 -0600 update by push +d082c43b745787882e35bc12efd7c31b070d5480 004903b0d89f9f8c5e7d0236dab44844669abf42 Rafael M 1772118706 -0600 update by push +004903b0d89f9f8c5e7d0236dab44844669abf42 470736f144158f60ac52df255899c431fc5a7542 Rafael M 1774285955 -0600 update by push blob - /dev/null blob + 3cc220dfa41cb50ddb85840933406418867a0900 (mode 644) Binary files /dev/null and .git/objects/00/4903b0d89f9f8c5e7d0236dab44844669abf42 differ blob - /dev/null blob + 129685249c2d1ace2d82a08c6a3295ad64fea0d7 (mode 644) Binary files /dev/null and .git/objects/01/9c640218b7e646ccb6fcb864078b120bc756ea differ blob - /dev/null blob + ed2d1678d7f325340292558d8a6f2c5bfca3dd6b (mode 644) Binary files /dev/null and .git/objects/08/84d45cdf88b52c5384765138425c16752a1456 differ blob - /dev/null blob + fc28f422511f2f8db7a15fabdfdfa8c1c11a6262 (mode 644) Binary files /dev/null and .git/objects/09/300fc46e9da3c07eb3117c9a97ecc3a8d3b729 differ blob - /dev/null blob + 4cb29cad5e2ad26f1865bfd11746f6a5ea64ffd6 (mode 644) Binary files /dev/null and .git/objects/0a/cfb5531bf5245617865483616784742a2fb07a differ blob - /dev/null blob + cd37b0e977e5e668887b8f7899f5fd837c8c2e96 (mode 644) Binary files /dev/null and .git/objects/0c/8504f076ea2b9ede2d8444bac3bf0d26765073 differ blob - /dev/null blob + 93732644fb737740e640a017d201708af4acbfc5 (mode 644) Binary files /dev/null and .git/objects/0f/7cd25354c9d1b13b4d71af533afca166a1f7ec differ blob - /dev/null blob + df0d5245417d461230275120588a08988d207f3b (mode 644) Binary files /dev/null and .git/objects/0f/e6d395b24d3cd6279a3d4ab76b9caf40221864 differ blob - /dev/null blob + 1b0ed8810ee6475610f9287581dabd6d6ac561a2 (mode 644) Binary files /dev/null and .git/objects/10/16975aa8b5c5f8ff0d8586b8b879c59f95983d differ blob - /dev/null blob + d47cd74169d0463185d37a50b5fd064858adb814 (mode 644) Binary files /dev/null and .git/objects/12/8149c484f110b299424fd60f6902479e5d553b differ blob - /dev/null blob + 58f8b9f1698ff4b9e5df9095944520c770bdcdb8 (mode 644) Binary files /dev/null and .git/objects/15/f1141d8caccd1cd880e1efac34b735e7fc38c9 differ blob - /dev/null blob + d973264eb632df7339671fdaa594694fb02722d2 (mode 644) Binary files /dev/null and .git/objects/17/bf010c0c4011e8d0b1f257871951d1c2e9098e differ blob - /dev/null blob + 2ea19a0bfad0a05a3041724a983e779c2e2253ad (mode 644) Binary files /dev/null and .git/objects/19/07dac22543276ae44ddae025fbeb2fbab4ffe9 differ blob - /dev/null blob + dc9dec8d82bbbc3b50b6b76c6fafb08aeddd2e27 (mode 644) Binary files /dev/null and .git/objects/1a/0d3a366e863ae4de1c28797c587be533c0a117 differ blob - /dev/null blob + e5e921d15b23ff755d1e259ccd68ecdea04cd7ac (mode 644) Binary files /dev/null and .git/objects/1c/39a1d660ea8a48bf529d786f4429668f4b65e7 differ blob - /dev/null blob + 1ccaad9c21e7bb1e46f883bef881eb0ecc2640dd (mode 644) Binary files /dev/null and .git/objects/1f/5924e2020b0e82a531997a1324db44188a5592 differ blob - /dev/null blob + b4573b51da61d1e9a709a566610f8a41d8002d45 (mode 644) Binary files /dev/null and .git/objects/20/6fa69b76ad3b124d26a83fa8753ab43888b8cc differ blob - /dev/null blob + 35575d8f32c9d73b155efb4001fc8eb04305e097 (mode 644) Binary files /dev/null and .git/objects/20/e5fc35647212a80ab58fffa9d9b73cf920c35a differ blob - /dev/null blob + 5d66ef645f8d51559aaa20d41dff61158c71ddb9 (mode 644) Binary files /dev/null and .git/objects/22/6f3813ad03eec8c974487ec8b1758645a6b447 differ blob - /dev/null blob + 76c633fcdfe2c1168b83acfba1e950df9baa31fe (mode 644) Binary files /dev/null and .git/objects/24/78df97a86e75ef3c9aefe600717b4864af05aa differ blob - /dev/null blob + 9d55e3fdc317247386f5c3b0a913b8428b4ed9dc (mode 644) Binary files /dev/null and .git/objects/28/1ea7c6f3c73282d9f8ca49a6565476aff778df differ blob - /dev/null blob + 47247849eb0ed3eeef24f1e0defa6e494164eda2 (mode 644) Binary files /dev/null and .git/objects/28/5dddf81afe869aaade12acbe7850fa2e486ca7 differ blob - /dev/null blob + 917695a351368fcc732a602ea126837f83503a58 (mode 644) Binary files /dev/null and .git/objects/29/77b8df2824ba9317ac3db83b60dd5a8a7aa485 differ blob - /dev/null blob + 98490ebe0db0a7dbafae68ac6781e8b6c68ff3d3 (mode 644) Binary files /dev/null and .git/objects/2a/24b665188ab1b098b14252ab1659374c15aacd differ blob - /dev/null blob + 40216ebcc380395f4ab643a145c5f35e15e8be49 (mode 644) Binary files /dev/null and .git/objects/2b/85f080d43b92f95e4094f8ec6e84d02f182216 differ blob - /dev/null blob + 256fa09373a49365a86c57211a171429a08e53f9 (mode 644) Binary files /dev/null and .git/objects/2e/1730a5046bed69c552eafc2759f39ae99f86f6 differ blob - /dev/null blob + 1f01a073ccdff321846e882ede0b5ea0e8edea0e (mode 644) Binary files /dev/null and .git/objects/2e/982a18dd558c5b401126642a52bb95b4ccd7d2 differ blob - /dev/null blob + 967acbd178ffef89af618c9a5feb779309cf4dcc (mode 644) Binary files /dev/null and .git/objects/30/263ceb7e00d2177fe80866e716b6fad134ed4a differ blob - /dev/null blob + b861ae13a4216c4beaf9b8c8e8eabbb1f1a9e0d0 (mode 644) Binary files /dev/null and .git/objects/31/3cd908c92e5a968f5a382faea85304cd729f93 differ blob - /dev/null blob + 8b567c5eff2861f129d32498535d2ad5406675ea (mode 644) Binary files /dev/null and .git/objects/33/90d6d6b8faed2f57516d1e0f2d1fab7fe4cc64 differ blob - /dev/null blob + c1e66b6d0a215b4819fc0ca25b3235ab85825be0 (mode 644) Binary files /dev/null and .git/objects/35/4307650cc07ad593a3e2b04220ab05492e35c9 differ blob - /dev/null blob + 8b7dd2d99f1fa828e8ef17e7401944cbfe62e46c (mode 644) Binary files /dev/null and .git/objects/36/f21e22d7e1910901b1c140b84689c6fb0027ac differ blob - /dev/null blob + 2949bbe3e05a60c4f2f5cb3a41010e2c212a2a73 (mode 644) Binary files /dev/null and .git/objects/38/4f967c13eff1937badd80278c066f6e16f4a1b differ blob - /dev/null blob + 2f0c687a859ff1611fef001b9f71312ba3fb21bf (mode 644) Binary files /dev/null and .git/objects/38/b0d168ddb39825fafa3c24cd499f15937c03b0 differ blob - /dev/null blob + 0b423982a49eadb22a3ec0ed685b194e3b2e60a8 (mode 644) Binary files /dev/null and .git/objects/3a/7c9fde46dd7030a5074e38796f344d09e33338 differ blob - /dev/null blob + 0d7d124ce716c925f8a0f72c35ba52ed731a5519 (mode 644) Binary files /dev/null and .git/objects/41/8cf8cdf8ddf4b8b2bd8c362198833bb28d29e8 differ blob - /dev/null blob + 4fd74916baa7a5bf21fa45ba08e53dc4e421712e (mode 644) Binary files /dev/null and .git/objects/41/ff24bd0d7fe38838ba52718c6ba4270d1509ab differ blob - /dev/null blob + 47a3efda70231d5dc91e5cb8d8854a240647080e (mode 644) Binary files /dev/null and .git/objects/43/4a635d5fb5828e441c8798e5c27af61c05b601 differ blob - /dev/null blob + 0936b63923fcaca29637fa9299c3f3e5c60e161f (mode 644) Binary files /dev/null and .git/objects/44/7f69531f1b11df9ba6dd083bf405fc3fa2c84b differ blob - /dev/null blob + e1a519b2e934a538d55060b7d534f518639dfa88 (mode 644) Binary files /dev/null and .git/objects/45/cfc79acef442a258c164751c8076fe0b66dd3b differ blob - /dev/null blob + 5b4a3d67071b4c1f86bd5f0cb5e8fc69cfb68da9 (mode 644) Binary files /dev/null and .git/objects/47/0736f144158f60ac52df255899c431fc5a7542 differ blob - /dev/null blob + 955d27f3df4f5d6071c3465f48178e2344a008bd (mode 644) Binary files /dev/null and .git/objects/47/ef8082e031b5f29da79aa8f02115d33aa1bc69 differ blob - /dev/null blob + 74f03158ee5387a24757d40a34bdbe27e42ce472 (mode 644) Binary files /dev/null and .git/objects/4a/56f9ace091b3df09318c2614541040ac48ad01 differ blob - /dev/null blob + 315f3051ea5373b628d7ccf9cb592fd039672e58 (mode 644) Binary files /dev/null and .git/objects/4a/b9d36b07dd55b2b190a2bf5d609793729ca292 differ blob - /dev/null blob + 8f3902bba20bf80b77326e8e9a6b3a4685b564b3 (mode 644) Binary files /dev/null and .git/objects/4b/523a14d76221bd5b85d2bbf17002fe956c8d6a differ blob - /dev/null blob + 3a262796ffcad90affdc8e3b8926a2f2961d7b84 (mode 644) Binary files /dev/null and .git/objects/4c/921e7c41b8c84b5da14aad56db73633e257074 differ blob - /dev/null blob + 2f1b0ae20da99c51fede8f4257f20055230b2233 (mode 644) Binary files /dev/null and .git/objects/4d/e21102f882704bdbb82eeb7ea40f064eeea534 differ blob - /dev/null blob + 55414a1c73e67f9448dc035511ee6be8952a437b (mode 644) Binary files /dev/null and .git/objects/4f/2d71e5974718ac85cf4614bec6af31b90f718c differ blob - /dev/null blob + fe9e2c63602d5d6c627df21d14fae4fc06b02180 (mode 644) Binary files /dev/null and .git/objects/50/41f68435127db157b799cf867c004ba2613f40 differ blob - /dev/null blob + dfa83a594c55f5c519ca880f8e776b3307625b70 (mode 644) Binary files /dev/null and .git/objects/50/59a3dab3b9ffad4c5f897b7a8ad67b762da5d4 differ blob - /dev/null blob + 39b0cffb6b12d9b15d1c75d0bddd4da21426d9fc (mode 644) Binary files /dev/null and .git/objects/55/9411aca482a96c49582b5d5d9e3edad23f9daa differ blob - /dev/null blob + 08c981e96b143005e516a5df5d5b9dd32c2816de (mode 644) Binary files /dev/null and .git/objects/56/9194230506807ebeb07018e24c67c6d3128ef7 differ blob - /dev/null blob + 2946ab9e9568d0dcbfc44f3aa42c4f87c5af3f8b (mode 644) Binary files /dev/null and .git/objects/56/a5c9248c2c4a835671997dab26269b9c7b4343 differ blob - /dev/null blob + 82e173d33ee7963d390c473f3858642419fe908e (mode 644) Binary files /dev/null and .git/objects/57/4ffe79d6c0895a65c33482f78c1a31d42585dd differ blob - /dev/null blob + e8080b271f941b72a9b0211089f7babb38be10e4 (mode 644) Binary files /dev/null and .git/objects/5c/91397ee7534377bb0b44a0916e497897da4340 differ blob - /dev/null blob + 55da4b09a3fe3241d6bb6f15ec13332bcb78fb29 (mode 644) Binary files /dev/null and .git/objects/5c/a9f574572b94bee27c9439af7920fc42773769 differ blob - /dev/null blob + 07bbb404350ce896a3e1e8b69332f7889bcbf6f0 (mode 644) Binary files /dev/null and .git/objects/5e/ef7a0dbb73a09c95a6502bfb2bfcbf00d962ee differ blob - /dev/null blob + 0a3507f965b23d79508bd4b29db9778713b172d8 (mode 644) Binary files /dev/null and .git/objects/5f/71613310ac2a93ee1d0d82bc140adf3deee5a4 differ blob - /dev/null blob + c1179c4cefee7be6aaf69d962801c0c5d110ad28 (mode 644) Binary files /dev/null and .git/objects/60/60fafc4d4642628912d9672d68db0daa45521c differ blob - /dev/null blob + 0d5c37211311b081ecb3abb26957ce6fefbbd0a8 (mode 644) Binary files /dev/null and .git/objects/60/c35387f3bfae801a5dc48fd738d4919e7123f2 differ blob - /dev/null blob + 6e6ee18c45987602f5990c0a342c6155ca59ae50 (mode 644) Binary files /dev/null and .git/objects/60/fd9c35f4eaa450b17eb5609ee5cf46249ee07e differ blob - /dev/null blob + 27e6a1856327ba52da58d173c406d08e8f4d5fe3 (mode 644) Binary files /dev/null and .git/objects/61/35fff7cd59f9cea9b5ed4e75e967858dfa18ff differ blob - /dev/null blob + f8df43b6833fbad661100ecf6a3c196a6d322999 (mode 644) Binary files /dev/null and .git/objects/63/d3f09aad70a5dbf942075b65dff754ae00c7db differ blob - /dev/null blob + 230a6e50a04252507347626907e15f7ae55b4f80 (mode 644) Binary files /dev/null and .git/objects/64/ee965c27ead77378e8042ed23c76a36fa4bc62 differ blob - /dev/null blob + ec857d086d61227f1625597b950aeee92f13b554 (mode 644) Binary files /dev/null and .git/objects/65/82eb5c4eb9396a49b0a1f191885d80bfa963f0 differ blob - /dev/null blob + 9f8c17a695de1c8412c52293fe67544ecb8482cc (mode 644) Binary files /dev/null and .git/objects/67/b9740e08aeca5ee37a77de810f6e90bfbef0df differ blob - /dev/null blob + 87122daa0b5a975ab39d76516e1ef9d16b06a0a9 (mode 644) Binary files /dev/null and .git/objects/67/c70083a12a45f43b520040fca2e2c818e0360e differ blob - /dev/null blob + 2c0fd0d76f33643a009c6e302e1a81ee7e80ddf5 (mode 644) Binary files /dev/null and .git/objects/67/d715b0f95384d2c164be4555874c3de9cead11 differ blob - /dev/null blob + 68181b2677604d8bfdb5cad7d6ee9b47387fb66e (mode 644) Binary files /dev/null and .git/objects/6a/26963d3337c44dcef3e82c211714b206ad3d38 differ blob - /dev/null blob + 837d8a9890cbc4452219e9fb1466ce06af40810b (mode 644) Binary files /dev/null and .git/objects/6b/7d47548a132e02f090e11e5eb82013cc7361f5 differ blob - /dev/null blob + 77d8b4588bd6dd843a9ee24c83cefc744c05980a (mode 644) Binary files /dev/null and .git/objects/6d/13c3c3b7e143d594db358f990eb02dfbf4600e differ blob - /dev/null blob + b96c11add7d262edc05f58008138272df788eaeb (mode 644) Binary files /dev/null and .git/objects/6d/8b34bda75d19f2619b4410821b43c50cb9ae28 differ blob - /dev/null blob + 1851eba534deb307eb356de0f307de030fb7601c (mode 644) Binary files /dev/null and .git/objects/71/2a52fb0c7fdd3ae973a3b4486435e8ea2da8da differ blob - /dev/null blob + 9cabc7ef1e1a162af7efb5c36fc7556cd099abd5 (mode 644) Binary files /dev/null and .git/objects/71/969ef543c14403971dd9c5126c859be8cf632f differ blob - /dev/null blob + b06a5eb12a98e83d9c3bb7dda99fa71f174a2b53 (mode 644) Binary files /dev/null and .git/objects/73/a9c31186546490958c0622c4f8008c939efd95 differ blob - /dev/null blob + 40291108b8307c289759c0bb230a30adcd6433f0 (mode 644) Binary files /dev/null and .git/objects/74/7d7aa804c9696d35c1a402a706fab8d46bd65b differ blob - /dev/null blob + fc35acc3ea825bfe18fe53215d46bbe1160cd6b7 (mode 644) Binary files /dev/null and .git/objects/75/72c1198f8b4d95afdc261afc0f628c6b7332ba differ blob - /dev/null blob + a172487fc6c780bfe01ae1866ed1cc84412996f7 (mode 644) Binary files /dev/null and .git/objects/75/ae040c157bc4b82f241cb1d430d1a8035821ef differ blob - /dev/null blob + 065291cddafa5e0fc5fd5954bad91751742227f2 (mode 644) Binary files /dev/null and .git/objects/76/def59229604fbe94d8f265c99ca909265bf6f8 differ blob - /dev/null blob + 30b26714dbe64180bdccb576c385b3a3f82f5bd5 (mode 644) Binary files /dev/null and .git/objects/79/29061fb19685ac9ff99e54bd5c7a645a87a392 differ blob - /dev/null blob + 8344319c8a8d25a1c7497f93a0b29e9964c79d8e (mode 644) Binary files /dev/null and .git/objects/79/86a1b1e981267b7d2a9d0c88453d1fc6785dbd differ blob - /dev/null blob + b8f1ba2648c233d0b3e80850d259151ff616f748 (mode 644) Binary files /dev/null and .git/objects/7b/1110ae21f27aea30cec000a5fefb6309d9477f differ blob - /dev/null blob + 596b3576f455070d44d090acb249c014ab835eac (mode 644) Binary files /dev/null and .git/objects/7f/a4111126f3095ac3abf130990ddd144981824a differ blob - /dev/null blob + 23bdef1362cdf5839902a3d0cadc16bb850f9b1f (mode 644) Binary files /dev/null and .git/objects/80/d472a46349b6dad6cd2d943440f262c130cfac differ blob - /dev/null blob + 240be0b7047606b72c56f425c63f17950ec73133 (mode 644) Binary files /dev/null and .git/objects/81/e10a965a5941294fb13061a595bc70f8cf323c differ blob - /dev/null blob + ecb1630306af66d69caac8b21ce984d849739f9d (mode 644) Binary files /dev/null and .git/objects/82/1f05d0ef58204fa13ce52174d53b2d62563159 differ blob - /dev/null blob + 307a1efcf1373eba83946f3ff3fe20058fb0df77 (mode 644) Binary files /dev/null and .git/objects/84/4582bc0593163c0b46012ec99a217760ba2e01 differ blob - /dev/null blob + fdf0fd386f675915673749fd7fe21416bc30f647 (mode 644) Binary files /dev/null and .git/objects/85/7538001059620b92a28ebb6046ca2aa29958a9 differ blob - /dev/null blob + 6b4597ce367074b5b3263d1ee6edd60af5811c6c (mode 644) Binary files /dev/null and .git/objects/87/396bf64ce0910b65c18df5e6d1f1432784a2cd differ blob - /dev/null blob + 0c54d5376e3bcbbf175a57772f27267758611678 (mode 644) Binary files /dev/null and .git/objects/8c/c7c1fb875d7f2e40824fe0fa6a9e3664b3cf12 differ blob - /dev/null blob + a3d265a79064be2fca069750b9cf817150d6b8f9 (mode 644) Binary files /dev/null and .git/objects/8d/ce48021f814d03327c066d3fec51be4c5731e7 differ blob - /dev/null blob + f1e7f818a32e1c977ac33d59cbba7df94d3c51a8 (mode 644) Binary files /dev/null and .git/objects/90/b5a8424842084975c26f2e0b85e36343909fc1 differ blob - /dev/null blob + 3330e4f9c699d36126dbfbba1792477b34b9277b (mode 644) Binary files /dev/null and .git/objects/95/c9a9298078529e1595113f2313b2a52d5dfe2f differ blob - /dev/null blob + 0f5ede68521cd020e8e53e7b77fde550427267d9 (mode 644) Binary files /dev/null and .git/objects/95/fcba499dd83aadcfdf7d9722273e9fd0168c09 differ blob - /dev/null blob + 2b4f80fdd41d42bd46c1851776d5aa92f44d0eea (mode 644) Binary files /dev/null and .git/objects/96/581031bf75b4625bfa11ee6a8e543315e7f23c differ blob - /dev/null blob + 0f28af1a0f0dca1fe92ee24f4575fd4766a7e503 (mode 644) Binary files /dev/null and .git/objects/97/54ae6eaf3ed0e6db1353e0f22bd2afa7c7072b differ blob - /dev/null blob + d53b991ff2c43c6f68b2cb7575d8d4d37b83724c (mode 644) Binary files /dev/null and .git/objects/97/99e6d69115a97191904473548faffd7248be08 differ blob - /dev/null blob + bb37e58cc44493e67dde2962af46dcfd25d54206 (mode 644) Binary files /dev/null and .git/objects/99/c290700e284b1044519981da0a02fb9858d535 differ blob - /dev/null blob + 806163c7d79bbbc8a6ce0063952e663006f31951 (mode 644) Binary files /dev/null and .git/objects/99/d3d0274de984b4ef8ff912d33e7f2078b81b0a differ blob - /dev/null blob + 1a3ab9d5e3d5e5a8a6194b30fdfde7387f7f2718 (mode 644) Binary files /dev/null and .git/objects/9a/552ba8c58ae120352f1a6c3473f10147ae4b06 differ blob - /dev/null blob + cf5bc47c0d75f1c1542c23970714dbdf2f88ab1a (mode 644) Binary files /dev/null and .git/objects/9b/b2fca802c7b45cea570175f0a8604e188f793e differ blob - /dev/null blob + 982f7f2e5dc2a8005e803f93afd4cbfc53b57618 (mode 644) Binary files /dev/null and .git/objects/9c/c47684231cee4fadbf1a9477af9b79dec3edc6 differ blob - /dev/null blob + 2aca8c8e11ce9e9c8182e66ec91e4c515a043e99 (mode 644) Binary files /dev/null and .git/objects/9e/cfbba99f817be4d744a776279e052b5b0cb015 differ blob - /dev/null blob + b6cf61a91a0ff2d053525960af6668fd2bc752a1 (mode 644) Binary files /dev/null and .git/objects/a2/d44df2b513380bda43b57243e41bdbb4c97fb5 differ blob - /dev/null blob + 555ca9e745b5a2f8dc51464ee992b09857a560fb (mode 644) Binary files /dev/null and .git/objects/a3/021cfe4dffab37e82464e9c2a4aea6964f920a differ blob - /dev/null blob + fe8bc18f5f810fd6516b835c710dfb94a7f39dfa (mode 644) Binary files /dev/null and .git/objects/a4/d51d6e431316d2e5d071b8dd3a4380dbef33ec differ blob - /dev/null blob + d668667232fc0e448bb838ce94543846c01d1b87 (mode 644) Binary files /dev/null and .git/objects/a7/c7b8ec0f52295ff8123c561fd7703fc6e2da84 differ blob - /dev/null blob + 525d16c3f9b8a17edf211e4f1d6c4842f40181ab (mode 644) Binary files /dev/null and .git/objects/aa/17b89749318df52c2f3edb800454235434244d differ blob - /dev/null blob + ec897969ec562d821a2d1b4d81f83295a5bbb8e4 (mode 644) Binary files /dev/null and .git/objects/ac/68f9c5acf253a7f0546f96dd44929486444fe6 differ blob - /dev/null blob + d1add4e2bc5be9f3e90dfb6b8918817886ee8091 (mode 644) Binary files /dev/null and .git/objects/ae/2fa6395361420138a8a8ea3161461d17d94d87 differ blob - /dev/null blob + f715cf6fdbbd2eb86938dacf8919d9967850f017 (mode 644) Binary files /dev/null and .git/objects/af/47ae2721fced446e2f61b4dba7d6c64cd5bb7c differ blob - /dev/null blob + 99ba556a54a9a2c58c22309a6e055ee33d7f34c5 (mode 644) Binary files /dev/null and .git/objects/b0/7502ca14913307e3f270e94fbb5dd2d0973c68 differ blob - /dev/null blob + 72c658538c8c5666f34ffb15a2e932402cc7b189 (mode 644) Binary files /dev/null and .git/objects/b2/29a738914f9719aca8fb74e9f734a85fd9dafd differ blob - /dev/null blob + 7a7b9cc0fd55f30b08165e7c1c2532bc891ae804 (mode 644) Binary files /dev/null and .git/objects/b4/97f5d889845d6f8eafb4e25f4cf36d77a6cea8 differ blob - /dev/null blob + 9f6735271fd5c3d11e693baa1bfe6c827913f4ee (mode 644) Binary files /dev/null and .git/objects/b4/abc64b71b2a52840f046dd8119ffd7d04bc1d9 differ blob - /dev/null blob + a6621711193d6fb88843f59dff63dd01ec2f5ba2 (mode 644) Binary files /dev/null and .git/objects/b8/3b599260031d5a3cc96eab84a62087df0fac0e differ blob - /dev/null blob + ddaefdab1cb594937656847e539f8a13f0a92a6c (mode 644) Binary files /dev/null and .git/objects/ba/6e6119490c2b6baf4ea32f341d703ee63cce18 differ blob - /dev/null blob + 2a61d5bc33ff8bf50e63301c1ff5d24b6536ca15 (mode 644) Binary files /dev/null and .git/objects/ba/aa4ba91ff0d81dcbd81fd42e49613269413de7 differ blob - /dev/null blob + bde12e4808a9c0a2cba32558359d9a46636c4759 (mode 644) Binary files /dev/null and .git/objects/bb/c59b12e33427e10225d2bdaff4fb7cb594cb2c differ blob - /dev/null blob + 068964bcfb2911056d5098ed8be9d05f6c44ae3e (mode 644) Binary files /dev/null and .git/objects/bf/14b766d9772e14cdafb0ad36b4a62be9c113e7 differ blob - /dev/null blob + 6112e0037c6db50c25a0de140b2fe8c1bef5a19a (mode 644) Binary files /dev/null and .git/objects/c2/694ea0502a3fbf208f0f044476ec075562ed95 differ blob - /dev/null blob + 63f13eae07236cb40c4888dc0793dff72d50f35a (mode 644) Binary files /dev/null and .git/objects/c3/0f7437e23d10e7bd824c9aaa755864f6f4f4fb differ blob - /dev/null blob + a1ee47dd9e37031878892466cb98601250821c77 (mode 644) Binary files /dev/null and .git/objects/c3/f3190052584e05de85f7030bea8890b2bed131 differ blob - /dev/null blob + 207049b40fba0e20c6d1c5f7719fcf97a63aaee1 (mode 644) Binary files /dev/null and .git/objects/c4/30df494b10dbf0252578bfe17db89321355a59 differ blob - /dev/null blob + c8786b2947d2a7b80b5e53246257f5dd6c29005b (mode 644) Binary files /dev/null and .git/objects/cb/9880962bdc061da3db7a74863cae8e6d742421 differ blob - /dev/null blob + dac81308cab7882ed32e1c725436fdd13c6ebb42 (mode 644) Binary files /dev/null and .git/objects/cc/03ccd12eddcb7874fa41d8a521f147603d1080 differ blob - /dev/null blob + abe0a41d7ae5e56c0a0df9cb3f95205c75392c1c (mode 644) Binary files /dev/null and .git/objects/d0/82c43b745787882e35bc12efd7c31b070d5480 differ blob - /dev/null blob + 3e5f8606865ba04f8f522b735d0cba5a7f7640d2 (mode 644) Binary files /dev/null and .git/objects/d1/3be3c1a84ee9eb8f59b871eb9f01560524aff9 differ blob - /dev/null blob + fcecdc883da2edb3bea6d860ee67421f72aacc35 (mode 644) Binary files /dev/null and .git/objects/d2/56ff8f59aaceea63b2d1d05a310f3b33a5096a differ blob - /dev/null blob + 8519c9f5548914f6bfa9567e486fe9ea71d62951 (mode 644) Binary files /dev/null and .git/objects/d2/7d0730cd3ad383a9c2ecf66edcd1547d30c497 differ blob - /dev/null blob + 9d23af07e2a84879f65f52046076a0c8320e1faa (mode 644) Binary files /dev/null and .git/objects/d2/bbdbc6596be1c1c4755e0dbe010535d8f3567c differ blob - /dev/null blob + 817b54b067aaa72856e212d0a306ac5b63be198e (mode 644) Binary files /dev/null and .git/objects/d4/5feceb0839ace997b0c497e2cc4bba11c9b925 differ blob - /dev/null blob + 74fa2284e2a3cfa6d19965ed6fc0434034775a91 (mode 644) Binary files /dev/null and .git/objects/d5/5b3ce817b67d3b26adbcbcfde9b5c2ff0a46ec differ blob - /dev/null blob + 999b9b9f0c683d7430e454c076c8f783ed88c656 (mode 644) Binary files /dev/null and .git/objects/db/1d4945bb9b7536f60bcde4d468fb8f1e57c817 differ blob - /dev/null blob + f6fb45b502c4211b7176e66b05caba05c8fe0b00 (mode 644) Binary files /dev/null and .git/objects/db/413bf973abef4ef0386ffaca57c4dd8fd99360 differ blob - /dev/null blob + d7ea2fa83752f95075dde3ad2abd9e9a4a874457 (mode 644) Binary files /dev/null and .git/objects/e1/ab465c07e73dd3cbd38e88d815144cf4c8e39a differ blob - /dev/null blob + daf2e2fcf8af697c17a2b23d8717fcb1ae0fbe32 (mode 644) Binary files /dev/null and .git/objects/e2/2f9c21f8749ac2bc683932076a28e5905ca0c9 differ blob - /dev/null blob + 0c25762bbff831af05831ea2f3f8be45d35fb0b4 (mode 644) Binary files /dev/null and .git/objects/e2/c82af2a7951cd1c8d9bafe513b60078a0a3d56 differ blob - /dev/null blob + 7099aa6f1035128b8a279423b7445e710ebcd8d4 (mode 644) Binary files /dev/null and .git/objects/e3/51c8d1b679467a88d99d73ae26eb20664f556c differ blob - /dev/null blob + 27a0949e42b344938c073297f4b10fc7f59d4bf7 (mode 644) Binary files /dev/null and .git/objects/e4/96cdc8ca88f95ecf673fd7dae82852f72ec637 differ blob - /dev/null blob + 2c18f2af55b8cdfbadcd93cc10cb048ba891b21b (mode 644) Binary files /dev/null and .git/objects/e5/495fc693cdbb9cd965fa40001315902da13615 differ blob - /dev/null blob + a7e47540ae5a4593b43274682f9606ea58ff5d0a (mode 644) Binary files /dev/null and .git/objects/e6/f3bf90b88728e05c984feb74bc0053ea92c6ff differ blob - /dev/null blob + 25311c3e8bb5c2aa95fe2f9e807d7692779503eb (mode 644) Binary files /dev/null and .git/objects/e8/94cff30cbb1ca93c4de95543aac85d794382e0 differ blob - /dev/null blob + 38f03b6066a026681db6d4e6b86de33456e65172 (mode 644) Binary files /dev/null and .git/objects/e9/74229c8f0371e9614b8d7c1351d360ccb1000e differ blob - /dev/null blob + af16f01279636ec7e71a5d7409d61b2aea0bd74c (mode 644) Binary files /dev/null and .git/objects/e9/cd7c133276305283850ba30c506f4018083c81 differ blob - /dev/null blob + 55732c15849f7165746948835a028973ca19a627 (mode 644) Binary files /dev/null and .git/objects/ea/f3b16a2eb55165b46e33e9e2f5db2e6e57c7ee differ blob - /dev/null blob + 82dd9bac710e97045b2cf7ec5e1fe07b80fd502e (mode 644) Binary files /dev/null and .git/objects/ee/321a8e771665bff78a8add9c3af7bbf485286a differ blob - /dev/null blob + 14d6ac08c551955e798674964fb74f38dad9f81a (mode 644) Binary files /dev/null and .git/objects/f3/6d4491e128a631883a417d85129084f7ef1682 differ blob - /dev/null blob + c88a79be8169700d90b2f30fc8cd267c9e1b9893 (mode 644) Binary files /dev/null and .git/objects/f3/e2dc8145ce747583dd5e77fcdaa9e74807e299 differ blob - /dev/null blob + a7d0a17833fb9633f7ac316e4ddc4b191d96b122 (mode 644) Binary files /dev/null and .git/objects/f4/36e69ede6124ee82e574370f5946c255b337a6 differ blob - /dev/null blob + 38cc1eb020fe5fb16b7a1ec35544c7e963ca0281 (mode 644) Binary files /dev/null and .git/objects/f5/a18aa151e6c77439cc7217c9a614b3f6d71934 differ blob - /dev/null blob + 73d15ffa39a7603f0faa002237f125ac6fa6f7e4 (mode 644) Binary files /dev/null and .git/objects/f7/c1a4620ee29c4c62dcfcc7a88cad093f7be676 differ blob - /dev/null blob + d4df43e6763e1b7cb5428b2fe908e61e2666de32 (mode 644) Binary files /dev/null and .git/objects/f9/4ac7cc1ce735384b395704d6abdfc00078ee4a differ blob - /dev/null blob + b268b7728e05b41b2a12a56b9f81a59dcea5c3a9 (mode 644) Binary files /dev/null and .git/objects/f9/56de6f3418b586338c48e8b714459a95015e0e differ blob - /dev/null blob + cb60f61d46e1bd475fccff40a013e7c808f548d5 (mode 644) Binary files /dev/null and .git/objects/fa/822d8860b649893324a4baf7bc85c28ef9b4c1 differ blob - /dev/null blob + f97e67811baeece904ff620e1e94348e436f06c3 (mode 644) Binary files /dev/null and .git/objects/fe/d88804b2402b1261343ab821c4cce5bcd6cee7 differ blob - /dev/null blob + 7a40c763db2492379eb45c45cd4aadcfa826871a (mode 644) --- /dev/null +++ .git/refs/heads/main @@ -0,0 +1 @@ +470736f144158f60ac52df255899c431fc5a7542 blob - /dev/null blob + 4b0a87595873e6007ce078a8631d3a757097d1a0 (mode 644) --- /dev/null +++ .git/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/main blob - /dev/null blob + 7a40c763db2492379eb45c45cd4aadcfa826871a (mode 644) --- /dev/null +++ .git/refs/remotes/origin/main @@ -0,0 +1 @@ +470736f144158f60ac52df255899c431fc5a7542 blob - /dev/null blob + 64ee965c27ead77378e8042ed23c76a36fa4bc62 (mode 644) --- /dev/null +++ .gitignore @@ -0,0 +1,26 @@ +*~ +*.elc +auto-save-list +recentf +savehist +saveplace +eshell +elpa +semanticdb +url +ede-projects.el +.DS_Store +custom.el +places +.smex-items +savefile/ +projectile-bookmarks.eld +projects +.lsp-session* +session* +.cask +tramp +.cache +/var/pcache +custom.el +transient/ blob - /dev/null blob + e5495fc693cdbb9cd965fa40001315902da13615 (mode 644) --- /dev/null +++ init.el @@ -0,0 +1,676 @@ +;;; init.el --- A random init file; -*- lexical-binding: t; -*- + +;;; Commentary: + +;; This package is my Emacs! + +;;; Code: + +(require 'package) + +(add-to-list 'package-archives + '("melpa" . "https://melpa.org/packages/") t) +(setq package-enable-at-startup nil) +(package-initialize) + +;; ================= +;; => General +;; ================= + +(set-face-attribute 'default nil + ;; :family "Office Code Pro" + :height 140 + :weight 'normal + :width 'normal) + + +(defconst savefile-dir (expand-file-name "savefile" user-emacs-directory)) +(unless (file-exists-p savefile-dir) + (make-directory savefile-dir)) + + +;; Backup files +(defconst backup-dir (expand-file-name "backups" user-emacs-directory)) +(unless (file-exists-p backup-dir) + (make-directory backup-dir)) + +(setq backup-directory-alist `(("." . ,backup-dir))) +(setq make-backup-files t) + +;; scrolling +(setq scroll-margin 0 + scroll-conservatively 100000 + scroll-preserve-screen-position 1) + +;; mode line settings +(size-indication-mode t) + +;; start maximized +(add-to-list 'initial-frame-alist '(fullscreen . maximized)) + +;; garbage collection frequency +(setq gc-cons-threshold 50000000) + +;; macos +(setq mac-command-modifier 'super) +(setq mac-option-modifier 'meta) + +;; enable y/n answer +(fset 'yes-or-no-p 'y-or-n-p) + +;; closing emacs +(defun my-confirm-kill-emacs (orig-fun &rest args) + (when (yes-or-no-p "Really quit Emacs? ") + (apply orig-fun args))) + +(advice-add 'save-buffers-kill-emacs :around #'my-confirm-kill-emacs) + +(defun my/evil-quit () + "Close window, or kill buffer if it's the last window." + (interactive) + (if (one-window-p) + (kill-this-buffer) + (evil-window-delete))) + +(with-eval-after-load 'evil + (evil-ex-define-cmd "q" #'my/evil-quit) + (evil-ex-define-cmd "quit" #'my/evil-quit)) + +;; display line number +(global-display-line-numbers-mode 1) +(add-hook 'prog-mode-hook #'display-line-numbers-mode) + +;; mode line +(line-number-mode t) +(column-number-mode t) +(size-indication-mode t) + +;; No blink cursor +(blink-cursor-mode 0) + +;; newline at the end +(setq require-final-newline t) + +;; wrap lines at 80 chars +(setq-default fill-column 80) + +;; delete selection with a keypress +(delete-selection-mode t) + +;; revert buffers when files are changed +(global-auto-revert-mode 1) + +;; toolbar disabled +(tool-bar-mode -1) + +;; disable ring bell +(setq ring-bell-function 'ignore) + +;; disable startup screen +(setq inhibit-startup-screen t) + + +;; Store auto-save files in /tmp +(setq auto-save-file-name-transforms + `((".*" ,temporary-file-directory t))) + +;; Store lock files in /tmp +(setq lock-file-name-transforms + `((".*" ,temporary-file-directory t))) + +;;tab # spaces +(setq tab-width 2) +(setq-default indent-tabs-mode nil) + +;; Terminal color +(require 'ansi-color) +(add-hook 'compilation-filter-hook 'ansi-color-compilation-filter) + +;; Mini buffer +(defun stop-using-minibuffer () + "Kill the minibuffer." + (when (and (>= (recursion-depth) 1) (active-minibuffer-window)) + (abort-recursive-edit))) + +(add-hook 'mouse-leave-buffer-hook 'stop-using-minibuffer) + +;; Buffer +(use-package ibuffer :ensure nil + :config + (setq ibuffer-expert t) + (setq ibuffer-display-summary nil) + (setq ibuffer-use-other-window nil) + (setq ibuffer-show-empty-filter-groups nil) + (setq ibuffer-default-sorting-mode 'filename/process) + (setq ibuffer-title-face 'font-lock-doc-face) + (setq ibuffer-use-header-line t) + (setq ibuffer-default-shrink-to-minimum-size nil) + (setq ibuffer-formats + '((mark modified read-only locked " " + (name 30 30 :left :elide) + " " + (size 9 -1 :right) + " " + (mode 16 16 :left :elide) + " " filename-and-process) + (mark " " + (name 16 -1) + " " filename))) + (setq ibuffer-saved-filter-groups + '(("Main" + ("Directories" (mode . dired-mode)) + ("C++" (or + (mode . c++-mode) + (mode . c++-ts-mode) + (mode . c-mode) + (mode . c-ts-mode) + (mode . c-or-c++-ts-mode))) + ("Python" (or + (mode . python-ts-mode) + (mode . c-mode) + (mode . python-mode))) + ("Build" (or + (mode . make-mode) + (mode . makefile-gmake-mode) + (name . "^Makefile$") + (mode . change-log-mode))) + ("Scripts" (or + (mode . shell-script-mode) + (mode . shell-mode) + (mode . sh-mode) + (mode . lua-mode) + (mode . bat-mode))) + ("Config" (or + (mode . conf-mode) + (mode . conf-toml-mode) + (mode . toml-ts-mode) + (mode . conf-windows-mode) + (name . "^\\.clangd$") + (name . "^\\.gitignore$") + (name . "^Doxyfile$") + (name . "^config\\.toml$") + (mode . yaml-mode))) + ("Web" (or + (mode . mhtml-mode) + (mode . html-mode) + (mode . web-mode) + (mode . nxml-mode))) + ("CSS" (or + (mode . css-mode) + (mode . sass-mode))) + ("JS" (or + (mode . js-mode) + (mode . rjsx-mode))) + ("Markup" (or + (mode . markdown-mode) + (mode . adoc-mode))) + ("Org" (mode . org-mode)) + ("LaTeX" (name . "\.tex$")) + ("Magit" (or + (mode . magit-blame-mode) + (mode . magit-cherry-mode) + (mode . magit-diff-mode) + (mode . magit-log-mode) + (mode . magit-process-mode) + (mode . magit-status-mode))) + ("Apps" (or + (mode . elfeed-search-mode) + (mode . elfeed-show-mode))) + ("Fundamental" (or + (mode . fundamental-mode) + (mode . text-mode))) + ("Emacs" (or + (mode . emacs-lisp-mode) + (name . "^\\*Help\\*$") + (name . "^\\*Custom.*") + (name . "^\\*Org Agenda\\*$") + (name . "^\\*info\\*$") + (name . "^\\*scratch\\*$") + (name . "^\\*Backtrace\\*$") + (name . "^\\*Messages\\*$")))))) + :hook + (ibuffer-mode . (lambda () + (ibuffer-switch-to-saved-filter-groups "Main"))) +) + +;; Compiler +(setq compile-command "cmake --build build") + +(defun my-cmake-configure () + "Generate the CMake build folder." + (interactive) + (let ((cmd (read-shell-command "Configure command: " "cmake -S . -B build" 'compile-history))) + (compile cmd))) + +(defun my-cmake-build () + "Compile the C++ project." + (interactive) + (let ((cmd (read-shell-command "Build command: " "cmake --build build" 'compile-history))) + (compile cmd))) + +(defun my-ctest-run () + "Run the C++ test." + (interactive) + (let ((cmd (read-shell-command "Test command: " "ctest --test-dir build --output-on-failure" 'compile-history))) + (compile cmd))) + +;; bbatsov +;; more useful frame title, that show either a file or a +;; buffer name (if the buffer isn't visiting a file) +(setq frame-title-format + '((:eval (if (buffer-file-name) + (abbreviate-file-name (buffer-file-name)) + "%b")))) + +(defun reload-init-file () + "Recompile and reload the init file." + (interactive) + (byte-compile-file user-init-file) + (load-file user-init-file)) + +;; ================= +;; => Core binding +;; ================= +(defun get-key-leads (extra) + "Append the main custom combination to EXTRA combination." + (concat "" extra)) + +(defun get-main-kbd (extra) + "Set a key combination plus EXTRA." + (kbd (get-key-leads extra))) + +(defvar-keymap w-key-map + :doc "Window management commands" + "-" 'split-window-below ;; Split horizontally (one above the other) + "/" 'split-window-right ;; Split vertically (side-by-side) + "o" 'other-window ;; Cycle cursor to the next split + "d" 'delete-window ;; Close the current split + "D" 'delete-other-windows) ;; Maximize current (closes all other splits) +(global-set-key (get-main-kbd "w") (cons "window" w-key-map)) + +(defvar-keymap g-key-map + :doc "Git and Magit commands") +(global-set-key (get-main-kbd "g") (cons "magit" g-key-map)) + +(defvar-keymap f-key-map + :doc "File management commands" + "s" 'save-buffer) +(global-set-key (get-main-kbd "f") (cons "file" f-key-map)) + +(defvar-keymap s-key-map + :doc "Search commands") +(global-set-key (get-main-kbd "s") (cons "search" s-key-map)) + +(defvar-keymap e-key-map + :doc "Emacs management commands" + "r" 'reload-init-file + "K" 'kill-emacs) +(global-set-key (get-main-kbd "e") (cons "emacs" e-key-map)) + +(defvar-keymap p-key-map + :doc "Project and Build commands" + "c" 'my-cmake-configure + "b" 'my-cmake-build + "t" 'my-ctest-run) +(global-set-key (get-main-kbd "p") (cons "project" p-key-map)) + +;; replace buffer-menu with ibuffer +(global-set-key [remap list-buffers] 'ibuffer) + +(global-set-key (kbd "C-x ") #'xref-go-back) +(global-set-key (kbd "C-x ") #'xref-go-forward) + +;; ================= +;; => Packages +;; ================= +(unless (package-installed-p 'use-package) + (package-refresh-contents) + (package-install 'use-package)) + +(require 'use-package) +(setq use-package-always-ensure t) ;; Always install missing packages +(setq use-package-verbose t) + +(use-package diminish + :ensure t + :config + (diminish 'flyspell-mode) + (diminish 'flyspell-prog-mode)) + +;; rainbow +(use-package rainbow-mode + :ensure t + :config + (add-hook 'prog-mode-hook #'rainbow-mode) + (diminish 'rainbow-mode)) + +(use-package rainbow-delimiters + :ensure t + :hook + (prog-mode-hook . rainbow-delimiters-mode)) + +;; highlight things +(use-package highlight-parentheses + :ensure t + :hook + (prog-mode-hook . highlight-parentheses-mode) + :config + (setq highlight-parentheses-background-colors '("blue"))) + +(use-package hl-line + :ensure t + :config + (global-hl-line-mode 1)) + +(use-package whitespace + :ensure t + :init + ;; (dolist (hook '(prog-mode-hook text-mode-hook)) + ;; (add-hook hook #'whitespace-mode)) + (add-hook 'before-save-hook #'whitespace-cleanup) + :config + (setq whitespace-line-column 80) + (setq whitespace-style '(face tabs empty trailing lines-tail))) + +;; git +(use-package magit + :ensure t + :config + (define-key g-key-map (kbd "b") 'magit-diff-buffer-file) + (define-key g-key-map (kbd "g") 'magit-status) + (define-key g-key-map (kbd "s") 'magit-diff-buffer-staged) + (define-key g-key-map (kbd "u") 'magit-diff-buffer-unstaged)) + +(use-package git-timemachine + :ensure t + :bind ((" g t" . git-timemachine))) + +;; save place when saving! +(use-package savehist + :demand t + :config + (setq savehist-file (expand-file-name "my-savehist" savefile-dir)) + (savehist-mode 1)) + +(use-package saveplace + :ensure t + :defer 3 + :init + (save-place-mode 1) + :custom + (save-place-ignore-files-regexp + "\\(?:COMMIT_EDITMSG\\|hg-editor-[[:alnum:]]+\\.txt\\|elpa\\|svn-commit\\.tmp\\|bzr_log\\.[[:alnum:]]+\\)$") + (save-place-file (expand-file-name "my-saveplace" savefile-dir)) + (save-place-forget-unreadable-files t)) + +(use-package move-text + :ensure t + :bind + (([(meta shift up)] . move-text-up) + ([(meta shift down)] . move-text-down))) + +;; modeline +(use-package moody + :ensure t + :config + (setq x-underline-at-descent-line t) + (setq moody-mode-line-height 35) + (moody-replace-mode-line-buffer-identification) + (moody-replace-vc-mode) + (moody-replace-eldoc-minibuffer-message-function)) + +(use-package minions + :ensure t + :config (minions-mode 1)) + + + +(use-package projectile + :ensure t + :diminish projectile-mode + :bind-keymap + ("C-c p" . projectile-command-map) + :config + ;; Enable Projectile globally after loading it + (projectile-mode 1) + + ;; Optional performance tweaks + (setq projectile-indexing-method 'native) + (setq projectile-enable-caching t)) + +(use-package corfu + :ensure t + :custom + (corfu-cycle t) + (corfu-auto t) + (corfu-auto-preix 1) + (corfu-preselect 'first) + :bind + (:map corfu-map + ("" . corfu-insert) + ("TAB" . corfu-insert) + ("" . corfu-insert) + ("RET" . corfu-insert)) + :init + (global-corfu-mode) + (corfu-popupinfo-mode)) + +(use-package nerd-icons-corfu + :ensure t + :after corfu + :config + (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter)) + + +(use-package emacs + :custom + ;; TAB cycle if there are only few candidates + ;; (completion-cycle-threshold 3) + + ;; Enable indentation+completion using the TAB key. + ;; `completion-at-point' is often bound to M-TAB. + (tab-always-indent 'complete) + (text-mode-ispell-word-completion nil) + (read-extended-command-predicate #'command-completion-default-include-p)) + +(use-package flycheck + :ensure t + :init (global-flycheck-mode)) + +(use-package diff-hl + :ensure t + :config + (global-diff-hl-mode)) + +(use-package crux + :ensure t + :config + (define-key f-key-map (kbd "c") 'crux-copy-file-preserve-attributes) + (define-key f-key-map (kbd "r") 'crux-rename-buffer-and-file) + (define-key f-key-map (kbd "d") 'crux-delete-file-and-buffer)) + +(use-package rg + :ensure t + :bind (:map s-key-map + ("r" . rg) + (":" . rg-dwim-current-file) + ("/" . rg-project)) + :config + (rg-enable-default-bindings) + (define-key s-key-map (kbd "r") 'rg) + (define-key s-key-map (kbd ":") 'rg-dwim-current-file) + (define-key s-key-map (kbd "/") 'rg-project) + (require 'rg-isearch)) + +;; Evil mode +(use-package goto-chg + :ensure t) + +(use-package evil + :ensure t + :config + (defvar color-red "#ff6c6b") + (defvar color-foreground "#bbc2cf") + (defvar color-orange "#da8548") + (defvar color-green "#98be65") + (defvar color-yellow "#ecbe7b") + (defvar color-blue "#51afef") + (defvar color-magenta "#c678dd") + (defvar color-cyan "#46d9ff") + + ;; Configure evil cursor colors and shapes + (setq evil-emacs-state-cursor `(box ,color-red) + evil-normal-state-cursor `(box ,color-foreground) + evil-visual-state-cursor `(hollow ,color-orange) + evil-insert-state-cursor `(bar ,color-green) + evil-motion-state-cursor `(box ,color-yellow) + evil-replace-state-cursor `(hbar ,color-red) + evil-operator-state-cursor `(hollow ,color-magenta)) + (evil-mode 1)) + +(setq evil-mode-line-format 'before) + +;; End evil mode +(use-package vertico + :ensure t + :init + (vertico-mode)) + +(use-package emacs + :ensure t + :init + (setq enable-recursive-minibuffers t)) + +(use-package winum + :ensure t + :init + (setq winum-keymap + (let ((map (make-sparse-keymap))) + (define-key map (kbd "C-`") 'winum-select-window-by-number) + (define-key map (kbd "C-²") 'winum-select-window-by-number) + (define-key map (kbd "s-0") 'winum-select-window-0-or-10) + (define-key map (kbd "s-1") 'winum-select-window-1) + (define-key map (kbd "s-2") 'winum-select-window-2) + (define-key map (kbd "s-3") 'winum-select-window-3) + (define-key map (kbd "s-4") 'winum-select-window-4) + (define-key map (kbd "s-5") 'winum-select-window-5) + (define-key map (kbd "s-6") 'winum-select-window-6) + (define-key map (kbd "s-7") 'winum-select-window-7) + (define-key map (kbd "s-8") 'winum-select-window-8) + map)) + :config + (winum-mode)) + +;; use the `orderless' completion style. +(use-package orderless + :ensure t + :config + (setq completion-styles '(orderless basic) + completion-category-defaults nil + completion-category-overrides '((file (styles basic partial-completion))))) + +;; javascript world +(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) + +;; SQL +(use-package sql + :ensure t + :config + (setq sql-product 'sqlite) + (setq sql-sqlite-program "sqlite3")) + +;; For better SQL formatting +(use-package sqlformat + :ensure t + :config + (setq sqlformat-command 'sqlformat) + (setq sqlformat-args '("-s"))) + +;; lsp +(use-package lsp-mode + :ensure t + :init + ;; set prefix for lsp-command-keymap (few alternatives - "C-l", "C-c l") + (setq lsp-keymap-prefix "C-c l") + :config + (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]\\opt\\'") + :hook ( + (javascript-mode . lsp) + (js2-mode-hook . lsp) + (go-mode . lsp) + (python-mode-hook . lsp-deferred) + ((c-mode c++-mode) . lsp-deferred) + ;; if you want which-key integration + (lsp-mode . lsp-enable-which-key-integration)) + :commands (lsp lsp-deferred) + :custom + (lsp-completion-provider :none) + (setq lsp-clients-clangd-args '("--header-insertion=iwyu" + "--background-index" + "--clang-tidy"))) + +(use-package lsp-ui + :ensure t + :commands lsp-ui-mode) + +(use-package go-mode + :ensure t + :mode "\\.go\\'") + +(use-package gotest + :after go-mode + :bind (:map go-mode-map + ("C-c t t" . go-test-current-test) + ("C-c t f" . go-test-current-file) + ("C-c t p" . go-test-current-project))) + +(use-package smartparens + :ensure t + :hook (prog-mode text-mode markdown-mode) ;; + :config + (require 'smartparens-config)) + + +(use-package markdown-mode + :ensure t) + +(use-package which-key + :ensure t + :diminish + :config + (which-key-mode 1) + (setq which-key-popup-type 'side-window + which-key-side-window-location 'bottom + which-key-side-window-max-height 0.25 + which-key-separator " → " + which-key-idle-delay 0.3)) + +;; ## AI STUFF +(use-package gptel + :ensure t + :commands (gptel gptel-send gptel-rewrite) + :config + (setq gptel-backend + (gptel-make-openai + "OpenAI" + :key (gptel-api-key-from-auth-source "api.openai.com") + :stream t)) + (setq gptel-model 'gpt-4o-mini)) + +(add-to-list 'load-path "~/.emacs.d/codeium.el") +;; ## + + +;; Loading theme +(load (expand-file-name (concat user-emacs-directory "singletheme-theme"))) +(load-theme 'moe-dark) +(singletheme-theme) + +;; separate custom file +(setq custom-file (expand-file-name "custom.el" user-emacs-directory)) + +(when (file-exists-p custom-file) + (load custom-file)) + +(provide 'init) +;;; init.el ends here blob - /dev/null blob + 559411aca482a96c49582b5d5d9e3edad23f9daa (mode 644) --- /dev/null +++ singletheme-theme.el @@ -0,0 +1,82 @@ +(deftheme singletheme "A nice theme.") + +(setq frame-background-mode 'dark) + +(let ((theme-bg "#12141a") + (theme-foreground "#e9eaf0") + (theme-bg3 "#03050b") + (theme-bg8 "#07090f") + (theme-property5 "#363a46") + (theme-property7 "#b7bbc8") + (theme-property9 "#bbbfcc") + (color-hl-line "RoyalBlue4") + (theme-orange "#ffb86c")) + + ;; region box (compatible with older Emacs) + (unwind-protect + (condition-case _ + (set-face-attribute + 'region nil + :box `(:line-width (-1 . -1) + :color ,theme-orange + :style nil)) + (error + (set-face-attribute + 'region nil + :box `(:line-width -1 + :color ,theme-orange + :style nil))))) + + (custom-theme-set-faces + 'singletheme + + ;; BASIC + `(default ((t (:family "Office Code Pro" + :width normal + :height 80 + :weight regular + :background ,theme-bg + :foreground ,theme-foreground)))) + + `(hl-line ((t (:background ,color-hl-line)))) + `(mode-line-buffer-id ((t (:foreground "white" :weight bold)))) + `(lazy-highlight ((t (:foreground "black" :background "#f9ebea")))) + + ;; rainbow-delimiters + `(rainbow-delimiters-depth-2-face ((t (:foreground "deep pink")))) + `(rainbow-delimiters-depth-3-face ((t (:foreground "chartreuse")))) + `(rainbow-delimiters-depth-4-face ((t (:foreground "deep sky blue")))) + `(rainbow-delimiters-depth-5-face ((t (:foreground "yellow")))) + `(rainbow-delimiters-depth-6-face ((t (:foreground "orchid")))) + `(rainbow-delimiters-depth-7-face ((t (:foreground "spring green")))) + `(rainbow-delimiters-depth-8-face ((t (:foreground "sienna1")))) + + ;; linum + `(linum ((t (:foreground ,theme-property5)))) + `(linum-relative-current-face ((t (:foreground ,theme-property5)))) + + ;; company + `(company-tooltip ((t (:background ,theme-bg3 + :foreground ,theme-property7)))) + + ;; org + `(org-block ((t (:background ,theme-bg8 + :foreground ,theme-property9)))))) + +(custom-theme-set-variables + 'singletheme + '(linum-format " %3i ")) + +;;;###autoload +(when load-file-name + (add-to-list 'custom-theme-load-path + (file-name-as-directory + (file-name-directory load-file-name)))) + +;;;###autoload +(defun singletheme-theme () + "Apply the singletheme theme." + (interactive) + (load-theme 'singletheme t)) + +(provide-theme 'singletheme)