diff options
| -rw-r--r-- | urn (renamed from vcx) | 8 | ||||
| -rw-r--r-- | urn.t (renamed from vcx.t) | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -15,7 +15,7 @@ use Compress::Zlib; use POSIX qw(strftime); use Digest::SHA qw(sha1_hex); -use constant REPO => '.vcx'; +use constant REPO => '.urn'; use constant HEAD => REPO . '/head'; # Current revision ID use constant INDEX => REPO . '/index'; # Index use constant OBJ_DIR => REPO . '/obj'; # Object store @@ -46,7 +46,7 @@ if ($cmd eq 'init') { } elsif ($cmd eq 'log') { run_log(); } elsif ($cmd eq 'show') { - # Usage: vcx show HEAD main.c + # Usage: show HEAD main.c my $rev = shift @args; my $file = shift @args; die "Usage: $0 show <rev_id|HEAD> <file_path>\n" unless defined $rev && defined $file; @@ -475,7 +475,7 @@ sub run_diff { my $f1 = ref($v1) ? "<(echo -n " . escapeshellarg($$v1) . ")" : escapeshellarg($v1); my $f2 = ref($v2) ? "<(echo -n " . escapeshellarg($$v2) . ")" : escapeshellarg($v2); if (system("bash", "-c", "diff -q $f1 $f2 > /dev/null 2>&1") != 0) { - $out->("\033[1mdiff --vcx a/$target_path b/$target_path\033[0m\n"); + $out->("\033[1mdiff --urn a/$target_path b/$target_path\033[0m\n"); # Stream the diff output line by line to the pipe open my $dfh, '-|', "bash -c \"diff -u $f1 $f2 | tail -n +3\""; while (<$dfh>) { $out->($_) } @@ -511,7 +511,7 @@ sub run_diff { my $f1 = ref($v1) ? "<(echo -n " . escapeshellarg($$v1) . ")" : escapeshellarg($v1); my $f2 = ref($v2) ? "<(echo -n " . escapeshellarg($$v2) . ")" : escapeshellarg($v2); if (system("bash", "-c", "diff -q $f1 $f2 > /dev/null 2>&1") != 0) { - $out->("\033[1mdiff --vcx a/$p_old b/$p_old\033[0m\n"); + $out->("\033[1mdiff --urn a/$p_old b/$p_old\033[0m\n"); open my $dfh, '-|', "bash -c \"diff -u $f1 $f2 | tail -n +3\""; while (<$dfh>) { $out->($_) } close $dfh; @@ -7,8 +7,8 @@ use Digest::SHA qw(sha1_hex); # Setup testing environment my $sandbox = File::Spec->rel2abs("sandbox_env"); -my $script_bin = File::Spec->catfile(File::Spec->rel2abs("."), "vcx"); -my $repo_meta = ".vcx"; +my $script_bin = File::Spec->catfile(File::Spec->rel2abs("."), "urn"); +my $repo_meta = ".urn"; remove_tree($sandbox); make_path($sandbox); |