mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'np/verbose-push'

Browse Source 
* np/verbose-push:
  make git-push a bit more verbose
This commit is contained in:
Junio C Hamano
2006-11-04 17:22:14 -08:00
parent 66fd23153a fa438a2eb1
commit 94d5ca8d0c
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-pack-objects.txt
View File

@ -10,7 +10,7 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git-pack-objects' [-q] [--no-reuse-delta] [--delta-base-offset] [--non-empty] 'git-pack-objects' [-q] [--no-reuse-delta] [--delta-base-offset] [--non-empty]
[--local] [--incremental] [--window=N] [--depth=N] [--local] [--incremental] [--window=N] [--depth=N] [--all-progress]
[--revs [--unpacked | --all]*] [--stdout | base-name] < object-list [--revs [--unpacked | --all]*] [--stdout | base-name] < object-list

18
builtin-pack-objects.c
View File

@ -15,7 +15,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <signal.h> #include <signal.h>
static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--delta-base-offset] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] [--revs [--unpacked | --all]*] [--stdout | base-name] <ref-list | <object-list]"; static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--delta-base-offset] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] [--all-progress] [--revs [--unpacked | --all]*] [--stdout | base-name] <ref-list | <object-list]";
struct object_entry { struct object_entry {
unsigned char sha1[20]; unsigned char sha1[20];
@ -475,15 +475,15 @@ static void write_pack_file(void)
unsigned long offset; unsigned long offset;
struct pack_header hdr; struct pack_header hdr;
unsigned last_percent = 999; unsigned last_percent = 999;
int do_progress = 0; int do_progress = progress;
if (!base_name) if (!base_name) {
f = sha1fd(1, "<stdout>"); f = sha1fd(1, "<stdout>");
else { do_progress >>= 1;
}
else
f = sha1create("%s-%s.%s", base_name, f = sha1create("%s-%s.%s", base_name,
sha1_to_hex(object_list_sha1), "pack"); sha1_to_hex(object_list_sha1), "pack");
do_progress = progress;
}
if (do_progress) if (do_progress)
fprintf(stderr, "Writing %d objects.\n", nr_result); fprintf(stderr, "Writing %d objects.\n", nr_result);
@ -1524,6 +1524,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
progress = 1; progress = 1;
continue; continue;
} }
if (!strcmp("--all-progress", arg)) {
progress = 2;
continue;
}
if (!strcmp("--incremental", arg)) { if (!strcmp("--incremental", arg)) {
incremental = 1; incremental = 1;
continue; continue;
@ -1641,7 +1645,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
else { else {
if (nr_result) if (nr_result)
prepare_pack(window, depth); prepare_pack(window, depth);
if (progress && pack_to_stdout) { if (progress == 1 && pack_to_stdout) {
/* the other end usually displays progress itself */ /* the other end usually displays progress itself */
struct itimerval v = {{0,},}; struct itimerval v = {{0,},};
setitimer(ITIMER_REAL, &v, NULL); setitimer(ITIMER_REAL, &v, NULL);

1
send-pack.c
View File

@ -29,6 +29,7 @@ static void exec_pack_objects(void)
{ {
static const char *args[] = { static const char *args[] = {
"pack-objects", "pack-objects",
"--all-progress",
"--stdout", "--stdout",
NULL NULL
}; };