summaryrefslogtreecommitdiff
path: root/cmd.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-09-01 22:40:24 +0200
committerLars Hjemli <hjemli@gmail.com>2008-09-01 22:40:24 +0200
commit288d502b3d8e7fa916104b486bbb146521e5c716 (patch)
treeafa132f6c973ab30e0b8ed1201fb691fe91103c0 /cmd.c
parent2cecf839a06ce951db0d5d95abf79004eff33ca7 (diff)
parent02a545e63454530c1639014d3239c14ced2022c6 (diff)
downloadcgit-288d502b3d8e7fa916104b486bbb146521e5c716.tar.gz
cgit-288d502b3d8e7fa916104b486bbb146521e5c716.tar.bz2
cgit-288d502b3d8e7fa916104b486bbb146521e5c716.zip
Merge branch 'lh/clone'
* lh/clone: Add support for cloning over http Conflicts: cmd.c
Diffstat (limited to '')
-rw-r--r--cmd.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/cmd.c b/cmd.c
index c0e4db3..40ac53e 100644
--- a/cmd.c
+++ b/cmd.c
@@ -12,6 +12,7 @@
#include "ui-shared.h"
#include "ui-atom.h"
#include "ui-blob.h"
+#include "ui-clone.h"
#include "ui-commit.h"
#include "ui-diff.h"
#include "ui-log.h"
@@ -23,6 +24,11 @@
#include "ui-tag.h"
#include "ui-tree.h"
+static void HEAD_fn(struct cgit_context *ctx)
+{
+ cgit_clone_head(ctx);
+}
+
static void atom_fn(struct cgit_context *ctx)
{
cgit_print_atom(ctx->qry.head, ctx->qry.path, 10);
@@ -51,6 +57,11 @@ static void diff_fn(struct cgit_context *ctx)
cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path);
}
+static void info_fn(struct cgit_context *ctx)
+{
+ cgit_clone_info(ctx);
+}
+
static void log_fn(struct cgit_context *ctx)
{
cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count,
@@ -65,6 +76,11 @@ static void ls_cache_fn(struct cgit_context *ctx)
cache_ls(ctx->cfg.cache_root);
}
+static void objects_fn(struct cgit_context *ctx)
+{
+ cgit_clone_objects(ctx);
+}
+
static void repolist_fn(struct cgit_context *ctx)
{
cgit_print_repolist();
@@ -108,13 +124,16 @@ static void tree_fn(struct cgit_context *ctx)
struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
{
static struct cgit_cmd cmds[] = {
+ def_cmd(HEAD, 1, 0),
def_cmd(atom, 1, 0),
def_cmd(about, 0, 1),
def_cmd(blob, 1, 0),
def_cmd(commit, 1, 1),
def_cmd(diff, 1, 1),
+ def_cmd(info, 1, 0),
def_cmd(log, 1, 1),
def_cmd(ls_cache, 0, 0),
+ def_cmd(objects, 1, 0),
def_cmd(patch, 1, 0),
def_cmd(refs, 1, 1),
def_cmd(repolist, 0, 0),
'2014-04-18 01:31:47 +0200'>2014-04-18reencryption: remove temporary file on failureJason A. Donenfeld1-1/+1 2014-04-18reencryption: only reencrypt files when requiredJason A. Donenfeld2-16/+37 2014-04-17cp: typo as cvJason A. Donenfeld1-1/+1 2014-04-17bash: gpg_id is localJason A. Donenfeld1-0/+1 2014-04-17move/copy: always reencrypt passwords at destinationJason A. Donenfeld5-25/+56 2014-04-17makefile: allow platform files with gnu sedJason A. Donenfeld1-7/+8 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-04-17mv: Add pass mv/rename supportJason A. Donenfeld5-3/+78 Based-on-work-by: Matthieu Weber <mweber@free.fr> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-04-17revelation2pass: add plain XML importJavali1-11/+15 I found that revelatio2pass.py script doesn't work. It can not decrypt my password file. I got following error message: raceback (most recent call last): File "git/password-store/contrib/importers/revelation2pass.py", line 159, in <module> main(args.FILE, verbose=args.verbose, xml=args.xml) File "git/password-store/contrib/importers/revelation2pass.py", line 140, in main cleardata_gz = decrypt_gz(password, data) File "git/password-store/contrib/importers/revelation2pass.py", line 117, in decrypt_gz ct = c.decrypt(cipher_text[28:]) File "/usr/lib/python2.7/site-packages/Crypto/Cipher/blockalgo.py", line 295, in decrypt return self._cipher.decrypt(ciphertext) I was unable to fix the problem, but I created a workaround, that add plain XML import option to the revelation2pass.py script. Revelation can export its password file as plain XML format. 2014-04-17platform: add cygwin supportJason A. Donenfeld2-1/+17 According to Brandon Jones, all we need to do is adjust /dev/clipboard from xclip. So we add a platform specific file to do so. http://www.relaytheurgency.com/2014/04/pass-in-cygwin-relatively-simple.html Suggested-by: Brandon Jones <jones.brandon.lee@gmail.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>