# # # patch "AUTHORS" # from [df340c5609a2e8b2796e1cf2ace6fdf77e07df1b] # to [6d11d3b43946560eea3d5d5844befcd23faf5715] # # patch "INSTALL" # from [866aa4f26aa0b7a7fa109808385c269b9a43a3f3] # to [a4a2432bb3374ffef1847c40edcb03ec8a1a58e6] # # patch "Makefile.am" # from [5b4640a7fe07b68518c61c55d5b24ac2aa184251] # to [324eca98528201d46461e5ac4291f70ecb88ca84] # # patch "NEWS" # from [098a0ba6d8010d9ba7b4c1304703d168ba099d31] # to [4185f5904848634aafa6d7b3340df73533bc305c] # # patch "UPGRADE" # from [82a6a37f8de5e96c6d50ea34fd051385243dbde1] # to [e5ddbadaf9d13ee6deb96eee95d93341f1174044] # # patch "cmd.cc" # from [3df0d29e452cececbda5fac1b662adf6dc084e85] # to [ea6e5fc6bace3d9e9e83de97857ca3deae00ee27] # # patch "cmd.hh" # from [944525f2abd7d1d9fdce5e48eb35e8e91fbc1809] # to [03edc7b9874c2c35951735d7dd76ab7e89fac7c9] # # patch "cmd_diff_log.cc" # from [8c27f54076677b08a5d7ca1b7e0b01de7d81f2b0] # to [ddcd0dfc3c690b04ce83cb0fb68b8cce2795137e] # # patch "commands.cc" # from [36e4666430055a87eb0d71e709e21ac623489d90] # to [a8252add69f2ed2ed88512fb21e23939deb45b46] # # patch "commands.hh" # from [31506ab303271d2cde7f9070476439e2027c7480] # to [17323d9bc503702bd9a24c927f4200a99a6625ef] # # patch "configure.ac" # from [526a9af13ac143ef35c8579548280a71dc4eebdb] # to [f9cc126136c9c0751a02491b863de5963ac456ae] # # patch "monotone.cc" # from [1e9370a6b541ef2ffdd175cde43a60afbab0d276] # to [dc002c1cf57bd83c95abc9deb703faa373ed52eb] # # patch "monotone.spec" # from [e3702204cf048ca25bcd3ebebc7d07821235249b] # to [31cc477969b7be1f294053cfa4e3ef3684c24254] # # patch "options_list.hh" # from [a97ca4e2e92c85a109a6b73f83d2e5f0c8c80cc9] # to [fe3b7714d2c58e05d75fefc8d28bbe5935d22051] # # patch "po/de.po" # from [8675c2b8390175da36887317767c9236b65016bb] # to [fc2f4b5ba3470a0ec2e2a6b80d2041a4943d3133] # # patch "visualc/config.h" # from [335b4d4550a3ff867dbaa58329c86b5d374d9c5b] # to [b8a8bcfa9c06037efc8ef51af6e58411f408b0e2] # # patch "win32/monotone.iss" # from [116a4d7701c0c52e7574787880e431b9b4138de2] # to [035c0641bca85aa9f6942a68b4823c477efd1559] # ============================================================ --- AUTHORS df340c5609a2e8b2796e1cf2ace6fdf77e07df1b +++ AUTHORS 6d11d3b43946560eea3d5d5844befcd23faf5715 @@ -283,14 +283,6 @@ external libraries: external libraries: ------------------- -Monotone distributes unmodified or nearly unmodified copies of several -third-party libraries on which it relies. The binary 'mtn' executable -is a derivative work of these libraries as well as the monotone source -proper, but the monotone developers do not claim copyright in these -libraries (except to the extent that we have personally -contributed code to them). They are 'separate and independent works -in themselves'. - The files in netxx/ comprise the NetXX library, written by Peter Jones. It is no longer available from its author. It is distributed under a BSD-like license, reproduced here: @@ -394,21 +386,21 @@ address@hidden which are probably not copyrightable, and were not polled. address@hidden - three patches; typo fixes and use of IANA-reserved - example domain names - d64ee74bbafc09497d70c169667ae960171a5fcc - 8975520d4b2c73065004cb9d21990885b391d36c - eb8b5710e3720d4fb4ee3ae573aacc3b629ae1a3 + three patches; typo fixes and use of IANA-reserved + example domain names + d64ee74bbafc09497d70c169667ae960171a5fcc + 8975520d4b2c73065004cb9d21990885b391d36c + eb8b5710e3720d4fb4ee3ae573aacc3b629ae1a3 address@hidden - one patch; change of quoting conventions - fcd914bd694bbcc6d0fca080ac4c8132f78f2c2f + one patch; change of quoting conventions + fcd914bd694bbcc6d0fca080ac4c8132f78f2c2f address@hidden - one patch; corrected "cat revision" to "automate get_revision" - e92a79a9a56076a4ead5013c29fb705a3c4de719 + one patch; corrected "cat revision" to "automate get_revision" + e92a79a9a56076a4ead5013c29fb705a3c4de719 address@hidden - signed a merge rev involving the manual, but did not - change the manual personally - 8abd5712749648b2232cc4dfa549ce11b627f679 + signed a merge rev involving the manual, but did not + change the manual personally + 8abd5712749648b2232cc4dfa549ce11b627f679 ============================================================ --- INSTALL 866aa4f26aa0b7a7fa109808385c269b9a43a3f3 +++ INSTALL a4a2432bb3374ffef1847c40edcb03ec8a1a58e6 @@ -224,12 +224,32 @@ 1. prerequisites: on Windows (using Cygwin): - FIXME: add exact name of needed packages + Monotone needs the following packages to compile: + Runtime requirements: + cygwin-1.5.24 or newer + libiconv2-1.11 or newer + libintl8-0.15 or newer + zlib-1.2.3-2 or newer + + Build requirements: + gcc-3.4.4 or newer + binutils-20050610 or newer + boost-devel-1.33.1 or newer + gettext-0.14.5 or newer + zlib-1.2.3-2 or newer + perl-5.8.7 or newer + sqlite3-3.6.2-1 or newer + libidn-devel-1.9-1 or newer + lua-5.1.4-1 or newer (*) + botan-1.8.0-1 or newer (*) + currently every prerequisite is avaialble as packages except - lua and botan; lua is available on Cygwin Ports though + lua and botan; an official Cygwin package for monotone and + all its dependencies will be available soon after release - an official Cygwin package for monotone will be available soon + the following is needed to succesfulyl configure + CXXFLAGS+="-I/usr/include/boost-1_33_1/" on other systems: ============================================================ --- Makefile.am 5b4640a7fe07b68518c61c55d5b24ac2aa184251 +++ Makefile.am 324eca98528201d46461e5ac4291f70ecb88ca84 @@ -304,7 +304,7 @@ EXTRA_DIST = \ EXTRA_DIST = \ HACKING INSTALL README.changesets README.visualc8 UPGRADE \ audit-includes do-editor-vars.sh doxygen.cfg \ - $(wildcard $(srcdir)/m4/*.m4) monotone.spec monotone.html \ + $(wildcard $(srcdir)/m4/*.m4) monotone.html \ texinfo.css schema.sql unix/README util/mtnopt.in win32/README \ win32/monotone.iss win32/modpath.iss win32/monotone.bmp \ \ ============================================================ --- NEWS 098a0ba6d8010d9ba7b4c1304703d168ba099d31 +++ NEWS 4185f5904848634aafa6d7b3340df73533bc305c @@ -1,5 +1,26 @@ -??? ??? ?? ??:??:?? UTC 2009 +xxx xxx xx xx:xx:xx UTC 2009 + 0.44 release. + + - FIXME - bump automate major version, correct automate commands + documented as changed (or added) in version FIXME. Also remove + this note. + + Changes + + - Private keys no longer have a separate hash from the associated + public key. This changes the hashes output by 'ls keys', and also + changes the format of 'automate keys' and 'automate genkey'. + + New features + + Bugs fixed + + Internal + + +Sun Mar 22 22:26:00 UTC 2009 + 0.43 release. Changes @@ -30,6 +51,9 @@ requests more compact. You still see all available global options by executing 'mtn help' without any arguments. + - 'mtn automate get_current_revision' now returns an empty changeset + instead of an error if a workspace contains no changes. + New features - A monotone database may be exported in the git fast-import format @@ -105,6 +129,12 @@ own for directory creation and permissions if you take the key on standard output and redirect it to a file.) + - The `p:' selector now accepts single character revision ids. + + - `mtn merge_into_workspace' no longer crashes if one tries to merge + in an ancestor or descendant of a workspace, but gives a helpful + error message. + - Several bugfixes to `mtn automate stdio': * It now correctly distinguishs between syntax and command errors by @@ -120,16 +150,36 @@ * Global options, which were set or changed by a previously executed command, weren't properly reset before the next command was issued. It was f.e. not possible to "unignore" suspended branches for - the `branches' command when this option was given in a previous - run. Now only those global options persist between executed - commands which were given to stdio directly. + the `branches' command when `--ignore-suspend-certs' was given in + a previous run. Now only those global options persist between + executed commands which were given to stdio directly. Internal - Using 64 bit integer values to represent dates internally. This has no user visible effect. + - The unit test code has been separated from the main source, thus + building the tests no longer requires a full recompilation. Also, + the number of modules which are linked into unit tester has + decreased tremendously. + - A couple of debug commands have been added to the `database' + command group to aid performance timing. See `mtn help --hidden db' + for a list of available commands. + + - Our internal error handling has been overhauled. N() is gone, and E() + takes three arguments instead of 2: E(bool, origin::type, i18n_format). + origin::type is an enum describing the source of the error, eg network, + user, internal. Data types can publically inherit origin_aware (as the + vocab types do) to obtain a public origin::type member named + 'made_from'; this can then be supplied to E() when sanity-checking + that data. origin_aware and origin::type are in origin_type.hh. + I() will throw a unrecoverable_failure, and E() will throw either a + unrecoverable_failure or a recoverable_failure depending on the + origin::type provided. informative_failure is gone. + + Fri Dec 26 22:08:00 UTC 2008 0.42 release. ============================================================ --- UPGRADE 82a6a37f8de5e96c6d50ea34fd051385243dbde1 +++ UPGRADE e5ddbadaf9d13ee6deb96eee95d93341f1174044 @@ -1,4 +1,4 @@ -upgrading monotone to 0.42 +upgrading monotone to 0.43 ========================== How to read this file: ============================================================ --- cmd.cc 3df0d29e452cececbda5fac1b662adf6dc084e85 +++ cmd.cc ea6e5fc6bace3d9e9e83de97857ca3deae00ee27 @@ -143,6 +143,7 @@ namespace commands { } static void explain_children(command::children_set const & children, + bool show_hidden_commands, ostream & out) { I(!children.empty()); @@ -155,7 +156,7 @@ namespace commands { { command const * child = *i; - if (child->hidden()) + if (child->hidden() && !show_hidden_commands) continue; size_t len = display_width(join_words(child->names(), ", ")) + @@ -173,7 +174,7 @@ namespace commands { { command const * child = *i; describe(join_words(child->names(), ", ")(), child->abstract(), - join_words(child->subcommands(), ", ")(), + join_words(child->subcommands(show_hidden_commands), ", ")(), colabstract, out); } } @@ -190,7 +191,9 @@ namespace commands { return cmd; } - static void explain_cmd_usage(command_id const & ident, ostream & out) + static void explain_cmd_usage(command_id const & ident, + bool show_hidden_commands, + ostream & out) { I(ident.size() >= 1); @@ -233,7 +236,7 @@ namespace commands { // Explain children, if any. if (!cmd->is_leaf()) { - explain_children(cmd->children(), out); + explain_children(cmd->children(), show_hidden_commands, out); out << '\n'; } @@ -259,14 +262,18 @@ namespace commands { } } - void explain_usage(command_id const & ident, ostream & out) + void explain_usage(command_id const & ident, + bool show_hidden_commands, + ostream & out) { command const * cmd = find_command(ident); if (ident.empty()) { out << format_text(F("Command groups:")) << "\n\n"; - explain_children(CMD_REF(__root__)->children(), out); + explain_children(CMD_REF(__root__)->children(), + show_hidden_commands, + out); out << '\n' << format_text(F("For information on a specific command, type " "'mtn help [subcommand_name ...]'.")) @@ -280,7 +287,7 @@ namespace commands { << "\n"; } else - explain_cmd_usage(ident, out); + explain_cmd_usage(ident, show_hidden_commands, out); } options::options_type command_options(command_id const & ident) @@ -386,7 +393,7 @@ CMD_NO_WORKSPACE(help, "help", "", CMD_R N_("command [ARGS...]"), N_("Displays help about commands and options"), "", - options::opts::none) + options::opts::show_hidden_commands) { if (args.size() < 1) { ============================================================ --- cmd.hh 944525f2abd7d1d9fdce5e48eb35e8e91fbc1809 +++ cmd.hh 03edc7b9874c2c35951735d7dd76ab7e89fac7c9 @@ -76,7 +76,7 @@ namespace commands virtual std::string params(void) const; virtual std::string abstract(void) const; virtual std::string desc(void) const; - virtual names_set subcommands(void) const; + virtual names_set subcommands(bool hidden) const; options::options_type const & opts(void) const; bool use_workspace_options(void) const; children_set & children(void); ============================================================ --- cmd_diff_log.cc 8c27f54076677b08a5d7ca1b7e0b01de7d81f2b0 +++ cmd_diff_log.cc ddcd0dfc3c690b04ce83cb0fb68b8cce2795137e @@ -642,6 +642,8 @@ struct rev_cmp return x.first > y.first; // optional with --next N case log_reverse: return x.first < y.first; // default and with --last N + default: + I(false); } } }; @@ -846,7 +848,7 @@ CMD(log, "log", "", CMD_REF(informative) } // if --revision was specified without --from log only the selected revs - bool log_selected(!app.opts.revision_selectors.empty() && + bool log_selected(!app.opts.revision_selectors.empty() && app.opts.from.empty()); if (log_selected) ============================================================ --- commands.cc 36e4666430055a87eb0d71e709e21ac623489d90 +++ commands.cc a8252add69f2ed2ed88512fb21e23939deb45b46 @@ -183,14 +183,14 @@ namespace commands } command::names_set - command::subcommands(void) const + command::subcommands(bool hidden) const { names_set set; init_children(); for (children_set::const_iterator i = m_children.begin(); i != m_children.end(); i++) { - if ((*i)->hidden()) + if ((*i)->hidden() && !hidden) continue; names_set const & other = (*i)->names(); set.insert(other.begin(), other.end()); @@ -330,6 +330,8 @@ namespace commands return matches; } + // while we list hidden commands with a special option, + // we never want to give them as possible completions if (!child->hidden() && prefix().length() < (*iter2)().length() && allow_completion() && completion_ok) ============================================================ --- commands.hh 31506ab303271d2cde7f9070476439e2027c7480 +++ commands.hh 17323d9bc503702bd9a24c927f4200a99a6625ef @@ -23,7 +23,7 @@ namespace commands { typedef std::vector< utf8 > command_id; command_id make_command_id(std::string const & path); - void explain_usage(command_id const & cmd, std::ostream & out); + void explain_usage(command_id const & cmd, bool show_hidden, std::ostream & out); command_id complete_command(args_vector const & args); void process(app_state & app, command_id const & ident, args_vector const & args); ============================================================ --- configure.ac 526a9af13ac143ef35c8579548280a71dc4eebdb +++ configure.ac f9cc126136c9c0751a02491b863de5963ac456ae @@ -10,7 +10,7 @@ AC_PREREQ(2.58) # Process this file with autoconf to produce a configure script. AC_PREREQ(2.58) -AC_INIT([monotone], [0.43dev], address@hidden) +AC_INIT([monotone], [0.44dev], address@hidden) AM_INIT_AUTOMAKE([1.9 tar-ustar std-options]) AC_CONFIG_SRCDIR([app_state.cc]) AC_CONFIG_HEADERS([config.h]) @@ -55,7 +55,7 @@ AC_DEFINE_UNQUOTED(os_err_t, $os_err_t, esac AM_CONDITIONAL(WIN32_PLATFORM, $WIN32_PLATFORM) AC_DEFINE_UNQUOTED(os_err_t, $os_err_t, - [Define as the best type to hold an OS error code.]) + [Define as the best type to hold an OS error code.]) # Checks for programs. @@ -66,7 +66,7 @@ AC_ARG_VAR([CXX_FOR_BUILD], dnl needed for 'txt2c' dnl There ought to be an AC_PROG_CXX_FOR_BUILD, but there isn't. AC_ARG_VAR([CXX_FOR_BUILD], - [C++ compiler command for programs to run on build machine]) + [C++ compiler command for programs to run on build machine]) if test $cross_compiling = yes; then CXX_FOR_BUILD='c++' else @@ -121,22 +121,22 @@ AC_CHECK_TYPE([off_t], AC_CHECK_TYPE([off_t], [], [AC_DEFINE([off_t], [long int], - [Define to `long int' if does not define.])], + [Define to `long int' if does not define.])], [#include ]) AC_CHECK_TYPE([pid_t], [], [AC_DEFINE([pid_t], [int], - [Define to `int' if does not define.])], + [Define to `int' if does not define.])], [#include ]) AC_CHECK_MEMBERS([struct stat.st_ctim.tv_nsec, - struct stat.st_mtim.tv_nsec, - struct stat.st_ctimespec.tv_nsec, - struct stat.st_mtimespec.tv_nsec, - struct stat.st_ctimensec, - struct stat.st_mtimensec], - [], [], [#include ]) + struct stat.st_mtim.tv_nsec, + struct stat.st_ctimespec.tv_nsec, + struct stat.st_mtimespec.tv_nsec, + struct stat.st_ctimensec, + struct stat.st_mtimensec], + [], [], [#include ]) AC_CHECK_MEMBERS([struct dirent.d_type], [], [], [#include ]) # Checks for library functions. @@ -144,6 +144,6 @@ AC_CHECK_FUNCS([__cxa_current_exception_ # complicated check for it. AC_CHECK_FUNCS([__cxa_current_exception_type __cxa_demangle dirfd \ - fstatat mkdtemp mmap putenv setenv strptime unsetenv]) + fstatat mkdtemp mmap putenv setenv strptime unsetenv]) AC_OUTPUT ============================================================ --- monotone.cc 1e9370a6b541ef2ffdd175cde43a60afbab0d276 +++ monotone.cc dc002c1cf57bd83c95abc9deb703faa373ed52eb @@ -343,7 +343,9 @@ cpp_main(int argc, char ** argv) usage_stream << get_usage_str(cmd_options, app.opts); } - commands::explain_usage(u.which, usage_stream); + commands::explain_usage(u.which, + app.opts.show_hidden_commands, + usage_stream); if (app.opts.help) return 0; else ============================================================ --- monotone.spec e3702204cf048ca25bcd3ebebc7d07821235249b +++ monotone.spec 31cc477969b7be1f294053cfa4e3ef3684c24254 @@ -1,6 +1,6 @@ Name: monotone Summary: monotone is a distributed version control tool Name: monotone -Version: 0.42 +Version: 0.43 Release: 0.mtn.2%{?dist} License: GPL Group: Development/Tools ============================================================ --- options_list.hh a97ca4e2e92c85a109a6b73f83d2e5f0c8c80cc9 +++ options_list.hh fe3b7714d2c58e05d75fefc8d28bbe5935d22051 @@ -353,6 +353,14 @@ GOPT(help, "help,h", bool, false, gettex } #endif +OPT(show_hidden_commands, "hidden", bool, false, + gettext_noop("show hidden commands")) +#ifdef option_bodies +{ + show_hidden_commands = true; +} +#endif + OPTVAR(include, args_vector, include_patterns, ) OPTION(include, include, true, "include", gettext_noop("include anything described by its argument")) @@ -737,8 +745,8 @@ OPT(use_one_changelog, "use-one-changelo use_one_changelog = true; } #endif - -OPT(authors_file, "authors-file", system_path, , + +OPT(authors_file, "authors-file", system_path, , gettext_noop("file mapping author names from original to new values")) #ifdef option_bodies { @@ -746,7 +754,7 @@ OPT(authors_file, "authors-file", system } #endif -OPT(branches_file, "branches-file", system_path, , +OPT(branches_file, "branches-file", system_path, , gettext_noop("file mapping branch names from original to new values ")) #ifdef option_bodies { @@ -754,7 +762,7 @@ OPT(branches_file, "branches-file", syst } #endif -OPT(refs, "refs", std::set, , +OPT(refs, "refs", std::set, , gettext_noop("include git refs for 'revs', 'roots' or 'leaves'")) #ifdef option_bodies { ============================================================ --- po/de.po 8675c2b8390175da36887317767c9236b65016bb +++ po/de.po fc2f4b5ba3470a0ec2e2a6b80d2041a4943d3133 @@ -34,7 +34,7 @@ msgstr "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: address@hidden" -"POT-Creation-Date: 2009-03-13 21:09+0100\n" +"POT-Creation-Date: 2009-03-22 23:14+0100\n" "PO-Revision-Date: 2007-08-07 11:35+0200\n" "Last-Translator: Thomas Keller \n" "Language-Team: Deutsch \n" @@ -53,7 +53,7 @@ msgstr "falscher Gebrauch: " msgid "misuse: " msgstr "falscher Gebrauch: " -#: sanity.cc:336 database.cc:848 migrate_schema.cc:61 +#: sanity.cc:336 database.cc:849 migrate_schema.cc:61 msgid "error: " msgstr "Fehler: " @@ -182,7 +182,7 @@ msgstr "falsche Eingabe für `parse_basi msgid "bad input to parse_basic_io" msgstr "falsche Eingabe für `parse_basic_io'" -#: lua.cc:485 lua.cc:497 lua.cc:509 cmd.cc:348 cmd.cc:372 +#: lua.cc:485 lua.cc:497 lua.cc:509 cmd.cc:355 cmd.cc:379 #, c-format msgid "%s called with an invalid parameter" msgstr "%s wurde mit einem ungültigen Parameter aufgerufen" @@ -463,12 +463,12 @@ msgstr "konnte Logdatei '%s' nicht öffn msgid "failed to open log file '%s'" msgstr "konnte Logdatei '%s' nicht öffnen" -#: commands.cc:473 +#: commands.cc:475 #, c-format msgid "unknown command '%s'" msgstr "unbekanntes Kommando '%s'" -#: commands.cc:483 +#: commands.cc:485 #, c-format msgid "'%s' is ambiguous; possible completions are:" msgstr "'%s' ist mehrdeutig; mögliche Vervollständigungen sind:" @@ -550,42 +550,42 @@ msgstr "'%s' passt auf kein Unterkommand msgid "could not match '%s' to a subcommand of '%s'" msgstr "'%s' passt auf kein Unterkommando von '%s'" -#: cmd.cc:208 +#: cmd.cc:211 #, c-format msgid "Commands in group '%s':" msgstr "Kommandos in der Gruppe '%s':" -#: cmd.cc:214 +#: cmd.cc:217 #, c-format msgid "Subcommands of '%s %s':" msgstr "Unterkommandos von '%s %s':" -#: cmd.cc:218 +#: cmd.cc:221 #, c-format msgid "Syntax specific to '%s %s':" msgstr "Spezifische Syntax für '%s %s':" -#: cmd.cc:242 +#: cmd.cc:245 #, c-format msgid "Purpose of group '%s':" msgstr "Verwendungszweck der Gruppe '%s':" -#: cmd.cc:246 +#: cmd.cc:249 #, c-format msgid "Description for '%s %s':" msgstr "Beschreibung für '%s %s':" -#: cmd.cc:256 +#: cmd.cc:259 #, c-format msgid "Aliases: %s." msgstr "Aliase: %s." -#: cmd.cc:268 +#: cmd.cc:273 #, c-format msgid "Command groups:" msgstr "Kommandogruppen:" -#: cmd.cc:271 +#: cmd.cc:278 #, c-format msgid "" "For information on a specific command, type 'mtn help " @@ -594,7 +594,7 @@ msgstr "" "Für Informationen zu einem spezifischen Kommando geben Sie bitte 'mtn help " "KOMMANDO_NAME [UNTERKOMMANDO_NAME]' ein." -#: cmd.cc:274 +#: cmd.cc:281 #, c-format msgid "" "To see more details about the commands of a particular group, type 'mtn help " @@ -603,7 +603,7 @@ msgstr "" "Um mehr Informationen über die Kommandos einer bestimmten Gruppe zu sehen, " "nutzen Sie bitte 'mtn help GRUPPEN_NAME'." -#: cmd.cc:277 +#: cmd.cc:284 #, c-format msgid "" "Note that you can always abbreviate a command name as long as it does not " @@ -613,33 +613,33 @@ msgstr "" "zum Aufruf der Funktion nutzen können, solange diese Abkürzung nicht mit " "anderen Kommandonamen im Konflikt steht." -#: cmd.cc:337 +#: cmd.cc:344 #, c-format msgid "Call to user command %s (lua command: %s) failed." msgstr "Aufruf des Benutzerkommandos %s (Lua-Kommando: %s) schlug fehl" -#: cmd.cc:386 +#: cmd.cc:393 msgid "command [ARGS...]" msgstr "Kommando [ARGUMENTE...]" -#: cmd.cc:387 +#: cmd.cc:394 msgid "Displays help about commands and options" msgstr "Zeigt Hilfe über Kommandos und Optionen an" -#: cmd.cc:403 +#: cmd.cc:410 msgid "Shows the program version" msgstr "Zeigt die Programm-Version an" -#: cmd.cc:408 +#: cmd.cc:415 #, c-format msgid "no arguments allowed" msgstr "keine Parameter erlaubt" -#: cmd.cc:418 +#: cmd.cc:425 msgid "Triggers the specified kind of crash" msgstr "Löst den spezifizierten Programm-Crash aus" -#: cmd.cc:498 +#: cmd.cc:505 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message und --message-file können nicht zusammen verwendet werden" @@ -2104,16 +2104,16 @@ msgstr "Berechnet die Unterschiede in Da msgid "Calculates diffs of files" msgstr "Berechnet die Unterschiede in Dateien" -#: cmd_diff_log.cc:704 +#: cmd_diff_log.cc:706 msgid "[PATH] ..." msgstr "[PFAD] ..." -#: cmd_diff_log.cc:705 +#: cmd_diff_log.cc:707 msgid "Prints selected history in forward or reverse order" msgstr "Gibt die ausgewählte Historie vorwärts oder rückwärts aus" # -#: cmd_diff_log.cc:706 +#: cmd_diff_log.cc:708 msgid "" "This command prints selected history in forward or reverse order, filtering " "it by PATH if given." @@ -2121,17 +2121,17 @@ msgstr "" "Dieses Kommando gibt die ausgewählte Historie vorwärts oder rückwärts aus, " "gefiltert durch PFAD, sofern angegeben." -#: cmd_diff_log.cc:724 +#: cmd_diff_log.cc:726 #, c-format msgid "only one of --last/--next allowed" msgstr "'--last' und '--next' sind nur einmal erlaubt" -#: cmd_diff_log.cc:741 +#: cmd_diff_log.cc:743 #, c-format msgid "try passing a --from revision to start at" msgstr "Versuchen Sie, über die Option --from eine Startrevision anzugeben." -#: cmd_diff_log.cc:1058 +#: cmd_diff_log.cc:1060 #, c-format msgid "(Revision: %s)" msgstr "(Revision: %s)" @@ -3502,11 +3502,11 @@ msgstr "" "konnte die Zeichenkette des Testergebnisses '%s' nicht interpretieren; " "gültige Zeichenketten sind: 1, 0, yes, no, true, false, pass, fail" -#: project.cc:472 +#: project.cc:477 msgid "note: " msgstr "Hinweis: " -#: project.cc:473 +#: project.cc:478 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -3515,20 +3515,20 @@ msgstr "" "Der Zweig '%s' hat mehrere Köpfe.\n" "Eventuell möchten Sie '%s merge' ausführen." -#: project.cc:492 +#: project.cc:497 #, c-format msgid "no branch found for empty revision, please provide a branch name" msgstr "" "kein Zweig für leere Revision gefunden, bitte geben Sie einen Zweignamen an" -#: project.cc:499 +#: project.cc:504 #, c-format msgid "no branch certs found for revision %s, please provide a branch name" msgstr "" "keine Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen " "Zweignamen an" -#: project.cc:503 +#: project.cc:508 #, c-format msgid "" "multiple branch certs found for revision %s, please provide a branch name" @@ -3536,12 +3536,12 @@ msgstr "" "mehrere Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen " "Zweignamen an" -#: database.cc:512 +#: database.cc:513 #, c-format msgid "this database already contains rosters" msgstr "diese Datenbank enthält bereits Kataloge" -#: database.cc:538 +#: database.cc:539 #, c-format msgid "" "database %s lacks some cached data\n" @@ -3551,7 +3551,7 @@ msgstr "" "Führen Sie '%s db regenerate_caches' aus, um diese Datenbank wieder " "benutzbar zu machen." -#: database.cc:550 +#: database.cc:551 #, c-format msgid "" "database %s contains old-style revisions\n" @@ -3570,7 +3570,7 @@ msgstr "" " und holen Sie sich dann eine aktualisierte Kopie.\n" "Wir bitten die Unannehmlichkeiten zu entschuldigen." -#: database.cc:560 +#: database.cc:561 #, c-format msgid "" "database %s contains manifests but no revisions\n" @@ -3581,24 +3581,24 @@ msgstr "" "Dies ist eine sehr alte Datenbank, die erneuert werden muss.\n" "Bitte konsultieren Sie die Datei README.changesets für Details." -#: database.cc:849 +#: database.cc:850 msgid "sqlite error: " msgstr "SQLite-Fehler: " -#: database.cc:873 +#: database.cc:874 msgid "not set" msgstr "nicht gesetzt" -#: database.cc:886 +#: database.cc:887 msgid " (not a monotone database)" msgstr " (keine monotone-Datenbank)" -#: database.cc:935 database.cc:965 database.cc:1545 database.cc:1565 +#: database.cc:936 database.cc:966 database.cc:1546 database.cc:1566 #, c-format msgid "%u" msgstr "%u" -#: database.cc:984 +#: database.cc:985 #, c-format msgid "" "creator code : %s\n" @@ -3651,12 +3651,12 @@ msgstr "" " Seitengröße : %s\n" " Cache-Größe : %s" -#: database.cc:1048 +#: database.cc:1049 #, c-format msgid "invalid date '%s' for revision %s; skipped" msgstr "ungültiges Datum '%s' für Revision %s; wird übergangen" -#: database.cc:1126 +#: database.cc:1127 #, c-format msgid "" "timestamp correctness between revisions:\n" @@ -3703,42 +3703,42 @@ msgstr "" " 95. Prozentrang : %s Sekunden\n" " 99. Prozentrang : %s Sekunden\n" -#: database.cc:1177 +#: database.cc:1178 #, c-format msgid "database schema version: %s" msgstr "Datenbankschema-Version: %s" -#: database.cc:1248 +#: database.cc:1249 #, c-format msgid "multiple statements in query: %s" msgstr "mehrere Befehle in Anfrage: %s" -#: database.cc:1254 +#: database.cc:1255 #, c-format msgid "wanted %d columns got %d in query: %s" msgstr "erwarte %d, erhielt %d Spalten in Anfrage: %s" -#: database.cc:1319 +#: database.cc:1320 #, c-format msgid "null result in query: %s" msgstr "Null-Ergebnis in Anfrage: %s" -#: database.cc:1338 +#: database.cc:1339 #, c-format msgid "wanted %d rows got %d in query: %s" msgstr "erwarte %d, erhielt %d Zeilen in Anfrage: %s" -#: database.cc:2192 +#: database.cc:2193 #, c-format msgid "file preimage '%s' missing in db" msgstr "Datei-Urbild '%s' fehlt in der Datenbank" -#: database.cc:2193 +#: database.cc:2194 #, c-format msgid "dropping delta '%s' -> '%s'" msgstr "übergehe Delta '%s' -> '%s'" -#: database.cc:2209 +#: database.cc:2210 #, c-format msgid "" "Unknown delta direction '%s'; assuming 'reverse'. Valid values are " @@ -3747,85 +3747,85 @@ msgstr "" "Unbekannte Delta-Richtung '%s'; habe 'reverse' vermutet. Gültige Werte sind " "'reverse', 'forward' und 'both'." -#: database.cc:2606 +#: database.cc:2607 #, c-format msgid "missing prerequisite revision '%s'" msgstr "fehlende vorausgesetzte Revision '%s'" -#: database.cc:2608 database.cc:2619 database.cc:2635 database.cc:2643 +#: database.cc:2609 database.cc:2620 database.cc:2636 database.cc:2644 #, c-format msgid "dropping revision '%s'" msgstr "entferne Revision '%s'" -#: database.cc:2618 +#: database.cc:2619 #, c-format msgid "missing prerequisite file '%s'" msgstr "fehlende, erforderliche Datei '%s'" -#: database.cc:2633 +#: database.cc:2634 #, c-format msgid "missing prerequisite file pre-delta '%s'" msgstr "fehlendes, erforderliches Datei-Pre-Delta '%s'" -#: database.cc:2641 +#: database.cc:2642 #, c-format msgid "missing prerequisite file post-delta '%s'" msgstr "fehlendes, erforderliches Datei-Post-Delta '%s'" -#: database.cc:2749 +#: database.cc:2750 #, c-format msgid "revision contains incorrect manifest_id" msgstr "Revision beinhaltet ungültige manifest_id" -#: database.cc:2953 +#: database.cc:2954 #, c-format msgid "key '%s' is not equal to key '%s' in database" msgstr "" "Schlüssel '%s' stimmt nicht mit dem Schlüssel '%s' in der Datenbank überein" -#: database.cc:3046 +#: database.cc:3047 #, c-format msgid "Failed to get RSA verifying key for %s" msgstr "RSA konnte den Schlüssel für %s nicht überprüfen" -#: database.cc:3265 +#: database.cc:3266 #, c-format msgid "cert revision '%s' does not exist in db" msgstr "Zertifikats-Revision '%s' existiert nicht in der Datenbank" -#: database.cc:3267 +#: database.cc:3268 #, c-format msgid "dropping cert" msgstr "entferne Zertifikat" -#: database.cc:3431 +#: database.cc:3432 #, c-format msgid "ignoring bad signature by '%s' on '%s'" msgstr "ignoriere ungültige Signatur von '%s' vom '%s'" -#: database.cc:3439 +#: database.cc:3440 #, c-format msgid "ignoring unknown signature by '%s' on '%s'" msgstr "ignoriere unbekannte Signatur von '%s' vom '%s'" -#: database.cc:3501 +#: database.cc:3497 #, c-format msgid "trust function disliked %d signers of %s cert on revision %s" msgstr "" "Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Revision %s " "ab" -#: database.cc:4015 +#: database.cc:4020 #, c-format msgid "no database specified" msgstr "keine Datenbank spezifiziert" -#: database.cc:4028 +#: database.cc:4033 #, c-format msgid "database %s does not exist" msgstr "Datenbank %s existiert nicht" -#: database.cc:4036 +#: database.cc:4041 #, c-format msgid "" "%s is a workspace, not a database\n" @@ -3834,17 +3834,17 @@ msgstr "" "%s ist ein Verzeichnis, keine Datenbank\n" "(meinten Sie %s?)" -#: database.cc:4040 +#: database.cc:4045 #, c-format msgid "%s is a directory, not a database" msgstr "%s ist ein Verzeichnis, keine Datenbank" -#: database.cc:4048 +#: database.cc:4053 #, c-format msgid "database %s already exists" msgstr "Datenbank %s existiert bereits" -#: database.cc:4053 +#: database.cc:4058 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" @@ -6098,11 +6098,20 @@ msgstr "Inhalts-Prüfsumme ist %s auf re msgid "content hash is %s on the right in file '%s'" msgstr "Inhalts-Prüfsumme ist %s auf rechter Seite in Datei '%s'" -#: merge_conflict.cc:2010 +#: merge_conflict.cc:1482 merge_conflict.cc:2010 #, c-format msgid "conflicts file does not match current conflicts" msgstr "Konfliktlösungsdatei passt nicht auf derzeitige Konflikte" +#: merge_conflict.cc:1483 +#, c-format +msgid "%s is not a supported conflict resolution for %s" +msgstr "%s ist keine unterstützte Konfliktlösung für %s" + +#: merge_conflict.cc:1484 +msgid "extra chars at end of conflict" +msgstr "zusätzliche Zeichen am Ende des Konflikts" + #: merge_conflict.cc:2061 #, c-format msgid "extra data in file" @@ -6415,7 +6424,7 @@ msgstr "Blockgröße in Bytes der Ausgab msgid "block size in bytes for \"automate stdio\" output" msgstr "Blockgröße in Bytes der Ausgabe von \"automate stdio\"" -#: options_list.hh:90 options_list.hh:410 options_list.hh:461 +#: options_list.hh:90 options_list.hh:418 options_list.hh:469 #, c-format msgid "cannot be zero or negative" msgstr "kann nicht Null oder negativ sein" @@ -6559,183 +6568,187 @@ msgstr "zeige Hilfemeldung an" msgid "display help message" msgstr "zeige Hilfemeldung an" -#: options_list.hh:358 +#: options_list.hh:357 +msgid "show hidden commands" +msgstr "zeige versteckte Kommandos" + +#: options_list.hh:366 msgid "include anything described by its argument" msgstr "beziehe etwas durch den Parameter beschriebene mit ein" -#: options_list.hh:366 +#: options_list.hh:374 msgid "do not ignore revisions marked as suspended" msgstr "ignoriere keine als gesperrt markierte Revisionen" -#: options_list.hh:375 +#: options_list.hh:383 msgid "set key for signatures" msgstr "setze Schlüssel für Signaturen" -#: options_list.hh:386 +#: options_list.hh:394 msgid "set location of key store" msgstr "setze Ort des Schlüsselbundes" -#: options_list.hh:395 +#: options_list.hh:403 msgid "push the specified key even if it hasn't signed anything" msgstr "exportiere diesen Schlüssel, selbst wenn damit nichts signiert wurde" -#: options_list.hh:405 +#: options_list.hh:413 msgid "limit log output to the last number of entries" msgstr "beschränke Logausgabe auf die letzte Anzahl von Einträgen" -#: options_list.hh:414 +#: options_list.hh:422 msgid "file to write the log to" msgstr "Datei, in die das Log geschrieben wird" -#: options_list.hh:426 +#: options_list.hh:434 msgid "set commit changelog message" msgstr "setze Nachricht für Änderungshistorie" -#: options_list.hh:433 +#: options_list.hh:441 msgid "set filename containing commit changelog message" msgstr "" "setze Dateinamen der Datei, die die Nachricht für die Änderungshistorie " "beinhaltet" -#: options_list.hh:440 +#: options_list.hh:448 msgid "no prefix to message" msgstr "kein Vorspann in der Logmeldung" -#: options_list.hh:448 +#: options_list.hh:456 msgid "perform the operations for files missing from workspace" msgstr "führe diese Operationen für fehlende Dateien im Arbeitsbereich aus" -#: options_list.hh:456 +#: options_list.hh:464 msgid "limit log output to the next number of entries" msgstr "beschränke die Logausgabe auf die nächstfolgende Anzahl von Einträgen" -#: options_list.hh:466 +#: options_list.hh:474 msgid "exclude files when printing logs" msgstr "schließe Dateien bei der Ausgabe der Logeinträge aus" -#: options_list.hh:474 +#: options_list.hh:482 msgid "do not use ASCII graph to display ancestry" msgstr "benutze nicht den ASCII-Graphen, um die Vorfahren anzuzeigen" -#: options_list.hh:482 +#: options_list.hh:490 msgid "do not ignore any files" msgstr "ignoriere keinerlei Dateien" -#: options_list.hh:490 +#: options_list.hh:498 msgid "exclude merges when printing logs" msgstr "schließe Vereinigungen bei der Ausgabe der Logeinträge aus" -#: options_list.hh:498 +#: options_list.hh:506 msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" msgstr "lade nicht ~/.monotone/monotonerc oder _MTN/monotonerc lua-Dateien" -#: options_list.hh:506 +#: options_list.hh:514 msgid "do not load standard lua hooks" msgstr "lade nicht die Standard-lua-Hooks" -#: options_list.hh:514 +#: options_list.hh:522 msgid "record process id of server" msgstr "merke Prozess-ID des Serverprozesses" -#: options_list.hh:522 +#: options_list.hh:530 msgid "suppress verbose, informational and progress messages" msgstr "unterdrücke wortreiche, informelle und Fortschrittsmeldungen" -#: options_list.hh:532 +#: options_list.hh:540 msgid "load extra rc file" msgstr "lade zusätzliche rc-Datei" -#: options_list.hh:540 +#: options_list.hh:548 msgid "suppress warning, verbose, informational and progress messages" msgstr "" "unterdrücke Warnungen, wortreiche, informelle und Fortschrittsmeldungen" -#: options_list.hh:550 +#: options_list.hh:558 msgid "also operate on the contents of any listed directories" msgstr "arbeite auch auf den Inhalten beliebiger aufgeführter Verzeichnisse" -#: options_list.hh:559 +#: options_list.hh:567 msgid "select revision id for operation" msgstr "wähle die Revisions-ID für die Operation aus" -#: options_list.hh:567 +#: options_list.hh:575 msgid "limit search for workspace to specified root" msgstr "" "beschränke Suche nach der Arbeitsumgebung auf angegebene Verzeichniswurzel" -#: options_list.hh:575 +#: options_list.hh:583 msgid "don't look for a workspace" msgstr "suche nicht nach einem Arbeitsbereich" -#: options_list.hh:583 +#: options_list.hh:591 msgid "use the current arguments as the future default" msgstr "benutze die derzeitigen Parameter in Zukunft als Standard" -#: options_list.hh:591 +#: options_list.hh:599 msgid "set ticker style (count|dot|none)" msgstr "setze 'Ticker'-Stil (count|dot|none)" -#: options_list.hh:602 +#: options_list.hh:610 #, c-format msgid "argument must be 'none', 'dot', or 'count'" msgstr "Parameter muss 'none', 'dot' oder 'count' sein" -#: options_list.hh:606 +#: options_list.hh:614 msgid "revision(s) to start logging at" msgstr "Revision(en), bei denen die Logausgabe gestartet wird" -#: options_list.hh:613 +#: options_list.hh:621 msgid "revision(s) to stop logging at" msgstr "Revision(en), bei denen die Logausgabe gestoppt wird" -#: options_list.hh:621 +#: options_list.hh:629 msgid "perform the operations for unknown files from workspace" msgstr "führe diese Operation für unbekannte Dateien im Arbeitsbereich aus" -#: options_list.hh:630 +#: options_list.hh:638 msgid "verbose completion output" msgstr "ausführliche Komplettierungsausgabe" -#: options_list.hh:638 +#: options_list.hh:646 msgid "print version number, then exit" msgstr "zeige Versionsinformationen an und beende dann das Programm" -#: options_list.hh:646 +#: options_list.hh:654 msgid "insert command line arguments taken from the given file" msgstr "füge Kommandozeilenargumente aus der gegebenen Datei an" -#: options_list.hh:659 +#: options_list.hh:667 msgid "don't output ignored files" msgstr "gib keine ignorierten Dateien aus" -#: options_list.hh:667 +#: options_list.hh:675 msgid "don't output unknown files" msgstr "gib keine unbekannten Dateien aus" -#: options_list.hh:675 +#: options_list.hh:683 msgid "don't output unchanged files" msgstr "gib keine unveränderten Dateien aus" -#: options_list.hh:683 +#: options_list.hh:691 msgid "don't output corresponding renames if restricted on such nodes" msgstr "" "gib bei der Beschränkung auf umbenannte Einträge nicht die " "korrespondierenden Einträge aus" -#: options_list.hh:695 +#: options_list.hh:703 msgid "use file to resolve conflicts" msgstr "nutze Datei zum Auflösen von Konflikten" -#: options_list.hh:702 options_list.hh:728 +#: options_list.hh:710 options_list.hh:736 #, c-format msgid "conflicts file must be under _MTN" msgstr "Konfliktdatei muss sich unterhalb des _MTN-Verzeichnisses befinden" -#: options_list.hh:708 +#: options_list.hh:716 msgid "use _MTN/conflicts to resolve conflicts" msgstr "nutze _MTN/conflicts zum Auflösen von Konflikten" -#: options_list.hh:712 +#: options_list.hh:720 #, c-format msgid "" "only one of --resolve-conflicts or --resolve-conflicts-file may be given" @@ -6743,44 +6756,44 @@ msgstr "" "nur eine Option, --resolve-conflicts oder --resolve-conflicts-file, darf " "angegeben werden" -#: options_list.hh:721 +#: options_list.hh:729 msgid "file in which to store conflicts" msgstr "Datei, in der Konflikte gespeichert werden" -#: options_list.hh:734 +#: options_list.hh:742 msgid "use only one changelog cert for the git commit message" msgstr "benutzte nur ein Logeintragszertifikat für den git-Logeintrag" -#: options_list.hh:742 +#: options_list.hh:750 msgid "file mapping author names from original to new values" msgstr "Datei, die ursprünglichen Autorennamen neue Werte zuweist" -#: options_list.hh:750 +#: options_list.hh:758 msgid "file mapping branch names from original to new values " msgstr "Datei, die ursprünglichen Zweignamen neue Werte zuweist" -#: options_list.hh:758 +#: options_list.hh:766 msgid "include git refs for 'revs', 'roots' or 'leaves'" msgstr "schließe git-Verweis für 'revs', 'roots' oder 'leaves' ein" -#: options_list.hh:765 +#: options_list.hh:773 #, c-format msgid "git ref type must be 'revs', 'roots', or 'leaves'" msgstr "git-Verweistyp muss 'revs', 'roots' oder 'leaves' sein" -#: options_list.hh:770 +#: options_list.hh:778 msgid "include revision ids in commit logs" msgstr "schließe Revisions-IDs in Logeinträgen ein" -#: options_list.hh:778 +#: options_list.hh:786 msgid "include standard cert values in commit logs" msgstr "schließe Standard-Zertifikatswerte in Logeinträgen ein" -#: options_list.hh:786 +#: options_list.hh:794 msgid "load the internal marks table before exporting revisions" msgstr "lade die interne Markierungstabelle vor dem Revisionsexport" -#: options_list.hh:794 +#: options_list.hh:802 msgid "save the internal marks table after exporting revisions" msgstr "speichere die interne Markierungstabelle nach dem Revisionsexport" @@ -7063,7 +7076,7 @@ msgstr "" "Spezifische Optionen für '%s %s' (führen Sie '%s help' aus, um globale " "Optionen zu sehen):" -#: monotone.cc:378 +#: monotone.cc:380 msgid "error: memory exhausted" msgstr "Fehler: Speicher aufgebraucht" ============================================================ --- visualc/config.h 335b4d4550a3ff867dbaa58329c86b5d374d9c5b +++ visualc/config.h b8a8bcfa9c06037efc8ef51af6e58411f408b0e2 @@ -2,10 +2,10 @@ #define CONFIG_H 1 #define PACKAGE "monotone" -#define PACKAGE_STRING "monotone 0.42" +#define PACKAGE_STRING "monotone 0.44dev" #define PACKAGE_BUGREPORT "address@hidden" #define LC_MESSAGES LC_CTYPE -#define VERSION "0.42" +#define VERSION "0.44dev" #ifdef _MSC_VER typedef unsigned long pid_t; ============================================================ --- win32/monotone.iss 116a4d7701c0c52e7574787880e431b9b4138de2 +++ win32/monotone.iss 035c0641bca85aa9f6942a68b4823c477efd1559 @@ -1,5 +1,5 @@ #define APPNAME="monotone" -#define APPVERS="0.43dev" +#define APPVERS="0.43" #define BUILDDIR=".." #define MINGWDIR="\MinGW"