git-remote-mediawiki: obey advice.pushNonFastForward

diff --git a/archive.h b/archive.h
index 4e44549fdd702ceca430aeb319cc5d5f1afc7ac9..2b0884f1ef3123f26d9a7b3ba03e3d14ae1ccd57 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -1,9 +1,6 @@
 #ifndef ARCHIVE_H
 #define ARCHIVE_H
 
-#define MAX_EXTRA_ARGS 32
-#define MAX_ARGS       (MAX_EXTRA_ARGS + 32)
-
 struct archiver_args {
        const char *base;
        size_t baselen;
@@ -13,39 +10,28 @@ struct archiver_args {
        time_t time;
        const char **pathspec;
        unsigned int verbose : 1;
-       void *extra;
+       unsigned int worktree_attributes : 1;
+       int compression_level;
 };
 
-typedef int (*write_archive_fn_t)(struct archiver_args *);
-
-typedef void *(*parse_extra_args_fn_t)(int argc, const char **argv);
-
-typedef int (*write_archive_entry_fn_t)(struct archiver_args *args, const unsigned char *sha1, const char *path, size_t pathlen, unsigned int mode, void *buffer, unsigned long size);
-
+#define ARCHIVER_WANT_COMPRESSION_LEVELS 1
+#define ARCHIVER_REMOTE 2
 struct archiver {
        const char *name;
-       write_archive_fn_t write_archive;
-       parse_extra_args_fn_t parse_extra;
+       int (*write_archive)(const struct archiver *, struct archiver_args *);
+       unsigned flags;
+       void *data;
 };
+extern void register_archiver(struct archiver *);
 
-extern int parse_archive_args(int argc, const char **argv, const struct archiver **ar, struct archiver_args *args);
+extern void init_tar_archiver(void);
+extern void init_zip_archiver(void);
 
-extern void parse_treeish_arg(const char **treeish,
-                             struct archiver_args *ar_args,
-                             const char *prefix);
-
-extern void parse_pathspec_arg(const char **pathspec,
-                              struct archiver_args *args);
-/*
- * Archive-format specific backends.
- */
-extern int write_tar_archive(struct archiver_args *);
-extern int write_zip_archive(struct archiver_args *);
-extern void *parse_extra_zip_args(int argc, const char **argv);
-
-extern void *sha1_file_to_archive(const char *path, const unsigned char *sha1, unsigned int mode, enum object_type *type, unsigned long *size, const struct commit *commit);
-extern int is_archive_path_ignored(const char *path);
+typedef int (*write_archive_entry_fn_t)(struct archiver_args *args, const unsigned char *sha1, const char *path, size_t pathlen, unsigned int mode, void *buffer, unsigned long size);
 
 extern int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
+extern int write_archive(int argc, const char **argv, const char *prefix, int setup_prefix, const char *name_hint, int remote);
+
+const char *archive_format_from_filename(const char *filename);
 
 #endif /* ARCHIVE_H */