[Monotone-commits-diffs] net.venge.monotone: 19e4162f7cbbb5dfe839373e16277190cfd1b977

[code]

revision:            19e4162f7cbbb5dfe839373e16277190cfd1b977
date:                2010-11-16T23:03:35
author:              address@hidden
branch:              net.venge.monotone
changelog:
merge of 'd29ec4adcacef7e948e27eacd139ef01157c6531'
     and 'dc25d66b3d37d721afd781b6ab69e370ba661c6a'

manifest:
format_version "1"

new_manifest [e1fb21291623ba97fe151e74506dbbc99c84267f]

old_revision [d29ec4adcacef7e948e27eacd139ef01157c6531]

patch "INSTALL"
 from [e100608f7df512e8330bed7061ef7ca2e53d49f5]
   to [eb4559c176283026b82861c26b928e8860efef2b]

patch "NEWS"
 from [956b162258987f6fcc94a3fe26975a246874326c]
   to [54f6f6f9977e74124c61714b66ee8d4ed14a1158]

patch "cmd_netsync.cc"
 from [a57cd36558ab3cf7aa2192203c456eeef1fec541]
   to [c5dcaa406cddacc083e28d68e5746ed4ad39ce25]

patch "gzip.hh"
 from [d8ba99ba959d68614258509a06a1c52d1ba7f023]
   to [649dfc0b250954f39c0f73870f8bec3f32f7fa43]

patch "po/it.po"
 from [1a555b6d4f9bea2b35bc94e9002d62d01a24423c]
   to [66969c6b06a053a730242c2342199e12c8ac5f15]

old_revision [dc25d66b3d37d721afd781b6ab69e370ba661c6a]

patch "cmd_files.cc"
 from [b6fc0e569a082e6f897123a12168f1adf26c5959]
   to [7e9ffd4a06daeb0ef7ab7557d3a656c6b99ab2ad]

patch "cmd_merging.cc"
 from [3f665ae0b10a9800925df54af0eb393c956d43a0]
   to [66c3882326a06d0abf878905bb515de80cc9e905]

patch "po/sv.po"
 from [47cd1f8c3066a46a8f85071213acefa52a0d98a7]
   to [34abd807134f89daad43984922063c2f627f2155]
============================================================
--- NEWS	956b162258987f6fcc94a3fe26975a246874326c
+++ NEWS	54f6f6f9977e74124c61714b66ee8d4ed14a1158
@@ -1,3 +1,23 @@
+XXX XXX XX XX:XX:XX UTC 2010
+
+        1.0 release.
+
+        Changes
+
+        New Features
+
+        Bugs fixed
+
+        - add compatibility with Botan 1.9.9 and newer
+          (fixes monotone issue 104)
+
+        - 'automate remote' and 'automate remote_stdio' now use
+          a given database given by an alias to read, store and validate
+          a remote server's key fingerprint (fixes monotone issue 95) 
+
+        Internal
+
+
 Sun Oct 31 21:51:16 UTC 2010
 
         0.99.1 release.
============================================================
--- INSTALL	e100608f7df512e8330bed7061ef7ca2e53d49f5
+++ INSTALL	eb4559c176283026b82861c26b928e8860efef2b
@@ -33,10 +33,11 @@ 1. prerequisites:
 
            install the following packages:
              autoconf automake gettext g++ libboost-dev libz-dev
-             libbotan-dev libsqlite3-dev libpcre3-dev liblua5.1-0-dev
+             libbotan1.7-dev libsqlite3-dev libpcre3-dev liblua5.1-0-dev
              libidn11-dev libgmp3-dev libbz2-dev texinfo
 
-           (On etch, you may need to use libbotan1.7 from lenny.)
+           (monotone works with older and newer Botan versions as well, 
+            so libbotan1.6-dev or libbotan1.8-dev are also good to go.)
 
         on FreeBSD:
 
