diff options
| -rw-r--r-- | po/de.po | 44 | ||||
| -rw-r--r-- | po/quilt.pot | 10 | ||||
| -rw-r--r-- | quilt.changes | 12 | ||||
| -rw-r--r-- | quilt/next.in | 2 | ||||
| -rw-r--r-- | quilt/pop.in | 2 | ||||
| -rw-r--r-- | quilt/previous.in | 2 | ||||
| -rw-r--r-- | quilt/push.in | 3 | ||||
| -rw-r--r-- | quilt/top.in | 2 | ||||
| -rw-r--r-- | scripts/dependency-graph.in | 33 |
9 files changed, 87 insertions, 23 deletions
@@ -12,13 +12,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../bin/quilt.in:15 -msgid "Usage: quilt command [-h] ..." -msgstr "Verwendung: quilt befehl [-h] ..." +msgid "Usage: quilt [--trace] [--quiltrc=XX] command [-h] ..." +msgstr "Verwendung: quilt [--trace] [--quiltrc=XX] befehl [-h] ..." -#: ../bin/quilt.in:27 +#: ../bin/quilt.in:17 msgid "Commands are:" msgstr "Vorhandene Befehle:" +#: ../bin/quilt.in:22 +msgid "" +"\n" +"Common options to all commands:\n" +"\n" +"--trace\n" +"\tRuns the command in bash trace mode (-x). For internal debugging.\n" +"\t\n" +"--quiltrc file\n" +"\tUse the specified configuration file instead of ~/.quiltrc. \n" +"\tSee pdf documentation for details about its possible content." +msgstr "" +"\n" +"Gemeinsame Optionen für alle Befehle:\n" +"\n" +"--trace\n" +"\tFührt die Kommandos im bash Trace-Modus (-x) aus. Für Debugging.\n" +"\t\n" +"--quiltrc datei\n" +"\tVerwende die angegebene Konfigrationsdatei statt ~/.quiltrc.\n" +"\tSiehe die pdf-Dokumentation für mögliche Einstellungen." + #: ../quilt/add.in:22 msgid "Usage: quilt add [-p patch] {file} ..." msgstr "Verwendung: quilt add [-p patch] {datei} ..." @@ -55,7 +77,7 @@ msgstr "Patch $patch ist nicht angewandt" #: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:168 #: ../quilt/files.in:75 ../quilt/fold.in:78 ../quilt/fork.in:64 -#: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:213 +#: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:214 #: ../quilt/refresh.in:107 ../quilt/remove.in:80 msgid "No patches applied" msgstr "Keine Patches angewandt" @@ -534,11 +556,11 @@ msgstr "Patch $stop_at_patch ist nicht angewandt." msgid "No patch removed" msgstr "Kein Patch entfernt" -#: ../quilt/pop.in:172 ../quilt/push.in:204 +#: ../quilt/pop.in:172 ../quilt/push.in:205 msgid "Interrupted by user" msgstr "Unterbrechung durch Benutzer" -#: ../quilt/pop.in:183 ../quilt/push.in:215 +#: ../quilt/pop.in:183 ../quilt/push.in:216 msgid "Now at patch $patch" msgstr "Jetzt in Patch $patch" @@ -622,7 +644,7 @@ msgstr "Patch $stop_at_patch in series-Datei nicht gefunden" msgid "Patch $stop_at_patch is already applied." msgstr "Patch $stop_at_patch ist bereits angewandt." -#: ../quilt/push.in:183 +#: ../quilt/push.in:184 msgid "" "The topmost patch $top is not in the series file anymore;\n" "cannot determine the next patch from the series file.\n" @@ -632,7 +654,7 @@ msgstr "" "kann den nächsten Patch nicht ermitteln. Bitte entfernen Sie\n" "mit pop -f den obersten Patch, und überprüfen Sie die series-Datei." -#: ../quilt/push.in:189 +#: ../quilt/push.in:190 msgid "File series fully applied, ends at patch $top" msgstr "series-Datei vollständig angewandt, endet in Patch $top" @@ -764,7 +786,8 @@ msgstr "" #: ../quilt/setup.in:27 msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}" -msgstr "Verwendung: quilt setup [-d pfad-prefix] [-v] {spec-datei|series-datei}" +msgstr "" +"Verwendung: quilt setup [-d pfad-prefix] [-v] {spec-datei|series-datei}" #: ../quilt/setup.in:30 msgid "" @@ -776,7 +799,8 @@ msgid "" "-v\tverbose debug output." msgstr "" "\n" -"Initialisiere einen Quellbaum aus einer rpm spec-Datei oder einer quilt series-Datei.\n" +"Initialisiere einen Quellbaum aus einer rpm spec-Datei oder einer quilt " +"series-Datei.\n" "\n" "-d\tOptionaler Pfad-Präfix (Unterverzeichnis).\n" "\n" diff --git a/po/quilt.pot b/po/quilt.pot index d806a5d..d903fe4 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -46,7 +46,7 @@ msgstr "" #: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:168 #: ../quilt/files.in:75 ../quilt/fold.in:78 ../quilt/fork.in:64 -#: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:213 +#: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:214 #: ../quilt/refresh.in:107 ../quilt/remove.in:80 msgid "No patches applied" msgstr "" @@ -413,11 +413,11 @@ msgstr "" msgid "No patch removed" msgstr "" -#: ../quilt/pop.in:172 ../quilt/push.in:204 +#: ../quilt/pop.in:172 ../quilt/push.in:205 msgid "Interrupted by user" msgstr "" -#: ../quilt/pop.in:183 ../quilt/push.in:215 +#: ../quilt/pop.in:183 ../quilt/push.in:216 msgid "Now at patch $patch" msgstr "" @@ -474,14 +474,14 @@ msgstr "" msgid "Patch $stop_at_patch is already applied." msgstr "" -#: ../quilt/push.in:183 +#: ../quilt/push.in:184 msgid "" "The topmost patch $top is not in the series file anymore;\n" "cannot determine the next patch from the series file.\n" "Please pop -f the top patch and check your series file." msgstr "" -#: ../quilt/push.in:189 +#: ../quilt/push.in:190 msgid "File series fully applied, ends at patch $top" msgstr "" diff --git a/quilt.changes b/quilt.changes index 68244d5..7ba2ba0 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Sat Jun 5 16:12:17 CEST 2004 - agruen@suse.de + +- Return exit status 2 when commands go beyond the series (top + with no series, push/next when all patches are applied, pop/ + previous when no patches are applied). +- From John Lenz <jelenz@students.wisc.edu>: Add compatibility + code to the dependency-graph script for reading the meta-data + of Holger Schurig's patcher tool, + http://www.holgerschurig.de/patcher.html. +- Update German translation. + +------------------------------------------------------------------- Tue Jun 1 22:59:41 CEST 2004 - agruen@suse.de - Fix from Dean Roehrich <roehrich@sgi.com>: Preserve file mode diff --git a/quilt/next.in b/quilt/next.in index 1af0891..59299cc 100644 --- a/quilt/next.in +++ b/quilt/next.in @@ -80,6 +80,8 @@ if [ -n "$next" ] then [ -n "$opt_filenames" ] && next=$(patch_file_name $next) echo "$next" +else + exit 2 fi ### Local Variables: ### mode: shell-script diff --git a/quilt/pop.in b/quilt/pop.in index 0bddef3..2a8e62f 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -156,7 +156,7 @@ then elif [ -z "$patches" ] then echo $"No patch removed" - exit 1 + exit 2 fi trap "interrupted=1" SIGINT diff --git a/quilt/previous.in b/quilt/previous.in index 61e1b89..12a005a 100644 --- a/quilt/previous.in +++ b/quilt/previous.in @@ -75,6 +75,8 @@ if [ -n "$previous" ] then [ -n "$opt_filenames" ] && previous=$(patch_file_name $previous) echo "$previous" +else + exit 2 fi ### Local Variables: diff --git a/quilt/push.in b/quilt/push.in index ae360a5..2705075 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -177,6 +177,7 @@ then if [ -z "$top" ] then echo $"No patches applied" + exit 2 elif [ -z "$(patch_file_name $top)" ] then echo -e \ @@ -187,8 +188,8 @@ Please pop -f the top patch and check your series file." else echo $"File series fully applied, ends at patch $top" + exit 2 fi - exit 1 fi trap "interrupted=1" SIGINT diff --git a/quilt/top.in b/quilt/top.in index 70fc162..e69cec2 100644 --- a/quilt/top.in +++ b/quilt/top.in @@ -64,6 +64,8 @@ top=$(top_patch) if [ -n "$top" ] then echo "$top" +else + exit 2 fi ### Local Variables: ### mode: shell-script diff --git a/scripts/dependency-graph.in b/scripts/dependency-graph.in index a51f541..f4742a3 100644 --- a/scripts/dependency-graph.in +++ b/scripts/dependency-graph.in @@ -19,6 +19,7 @@ my $highlighted_node_style = "style=bold"; # Command line arguments my $help = 0; +my $use_patcher = 0; # Assume patcher format for metadata my $short_edge_thresh = 0; # threshold for coloring as "short", 0 = disable my $long_edge_thresh = 0; # threshold for coloring as "long",0 = disable my $edge_labels; # label all edges with filenames @@ -37,6 +38,7 @@ my $lines; # check ranges with this number of context unless (GetOptions( "h|help" => \$help, + "patcher" => \$use_patcher, "short-edge=i" => \$short_edge_thresh, "long-edge=i" => \$long_edge_thresh, "edge-files" => \$edge_labels, @@ -55,12 +57,16 @@ unless (GetOptions( $basename =~ s:.*/::; my $fd = $help ? *STDOUT : *STDERR; print $fd <<EOF; -SYNOPSIS: $basename [-h] [--short-edge=num] [--long-edge=num] +SYNOPSIS: $basename [-h] [--patcher] [--short-edge=num] [--long-edge=num] [--short-edge-files] [--long-edge-files] [--edge-length] [--node-numbers] [--isolated] [--reduce] [--filter-patchnames=filter] [--select-patch=patch] [--select-distance=num] [--highlight=patch] [--lines=num] +--patcher + Assume patch manager is Holger Schurig's patcher script instead + of the default quilt. + --short-edge=num, --long-edge=num Define the maximum edge length of short edges, and minimum edge length of long edges. Short edges are de-emphasized, and long @@ -199,6 +205,13 @@ if (@ARGV) { } else { @patches = @ARGV; } +} elsif ($use_patcher) { + # Since patcher maintains a file called patchname.files, + # we can generate the graph for patches which are not applied! + my $fh = new FileHandle("< .patches/series") + or die ".patches/applied: $!\n"; + @patches = map { chomp; $_ } <$fh>; + $fh->close(); } else { my $fh = new FileHandle("< $ENV{QUILT_PC}/applied-patches") or die ".$ENV{QUILT_PC}/applied-patches: $!\n"; @@ -209,12 +222,20 @@ if (@ARGV) { # Fetch the list of files my $n = 0; foreach my $patch (@patches) { - if (! -d "$ENV{QUILT_PC}/$patch") { - print STDERR "$ENV{QUILT_PC}/$patch does not exist; skipping\n"; - next; + my @files; + if ($use_patcher) { + my $fh = new FileHandle("< .patches/$patch.files") + or die ".patches/$patch.files: $!\n"; + @files = map { chomp; $_ } <$fh>; + $fh->close(); + } else { + if (! -d "$ENV{QUILT_PC}/$patch") { + print STDERR "$ENV{QUILT_PC}/$patch does not exist; skipping\n"; + next; + } + @files = split(/\n/, `cd $ENV{QUILT_PC}/$patch ; find -type f ! -name .timestamp`); + @files = map { s:\./::; $_ } @files; } - my @files = split(/\n/, `cd $ENV{QUILT_PC}/$patch ; find -type f ! -name .timestamp`); - @files = map { s:\./::; $_ } @files; push @nodes, {number=>$n++, name=>$patch, file=>$patch, files=>{ map {$_ => []} @files } }; } |