[tasks] 01/01: Switch to plain text
Ximin Luo
infinity0 at debian.org
Tue Nov 15 18:14:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository tasks.
commit 5b097386f235fa91f3ed7b15bb979d5696e334cf
Author: Ximin Luo <infinity0 at debian.org>
Date: Tue Nov 15 19:14:17 2016 +0100
Switch to plain text
---
.gitattributes | 2 --
.gitignore | 4 ----
.gitmodules | 3 ---
README | 48 ------------------------------------------------
examples/taskrc.local | 28 ----------------------------
hooks/on-exit_git.sh | 1 -
merge-tw-export | 35 -----------------------------------
pending.data | 4 ----
pending.txt | 11 +++++++++++
pending.z.json | 35 -----------------------------------
task | 44 --------------------------------------------
task-history-git | 1 -
taskrc | 11 -----------
13 files changed, 11 insertions(+), 216 deletions(-)
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 0dc187d..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-pending.data conflict-marker-size=72 merge=tw-export
-pending.z.json conflict-marker-size=72 merge=tw-export
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c26c462..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/taskrc.local
-/*.data
-/*.data.bak_*
-!/pending.data
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index fe9edea..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "task-history-git"]
- path = task-history-git
- url = https://github.com/8ware/task-history-git
diff --git a/README b/README
deleted file mode 100644
index 0fb9acc..0000000
--- a/README
+++ /dev/null
@@ -1,48 +0,0 @@
-You need the `taskwarrior` program to use this repo.
-
-https://packages.debian.org/sid/taskwarrior
-
-But don't run /usr/bin/task, run ./task instead. That includes some presets to
-work directly inside this repo, instead of your ~/.task directory. It also
-includes the task-history-git plugin, which helps taskwarrior to work more
-smoothly when its data is stored inside a git repo.
-
-If you're not familiar with it, please take some time to read the docs here:
-
-https://taskwarrior.org/docs/
-
-Using this repository
-=====================
-
-Your general work flow is:
-
-$ git pull # or git pull --rebase
-$ ./task $hack $hack $hack # will automatically create a git commit
-$ git push
-
-The raw data is stored in pending.data as well as pending.z.json. These two
-files are kept in-sync automatically by our scripts; you should not need to
-edit either of them during normal workflow. The other *.data files used by
-taskwarrior are autogenerated by task-history-git, and not checked in.
-
-pending.z.json is to help automated merges work a bit more smoothly, to reduce
-the amount of manual merge-conflict-resolution that is needed. Most of the
-time, you should not need to edit this file either. However, on occasion this
-can't be avoided, and you'll be *explicitly* asked to edit it. The JSON format
-hopefully makes this painless; time will tell if this is true. Note one case
-you have to handle with some care, see below:
-
-IMPORTANT
-=========
-
-In Taskwarrior, every task has a simple numerical ID (1, 2, 3, etc) and a UUID.
-Taskwarrior will reassign numerical IDs by default; however this repository has
-been configured so it will not do that, and once a numerical ID has been
-assigned to a task, it should be stable for all of eternity.
-
-THERE IS ONE EXCEPTION TO THIS: If you add a task locally, then pull from our
-central task repo, other tasks might have been added in the meantime. To
-prevent re-assignment of already-published numerical tasks, you MUST, when you
-perform a merge conflict resolution, put the unpublished tasks that you added
-locally, *after* the ones that have already been published and that you just
-pulled down from the remote side.
diff --git a/examples/taskrc.local b/examples/taskrc.local
deleted file mode 100644
index 8998edb..0000000
--- a/examples/taskrc.local
+++ /dev/null
@@ -1,28 +0,0 @@
-# [Created by task 2.5.1 10/24/2016 16:43:05]
-# Taskwarrior program configuration file.
-# For more documentation, see http://taskwarrior.org or try 'man task', 'man task-color',
-# 'man task-sync' or 'man taskrc'
-
-# Here is an example of entries that use the default, override and blank values
-# variable=foo -- By specifying a value, this overrides the default
-# variable= -- By specifying no value, this means no default
-# #variable=foo -- By commenting out the line, or deleting it, this uses the default
-
-# Use the command 'task show' to see all defaults and overrides
-
-# Color theme (uncomment one to use)
-#include /usr/share/taskwarrior/light-16.theme
-#include /usr/share/taskwarrior/light-256.theme
-#include /usr/share/taskwarrior/dark-16.theme
-#include /usr/share/taskwarrior/dark-256.theme
-#include /usr/share/taskwarrior/dark-red-256.theme
-#include /usr/share/taskwarrior/dark-green-256.theme
-#include /usr/share/taskwarrior/dark-blue-256.theme
-#include /usr/share/taskwarrior/dark-violets-256.theme
-#include /usr/share/taskwarrior/dark-yellow-green.theme
-#include /usr/share/taskwarrior/dark-gray-256.theme
-#include /usr/share/taskwarrior/dark-gray-blue-256.theme
-#include /usr/share/taskwarrior/solarized-dark-256.theme
-#include /usr/share/taskwarrior/solarized-light-256.theme
-#include /usr/share/taskwarrior/no-color.theme
-
diff --git a/hooks/on-exit_git.sh b/hooks/on-exit_git.sh
deleted file mode 120000
index c6f4d61..0000000
--- a/hooks/on-exit_git.sh
+++ /dev/null
@@ -1 +0,0 @@
-../task-history-git/on-exit_git.sh
\ No newline at end of file
diff --git a/merge-tw-export b/merge-tw-export
deleted file mode 100755
index ad19c25..0000000
--- a/merge-tw-export
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# Git merge-driver to help with automatic merging of pending.data.
-#
-# This driver checks pending.z.json, and if it contains no merge conflict
-# markers then it simply imports that data into taskwarrior. This depends on
-# the hack that git will try to merge "pending.z.json" before "pending.data",
-# (I can't figure out why, must be something to do with hashing) and that is
-# why we call it "pending.z.json" not "pending.json".
-set -e
-target="$5"
-echo >&2 "$0: merging $target"
-# This is not necessary; the default git merge-driver works fine, but seeing
-# the previous message is useful to assure that pending.z.json is indeed being
-# merged before pending.data.
-if [ "$target" = "pending.z.json" ]; then
- exec git merge-file -L "$target" --marker-size "$4" "$2" "$1" "$3"
-fi
-
-if ! grep -q "========================================================================" pending.z.json; then
- echo >&2 "Auto-merging pending.data by importing pending.z.json into it."
- rm -f pending.data; ./task rc.hooks=off import < pending.z.json
- cat pending.data > "$2"
-else
- cat >&2 <<eof
-================================================================================
-pending.z.json has conflicts. FIX THOSE MANUALLY FIRST, then run:
- git add pending.z.json
- rm -f pending.data; ./task rc.hooks=off import < pending.z.json
- git add pending.data
-if this succeeds, then you can proceed with the rest of the merge - i.e. by
-fixing any other conflicts, then \`git add\` those, then finally git-commit.
-================================================================================
-eof
- exit 1
-fi
diff --git a/pending.data b/pending.data
deleted file mode 100644
index 4cbdf76..0000000
--- a/pending.data
+++ /dev/null
@@ -1,4 +0,0 @@
-[description:"Add our initial tasks" entry:"1477325657" modified:"1477325657" status:"pending" uuid:"4c895653-e6aa-48e3-b123-6eff485211ea"]
-[description:"Investigate about a web export of these tasks" entry:"1478024792" modified:"1478024792" status:"pending" uuid:"ddb5a210-c66c-4470-a7c7-7702ce083967"]
-[description:"useable serial console access for armhf nodes" entry:"1478027180" modified:"1478027180" status:"pending" uuid:"b21a2f28-c90d-46cd-bd94-6e35bd2ab559"]
-[description:"Discuss adding clamping to s-d-e spec at the meeting in berlin" entry:"1478966715" modified:"1478966715" project:"RWS2" status:"pending" uuid:"03c12056-1c97-4f29-9d2d-248515398f0f"]
diff --git a/pending.txt b/pending.txt
new file mode 100644
index 0000000..7d91d6d
--- /dev/null
+++ b/pending.txt
@@ -0,0 +1,11 @@
+Tasks
+=====
+
+- Add our initial tasks
+
+- Investigate about a web export of these tasks
+ (probably obsolete)
+
+- useable serial console access for armhf nodes
+
+- Discuss adding clamping to s-d-e spec at the meeting in berlin
diff --git a/pending.z.json b/pending.z.json
deleted file mode 100644
index eb1956a..0000000
--- a/pending.z.json
+++ /dev/null
@@ -1,35 +0,0 @@
-[
- {
- "description": "Add our initial tasks",
- "entry": "20161024T161417Z",
- "id": 1,
- "modified": "20161024T161417Z",
- "status": "pending",
- "uuid": "4c895653-e6aa-48e3-b123-6eff485211ea"
- },
- {
- "description": "Investigate about a web export of these tasks",
- "entry": "20161101T182632Z",
- "id": 2,
- "modified": "20161101T182632Z",
- "status": "pending",
- "uuid": "ddb5a210-c66c-4470-a7c7-7702ce083967"
- },
- {
- "description": "useable serial console access for armhf nodes",
- "entry": "20161101T190620Z",
- "id": 3,
- "modified": "20161101T190620Z",
- "status": "pending",
- "uuid": "b21a2f28-c90d-46cd-bd94-6e35bd2ab559"
- },
- {
- "description": "Discuss adding clamping to s-d-e spec at the meeting in berlin",
- "entry": "20161112T160515Z",
- "id": 4,
- "modified": "20161112T160515Z",
- "project": "RWS2",
- "status": "pending",
- "uuid": "03c12056-1c97-4f29-9d2d-248515398f0f"
- }
-]
diff --git a/task b/task
deleted file mode 100755
index 329fcfa..0000000
--- a/task
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-set -e
-workdir="$(git rev-parse --show-toplevel)"
-
-################################################################################
-
-# Set up. This part should be idempotent.
-
-# Set up task-history-git
-git submodule update --init
-ln -rsf "$workdir/task-history-git/post-merge" "$(git rev-parse --git-dir)/hooks/post-merge"
-
-# Ensure local file exists
-test -f "$workdir/taskrc.local" || touch "$workdir/taskrc.local"
-
-# Add our merge driver
-git config --local merge.conflictstyle diff3
-git config --local merge.tw-export.name "autogenerate pending.data from pending.z.json"
-git config --local merge.tw-export.driver "./merge-tw-export %O %A %B %L %P"
-
-################################################################################
-
-export TASKRC="$workdir/taskrc"
-export TASKDATA="$workdir"
-
-set +e
-# Manually handle exit codes from here onwards
-
-#task import < pending.z.json 2>/dev/null 1>&2
-
-oldhead="$(git rev-parse HEAD)"
-task "$@"; x=$?
-# auto-export if we're not importing
-if ! echo "$*" | grep -q "\bimport\b"; then
- # urgency values are autogenerated, rm them from the export
- task rc.hooks=off export 2>/dev/null | python -m json.tool \
- | grep -v '^ "urgency": ' > pending.z.json
- newhead="$(git rev-parse HEAD)"
- if [ "$oldhead" != "$newhead" ]; then
- git add pending.z.json
- git commit --amend --no-edit
- fi
-fi
-exit $x
diff --git a/task-history-git b/task-history-git
deleted file mode 160000
index 8e90196..0000000
--- a/task-history-git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8e90196dca5c8f5efbeee1426db689fba01197f7
diff --git a/taskrc b/taskrc
deleted file mode 100644
index dff79a3..0000000
--- a/taskrc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Don't display the "header" stuff like "TASKRC/TASKDATA override"
-verbose=blank,footnote,label,new-id,affected,edit,special,project,sync,filter,unwait
-
-# Don't garbage collect, to have stable Task IDs
-gc=off
-
-# Don't enable recurrence, we'd want a calendar for that anyways
-recurrence=no
-
-# Include your own local overrides in taskrc.local
-include ./taskrc.local
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/tasks.git
More information about the Reproducible-commits
mailing list