============================================================
--- po/it.po	1a555b6d4f9bea2b35bc94e9002d62d01a24423c
+++ po/it.po	66969c6b06a053a730242c2342199e12c8ac5f15
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: monotone 0.48dev\n"
 "Report-Msgid-Bugs-To: address@hidden"
 "POT-Creation-Date: 2010-11-02 21:54+0100\n"
-"PO-Revision-Date: 2010-11-02 23:19+0100\n"
+"PO-Revision-Date: 2010-11-14 15:11+0100\n"
 "Last-Translator: Lapo Luchini <address@hidden>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -7156,15 +7156,15 @@ msgid "Revision: "
 
 #: rev_output.cc:61
 msgid "Revision: "
-msgstr "Revisione:"
+msgstr "Revisione: "
 
 #: rev_output.cc:67
 msgid "Parent:   "
-msgstr "Genitore: "
+msgstr "Genitore:  "
 
 #: rev_output.cc:99
 msgid "Tag:      "
-msgstr "Tag:      "
+msgstr "Tag:       "
 
 #: rev_output.cc:106
 msgid "Changelog: "
@@ -7172,7 +7172,7 @@ msgid "Comments: "
 
 #: rev_output.cc:114
 msgid "Comments: "
-msgstr "Commenti: "
+msgstr "Commenti:  "
 
 #: rev_output.cc:141
 msgid "Changes"
============================================================
--- cmd_netsync.cc	a57cd36558ab3cf7aa2192203c456eeef1fec541
+++ cmd_netsync.cc	c5dcaa406cddacc083e28d68e5746ed4ad39ce25
@@ -117,7 +117,7 @@ CMD_AUTOMATE_NO_STDIO(remote_stdio,
 
   app.opts.non_interactive = true;
 
-  if (app.opts.dbname.empty())
+  if (!app.opts.dbname_given)
     {
       W(F("No database given; assuming '%s' database. This means that we can't\n"
           "verify the server key, because we have no record of what it should be.")
@@ -218,7 +218,7 @@ CMD_AUTOMATE_NO_STDIO(remote,
   E(args.size() >= 1, origin::user,
     F("wrong argument count"));
 
-  if (app.opts.dbname.empty())
+  if (!app.opts.dbname_given)
     {
       W(F("No database given; assuming '%s' database. This means that we can't\n"
           "verify the server key, because we have no record of what it should be.")
============================================================
--- gzip.hh	d8ba99ba959d68614258509a06a1c52d1ba7f023
+++ gzip.hh	649dfc0b250954f39c0f73870f8bec3f32f7fa43
@@ -39,6 +39,7 @@ class Gzip_Compression : public Filter
       void write(const byte input[], u32bit length);
       void start_msg();
       void end_msg();
+      std::string name() const { return "Gzip_Compression"; }
 
       Gzip_Compression(u32bit = 1);
       ~Gzip_Compression();
@@ -62,6 +63,7 @@ class Gzip_Decompression : public Filter
       void write(const byte input[], u32bit length);
       void start_msg();
       void end_msg();
+      std::string name() const { return "Gzip_Decompression"; }
 
       Gzip_Decompression();
       ~Gzip_Decompression();
============================================================
--- po/sv.po	47cd1f8c3066a46a8f85071213acefa52a0d98a7
+++ po/sv.po	34abd807134f89daad43984922063c2f627f2155
@@ -154,8 +154,8 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: monotone 0.26pre1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-10-28 13:54+0200\n"
-"PO-Revision-Date: 2010-10-28 13:56+0200\n"
+"POT-Creation-Date: 2010-11-15 23:55+0100\n"
+"PO-Revision-Date: 2010-11-15 23:57+0100\n"
 "Last-Translator: Joel Rosdahl <address@hidden>\n"
 "Language-Team: Richard Levitte <address@hidden>\n"
 "Language: \n"
@@ -986,8 +986,8 @@ msgstr "Kör KOMMANDO på servern i andr
 #: cmd_packet.cc:257 cmd_key_cert.cc:81 cmd_key_cert.cc:186 cmd_merging.cc:384
 #: cmd_merging.cc:1131 cmd_merging.cc:1202 cmd_ws_commit.cc:1134
 #: cmd_ws_commit.cc:1342 cmd_ws_commit.cc:1456 cmd_ws_commit.cc:1478
-#: cmd_automate.cc:137 cmd_files.cc:238 cmd_files.cc:335 cmd_files.cc:359
-#: cmd_files.cc:393 automate.cc:85 automate.cc:122 automate.cc:175
+#: cmd_automate.cc:137 cmd_files.cc:239 cmd_files.cc:336 cmd_files.cc:360
+#: cmd_files.cc:394 automate.cc:85 automate.cc:122 automate.cc:175
 #: automate.cc:298 automate.cc:400 automate.cc:431 automate.cc:520
 #: automate.cc:1246 automate.cc:1419 automate.cc:1556 automate.cc:1592
 #: automate.cc:1624 automate.cc:1658 automate.cc:1690 automate.cc:1730
@@ -1352,7 +1352,7 @@ msgstr "Skriver ut alla certifikat koppl
 msgid "Prints all certificates attached to a revision"
 msgstr "Skriver ut alla certifikat kopplade till en revision"
 
-#: cmd_list.cc:1001 cmd_db.cc:621 cmd_files.cc:269 automate.cc:132
+#: cmd_list.cc:1001 cmd_db.cc:621 cmd_files.cc:270 automate.cc:132
 #: automate.cc:185 automate.cc:235 automate.cc:265 automate.cc:307
 #: automate.cc:312 automate.cc:406 automate.cc:437 automate.cc:1602
 #: automate.cc:1634 automate.cc:1701 automate.cc:1703 automate.cc:2175
@@ -1654,7 +1654,7 @@ msgstr ""
 
 #: cmd_merging.cc:209 cmd_merging.cc:824 cmd_ws_commit.cc:370
 #: cmd_ws_commit.cc:1358 cmd_ws_commit.cc:2042 cmd_ws_commit.cc:2270
-#: cmd_ws_commit.cc:2385 cmd_files.cc:307 cmd_files.cc:405 automate.cc:1035
+#: cmd_ws_commit.cc:2385 cmd_files.cc:308 cmd_files.cc:406 automate.cc:1035
 #: automate.cc:1328
 #, c-format
 msgid "this command can only be used in a single-parent workspace"
@@ -2010,8 +2010,8 @@ msgstr "den interna ihopslagningsmekanis
 msgstr "den interna ihopslagningsmekanismen misslyckades"
 
 #: cmd_merging.cc:1246
-msgid "[-r FROM] -r TO [PATH...]"
-msgstr "[-r FRÅN] -r TILL [SÖKVÄG...]"
+msgid "[PATH...]"
+msgstr "[SÖKVÄG ...]"
 
 #: cmd_merging.cc:1247
 msgid "Applies changes made at arbitrary places in history"
@@ -2973,7 +2973,7 @@ msgstr "Sätt attributet NYCKEL med vär
 "file mentioned in PATH."
 msgstr "Sätt attributet NYCKEL med värde VÄRDE på filen SÖKVÄG."
 
-#: cmd_ws_commit.cc:1336 cmd_files.cc:137 cmd_files.cc:232
+#: cmd_ws_commit.cc:1336 cmd_files.cc:138 cmd_files.cc:233
 msgid "PATH"
 msgstr "SÖKVÄG"
 
@@ -3407,63 +3407,63 @@ msgstr "Laddar in en fils innehåll till
 msgid "Loads a file's contents into the database"
 msgstr "Laddar in en fils innehåll till databasen"
 
-#: cmd_files.cc:57
-msgid "<parent> <left> <right>"
-msgstr "<förälder> <vänster> <höger>"
+#: cmd_files.cc:58
+msgid "PARENT_FILEID LEFT_FILEID RIGHT_FILEID"
+msgstr "FÖRÄLDERER_FILID VÄNSTER_FILID HÖGER_FILID"
 
-#: cmd_files.cc:58
+#: cmd_files.cc:59
 msgid "Merges 3 files and outputs the result"
 msgstr "Slår ihop 3 filer och skriver ut resultatet"
 
-#: cmd_files.cc:74
+#: cmd_files.cc:75
 #, c-format
 msgid "ancestor file id does not exist"
 msgstr "förälderns filidentitet finns inte"
 
-#: cmd_files.cc:77
+#: cmd_files.cc:78
 #, c-format
 msgid "left file id does not exist"
 msgstr "vänster fils identitet finns inte"
 
-#: cmd_files.cc:80
+#: cmd_files.cc:81
 #, c-format
 msgid "right file id does not exist"
 msgstr "höger fils identitet finns inte"
 
-#: cmd_files.cc:92
+#: cmd_files.cc:93
 #, c-format
 msgid "merge failed"
 msgstr "ihopslagningen misslyckades"
 
-#: cmd_files.cc:97
+#: cmd_files.cc:98
 msgid "SRCNAME DESTNAME SRCID DESTID"
 msgstr "KÄLLNAMN MÅLNAMN KÄLLID MÅLID"
 
-#: cmd_files.cc:98
+#: cmd_files.cc:99
 msgid "Differences 2 files and outputs the result"
 msgstr "Skriver ut skillnaden mellan 2 filer"
 
-#: cmd_files.cc:117
+#: cmd_files.cc:118
 #, c-format
 msgid "source file id does not exist"
 msgstr "källans filidentitet finns inte"
 
-#: cmd_files.cc:120
+#: cmd_files.cc:121
 #, c-format
 msgid "destination file id does not exist"
 msgstr "målets filidentitet finns inte"
 
-#: cmd_files.cc:138
+#: cmd_files.cc:139
 msgid "Prints an annotated copy of a file"
 msgstr "Skriver ut en annoterad kopia av en fil"
 
-#: cmd_files.cc:139
+#: cmd_files.cc:140
 msgid ""
 "Calculates and prints an annotated copy of the given file from the specified "
 "REVISION."
 msgstr "Skriver ut en annoterad kopia av en given fil från en given REVISION."
 
-#: cmd_files.cc:171
+#: cmd_files.cc:172
 #, c-format
 msgid ""
 "with no revision selected, this command can only be used in a single-parent "
@@ -3472,25 +3472,25 @@ msgstr ""
 "detta kommando kan bara användas för arbetskopior med en förälder när ingen "
 "specifik revision anges"
 
-#: cmd_files.cc:189
+#: cmd_files.cc:190
 #, c-format
 msgid "no such file '%s' in revision '%s'"
 msgstr "filen '%s' finns inte i revisionen '%s'"
 
-#: cmd_files.cc:193
+#: cmd_files.cc:194
 #, c-format
 msgid "'%s' in revision '%s' is not a file"
 msgstr "'%s' i revisionen '%s' är inte en fil"
 
-#: cmd_files.cc:201
+#: cmd_files.cc:202
 msgid "[PATH]"
 msgstr "[SÖKVÄG]"
 
-#: cmd_files.cc:202
+#: cmd_files.cc:203
 msgid "Calculates the identity of a file or stdin"
 msgstr "Räkna ut identiteten för SÖKVÄG eller stdin"
 
-#: cmd_files.cc:203
+#: cmd_files.cc:204
 msgid ""
 "If any PATH is given, calculates their identity; otherwise, the one from the "
 "standard input is calculated."
@@ -3498,53 +3498,53 @@ msgstr ""
 "Om någon SÖKVÄG är angiven räknas dess identitet ut; om ingen SÖKVÄG "
 "angivits räknas identiteten för data som kommer på stdin ut."
 
-#: cmd_files.cc:233
+#: cmd_files.cc:234
 msgid "Prints the file identifier of a file"
 msgstr "Skriver ut en fils identitet"
 
-#: cmd_files.cc:243
+#: cmd_files.cc:244
 #, c-format
 msgid "Cannot read from stdin"
 msgstr "Kan inte läsa från stdin"
 
-#: cmd_files.cc:257 cmd_files.cc:366 automate.cc:2070
+#: cmd_files.cc:258 cmd_files.cc:367 automate.cc:2070
 #, c-format
 msgid "no file version %s found in database"
 msgstr "filversionen %s finns inte i databasen"
 
-#: cmd_files.cc:279 cmd_files.cc:283
+#: cmd_files.cc:280 cmd_files.cc:284
 #, c-format
 msgid "no file '%s' found in revision '%s'"
 msgstr "filen '%s' finns inte i revisionen '%s'"
 
-#: cmd_files.cc:290 cmd_files.cc:387
+#: cmd_files.cc:291 cmd_files.cc:388
 msgid "FILENAME"
 msgstr "FILNAMN"
 
-#: cmd_files.cc:291
+#: cmd_files.cc:292
 msgid "Prints a file from the database"
 msgstr "Skriver ut angiven fil från databasen"
 
-#: cmd_files.cc:292
+#: cmd_files.cc:293
 msgid ""
 "Fetches the given file FILENAME from the database and prints it to the "
 "standard output."
 msgstr ""
 "Hämtar den angivna filen FILNAMN från database och skriver ut den på stdout."
 
-#: cmd_files.cc:329 cmd_files.cc:353 automate.cc:1652
+#: cmd_files.cc:330 cmd_files.cc:354 automate.cc:1652
 msgid "FILEID"
 msgstr "FILID"
 
-#: cmd_files.cc:330
+#: cmd_files.cc:331
 msgid "Prints the contents of a file (given an identifier)"
 msgstr "Skriver ut innehållet på en fil (givet en filidentitet)"
 
-#: cmd_files.cc:354
+#: cmd_files.cc:355
 msgid "Prints the size of a file (given an identifier)"
 msgstr "Skriver ut storleken på en fil (givet en filidentitet)"
 
-#: cmd_files.cc:388
+#: cmd_files.cc:389
 msgid "Prints the contents of a file (given a name)"
 msgstr "Skriver ut innehållet på en fil (givet ett filnamn)"
 
@@ -8461,6 +8461,12 @@ msgstr "Tryck [Retur] när underprocesse
 msgid "Press enter when the subprocess has completed"
 msgstr "Tryck [Retur] när underprocessen är klar"
 
+#~ msgid "[-r FROM] -r TO [PATH...]"
+#~ msgstr "[-r FRÅN] -r TILL [SÖKVÄG...]"
+
+#~ msgid "<parent> <left> <right>"
+#~ msgstr "<förälder> <vänster> <höger>"
+
 #~ msgid "Exports a revision from the database into a directory"
 #~ msgstr "Exporterar en revision från databasen till en katalog"
 
============================================================
--- cmd_files.cc	b6fc0e569a082e6f897123a12168f1adf26c5959
+++ cmd_files.cc	7e9ffd4a06daeb0ef7ab7557d3a656c6b99ab2ad
@@ -54,7 +54,8 @@ CMD(fload, "fload", "", CMD_REF(debug), 
   guard.commit();
 }
 
-CMD(fmerge, "fmerge", "", CMD_REF(debug), N_("<parent> <left> <right>"),
+CMD(fmerge, "fmerge", "", CMD_REF(debug),
+    N_("PARENT_FILEID LEFT_FILEID RIGHT_FILEID"),
     N_("Merges 3 files and outputs the result"),
     "",
     options::opts::none)
============================================================
--- cmd_merging.cc	3f665ae0b10a9800925df54af0eb393c956d43a0
+++ cmd_merging.cc	66c3882326a06d0abf878905bb515de80cc9e905
@@ -1243,7 +1243,7 @@ CMD_AUTOMATE(file_merge, N_("LEFT_REVID 
   output << merge_data;
 }
 
-CMD(pluck, "pluck", "", CMD_REF(workspace), N_("[-r FROM] -r TO [PATH...]"),
+CMD(pluck, "pluck", "", CMD_REF(workspace), N_("[PATH...]"),
     N_("Applies changes made at arbitrary places in history"),
     N_("This command takes changes made at any point in history, and "
        "edits your current workspace to include those changes.  The end result "