{"thread":{"id":"19986","subject":"[PATCH] Limited git-gui to displaying 5000 new files","startedAt":"2009-06-30T20:37:58Z","lastAt":"2009-08-12T15:51:58Z","messageCount":12,"participants":["Dan Zwell","Shawn O. Pearce","Alex Riesen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"117260","messageId":"4A4A77A6.1020905@lawrence.edu","threadId":"19986","inReplyTo":null,"subject":"[PATCH] Limited git-gui to displaying 5000 new files","fromName":"Dan Zwell","fromEmail":"dzwell@gmail.com","sentAt":"2009-06-30T20:37:58Z","receivedAt":"2009-06-30T20:37:58Z","isPatch":true,"sender":{"key":"dzwell@gmail.com","avatar":null},"body":"When there is a large number of new or modified files,\n\"display_all_files\" takes a long time, and git-gui appears to\nhang. Limit the display to 5000 files, by default. This number\nis configurable as gui.maxfilesdisplayed.\n\nShow a warning if the list of files is truncated.\n\nSigned-off-by: Dan Zwell <dzwell@zwell.net>\n---\n git-gui.sh |   17 ++++++++++++++++-\n 1 files changed, 16 insertions(+), 1 deletions(-)\n\ndiff --git a/git-gui.sh b/git-gui.sh\nindex 14b92ba..5a20923 100755\n--- a/git-gui.sh\n+++ b/git-gui.sh\n@@ -745,6 +745,8 @@ set default_config(gui.newbranchtemplate) {}\n set default_config(gui.spellingdictionary) {}\n set default_config(gui.fontui) [font configure font_ui]\n set default_config(gui.fontdiff) [font configure font_diff]\n+# TODO: this option should be added to the git-config documentation\n+set default_config(gui.maxfilesdisplayed) 5000\n set font_descs {\n \t{fontui   font_ui   {mc \"Main Font\"}}\n \t{fontdiff font_diff {mc \"Diff/Console Font\"}}\n@@ -1702,6 +1704,8 @@ proc display_all_files {} {\n \tglobal ui_index ui_workdir\n \tglobal file_states file_lists\n \tglobal last_clicked\n+\tglobal files_warning\n+\tglobal default_config\n \n \t$ui_index conf -state normal\n \t$ui_workdir conf -state normal\n@@ -1713,7 +1717,18 @@ proc display_all_files {} {\n \tset file_lists($ui_index) [list]\n \tset file_lists($ui_workdir) [list]\n \n-\tforeach path [lsort [array names file_states]] {\n+\tset to_display [lsort [array names file_states]]\n+\tset display_limit $default_config(gui.maxfilesdisplayed)\n+\tif {[llength $to_display] > $display_limit} {\n+\t\tif {![info exists files_warning] || !$files_warning} {\n+\t\t\tset warning \"Displaying only $display_limit of \"\n+\t\t\tappend warning \"[llength $to_display] files.\"\n+\t\t\tinfo_popup [mc $warning]\n+\t\t\tset files_warning 1\n+\t\t}\n+\t\tset to_display [lrange $to_display 0 [expr {$display_limit-1}]]\n+\t}\n+\tforeach path $to_display {\n \t\tset s $file_states($path)\n \t\tset m [lindex $s 0]\n \t\tset icon_name [lindex $s 1]\n-- \n1.6.3.3\n"},{"id":"120199","messageId":"4A8039AB.5020301@zwell.net","threadId":"19986","inReplyTo":"20090810170842.GX1033@spearce.org","subject":"Re: [PATCH] Limited git-gui to displaying 5000 new files","fromName":"Dan Zwell","fromEmail":"dzwell@zwell.net","sentAt":"2009-08-10T15:15:55Z","receivedAt":"2009-08-10T15:15:55Z","isPatch":true,"sender":{"key":"dzwell@zwell.net","avatar":null},"body":"Shawn O. Pearce wrote:\n> Alex Riesen <raa.lkml@gmail.com> wrote:\n>> On Mon, Aug 10, 2009 at 17:38, Shawn O. Pearce<spearce@spearce.org> wrote:\n>>>> + ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? set warning \"Displaying only $display_limit of \"\n>>>> + ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? append warning \"[llength $to_display] files.\"\n>>>> + ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? info_popup [mc $warning]\n>>> This needs to be in the translated strings.\n>> Will do, as soon as this hits git://repo.or.cz/git-gui.git.\n>> Or should I have looked at the internationalization repo\n>> git://repo.or.cz/git-gui/git-gui-i18n.git?\n> \n> No, I meant that the patch needs to use [mc] or whatever it is\n> to enable the string to be localized.  After its marked with the\n> necessary code change, I can apply the patch, regenerate the .pot,\n> and let translators update their .po when they have time.\n> \n\nI will change it to use [mc] (and make the other changes that Shawn \nmentioned) and resubmit the patch.\n\n-Dan\n"},{"id":"120172","messageId":"20090810153859.GT1033@spearce.org","threadId":"19986","inReplyTo":"4A4A77A6.1020905@lawrence.edu","subject":"Re: [PATCH] Limited git-gui to displaying 5000 new files","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-08-10T15:38:59Z","receivedAt":"2009-08-10T15:38:59Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Dan Zwell <dzwell@gmail.com> wrote:\n> When there is a large number of new or modified files,\n> \"display_all_files\" takes a long time, and git-gui appears to\n> hang. Limit the display to 5000 files, by default. This number\n> is configurable as gui.maxfilesdisplayed.\n>\n> Show a warning if the list of files is truncated.\n\n> @@ -1713,7 +1717,18 @@ proc display_all_files {} {\n> \tset file_lists($ui_index) [list]\n> \tset file_lists($ui_workdir) [list]\n>\n> -\tforeach path [lsort [array names file_states]] {\n> +\tset to_display [lsort [array names file_states]]\n> +\tset display_limit $default_config(gui.maxfilesdisplayed)\n\nThis should use [get_config gui.maxfilesdisplayed] so that the\nuser can actually set this property in a configuration file and\nhave git-gui honor it.  Reading from $default_config means you are\nonly looking at the hardcoded value you set in git-gui.sh.\n\n> +\tif {[llength $to_display] > $display_limit} {\n> +\t\tif {![info exists files_warning] || !$files_warning} {\n\nWouldn't it be easier to just set files_warning to 0 at the start\nof the script, so that you don't need to do this info exists test?\n\n> +\t\t\tset warning \"Displaying only $display_limit of \"\n> +\t\t\tappend warning \"[llength $to_display] files.\"\n> +\t\t\tinfo_popup [mc $warning]\n\nThis needs to be in the translated strings.\n\n-- \nShawn.\n"},{"id":"120197","messageId":"81b0412b0908101006n66672cabi865a980d978c2865@mail.gmail.com","threadId":"19986","inReplyTo":"20090810153859.GT1033@spearce.org","subject":"Re: [PATCH] Limited git-gui to displaying 5000 new files","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2009-08-10T17:06:57Z","receivedAt":"2009-08-10T17:06:57Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On Mon, Aug 10, 2009 at 17:38, Shawn O. Pearce<spearce@spearce.org> wrote:\n>> +                     set warning \"Displaying only $display_limit of \"\n>> +                     append warning \"[llength $to_display] files.\"\n>> +                     info_popup [mc $warning]\n>\n> This needs to be in the translated strings.\n>\n\nWill do, as soon as this hits git://repo.or.cz/git-gui.git.\nOr should I have looked at the internationalization repo\ngit://repo.or.cz/git-gui/git-gui-i18n.git?\n"},{"id":"120198","messageId":"20090810170842.GX1033@spearce.org","threadId":"19986","inReplyTo":"81b0412b0908101006n66672cabi865a980d978c2865@mail.gmail.com","subject":"Re: [PATCH] Limited git-gui to displaying 5000 new files","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-08-10T17:08:42Z","receivedAt":"2009-08-10T17:08:42Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Alex Riesen <raa.lkml@gmail.com> wrote:\n> On Mon, Aug 10, 2009 at 17:38, Shawn O. Pearce<spearce@spearce.org> wrote:\n> >> + ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? set warning \"Displaying only $display_limit of \"\n> >> + ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? append warning \"[llength $to_display] files.\"\n> >> + ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? info_popup [mc $warning]\n> >\n> > This needs to be in the translated strings.\n> \n> Will do, as soon as this hits git://repo.or.cz/git-gui.git.\n> Or should I have looked at the internationalization repo\n> git://repo.or.cz/git-gui/git-gui-i18n.git?\n\nNo, I meant that the patch needs to use [mc] or whatever it is\nto enable the string to be localized.  After its marked with the\nnecessary code change, I can apply the patch, regenerate the .pot,\nand let translators update their .po when they have time.\n\n-- \nShawn.\n"},{"id":"120296","messageId":"4A81B738.7090507@zwell.net","threadId":"19986","inReplyTo":"20090810153859.GT1033@spearce.org","subject":"Re: [PATCH] Limit git-gui to display a maximum number of files","fromName":"Dan Zwell","fromEmail":"dzwell@zwell.net","sentAt":"2009-08-11T18:23:52Z","receivedAt":"2009-08-11T18:23:52Z","isPatch":true,"sender":{"key":"dzwell@zwell.net","avatar":null},"body":"When there is a large number of new or modified files,\n\"display_all_files\" takes a long time, and git-gui appears to\nhang. This change limits the number of files that are displayed.\nThis limit can be set as gui.maxfilesdisplayed, and is\n5000 by default.\n\nA warning is shown when the list of files is truncated.\n\nSigned-off-by: Dan Zwell <dzwell@zwell.net>\n---\nBy the way, is the right way to deal with strings to be\ntranslated? See the end of the patch.\n\n git-gui.sh     |   18 +++++++++++++++++-\n po/git-gui.pot |    5 +++++\n 2 files changed, 22 insertions(+), 1 deletions(-)\n\ndiff --git a/git-gui.sh b/git-gui.sh\nindex 3c0ce26..a4dde9e 100755\n--- a/git-gui.sh\n+++ b/git-gui.sh\n@@ -745,6 +745,8 @@ set default_config(gui.newbranchtemplate) {}\n set default_config(gui.spellingdictionary) {}\n set default_config(gui.fontui) [font configure font_ui]\n set default_config(gui.fontdiff) [font configure font_diff]\n+# TODO: this option should be added to the git-config documentation\n+set default_config(gui.maxfilesdisplayed) 5000\n set font_descs {\n \t{fontui   font_ui   {mc \"Main Font\"}}\n \t{fontdiff font_diff {mc \"Diff/Console Font\"}}\n@@ -1698,10 +1700,12 @@ proc display_all_files_helper {w path icon_name m} {\n \t$w insert end \"[escape_path $path]\\n\"\n }\n \n+set files_warning 0\n proc display_all_files {} {\n \tglobal ui_index ui_workdir\n \tglobal file_states file_lists\n \tglobal last_clicked\n+\tglobal files_warning\n \n \t$ui_index conf -state normal\n \t$ui_workdir conf -state normal\n@@ -1713,7 +1717,19 @@ proc display_all_files {} {\n \tset file_lists($ui_index) [list]\n \tset file_lists($ui_workdir) [list]\n \n-\tforeach path [lsort [array names file_states]] {\n+\tset to_display [lsort [array names file_states]]\n+\tset display_limit [get_config gui.maxfilesdisplayed]\n+\tif {[llength $to_display] > $display_limit} {\n+\t\tif {!$files_warning} {\n+\t\t\t# do not repeatedly warn:\n+\t\t\tset files_warning 1\n+\t\t\tset warning \"Displaying only $display_limit of \"\n+\t\t\tappend warning \"[llength $to_display] files.\"\n+\t\t\tinfo_popup [mc $warning]\n+\t\t}\n+\t\tset to_display [lrange $to_display 0 [expr {$display_limit-1}]]\n+\t}\n+\tforeach path $to_display {\n \t\tset s $file_states($path)\n \t\tset m [lindex $s 0]\n \t\tset icon_name [lindex $s 1]\ndiff --git a/po/git-gui.pot b/po/git-gui.pot\nindex 53b7d36..fb60472 100644\n--- a/po/git-gui.pot\n+++ b/po/git-gui.pot\n@@ -90,6 +90,11 @@ msgstr \"\"\n msgid \"Ready.\"\n msgstr \"\"\n \n+#: git-gui.sh:1725\n+#, tcl-format\n+msgid \"Displaying only %s of %s files.\"\n+msgstr \"\"\n+\n #: git-gui.sh:1819\n msgid \"Unmodified\"\n msgstr \"\"\n-- \n1.6.4\n\n\nShawn O. Pearce wrote:\n\n> Dan Zwell <dzwell@gmail.com> wrote:\n>   \n>> When there is a large number of new or modified files,\n>> \"display_all_files\" takes a long time, and git-gui appears to\n>> hang. Limit the display to 5000 files, by default. This number\n>> is configurable as gui.maxfilesdisplayed.\n>>\n>> Show a warning if the list of files is truncated.\n>>     \n>\n>   \n>> @@ -1713,7 +1717,18 @@ proc display_all_files {} {\n>> \tset file_lists($ui_index) [list]\n>> \tset file_lists($ui_workdir) [list]\n>>\n>> -\tforeach path [lsort [array names file_states]] {\n>> +\tset to_display [lsort [array names file_states]]\n>> +\tset display_limit $default_config(gui.maxfilesdisplayed)\n>>     \n>\n> This should use [get_config gui.maxfilesdisplayed] so that the\n> user can actually set this property in a configuration file and\n> have git-gui honor it.  Reading from $default_config means you are\n> only looking at the hardcoded value you set in git-gui.sh.\n>\n>   \n>> +\tif {[llength $to_display] > $display_limit} {\n>> +\t\tif {![info exists files_warning] || !$files_warning} {\n>>     \n>\n> Wouldn't it be easier to just set files_warning to 0 at the start\n> of the script, so that you don't need to do this info exists test?\n>\n>   \n>> +\t\t\tset warning \"Displaying only $display_limit of \"\n>> +\t\t\tappend warning \"[llength $to_display] files.\"\n>> +\t\t\tinfo_popup [mc $warning]\n>>     \n>\n> This needs to be in the translated strings.\n>\n>   \n"},{"id":"120302","messageId":"4A81BD58.8070300@zwell.net","threadId":"19986","inReplyTo":"20090811202927.GZ1033@spearce.org","subject":"Re: [PATCH] Limit git-gui to display a maximum number of files","fromName":"Dan Zwell","fromEmail":"dzwell@zwell.net","sentAt":"2009-08-11T18:50:00Z","receivedAt":"2009-08-11T18:50:00Z","isPatch":true,"sender":{"key":"dzwell@zwell.net","avatar":null},"body":"When there is a large number of new or modified files,\n\"display_all_files\" takes a long time, and git-gui appears to\nhang. This change limits the number of files that are displayed.\nThis limit can be set as gui.maxfilesdisplayed, and is\n5000 by default.\n\nA warning is shown when the list of files is truncated.\n\nSigned-off-by: Dan Zwell <dzwell@zwell.net>\n---\n git-gui.sh     |   17 ++++++++++++++++-\n po/git-gui.pot |    5 +++++\n 2 files changed, 21 insertions(+), 1 deletions(-)\n\ndiff --git a/git-gui.sh b/git-gui.sh\nindex 3c0ce26..eae1f81 100755\n--- a/git-gui.sh\n+++ b/git-gui.sh\n@@ -745,6 +745,8 @@ set default_config(gui.newbranchtemplate) {}\n set default_config(gui.spellingdictionary) {}\n set default_config(gui.fontui) [font configure font_ui]\n set default_config(gui.fontdiff) [font configure font_diff]\n+# TODO: this option should be added to the git-config documentation\n+set default_config(gui.maxfilesdisplayed) 5000\n set font_descs {\n \t{fontui   font_ui   {mc \"Main Font\"}}\n \t{fontdiff font_diff {mc \"Diff/Console Font\"}}\n@@ -1698,10 +1700,12 @@ proc display_all_files_helper {w path icon_name m} {\n \t$w insert end \"[escape_path $path]\\n\"\n }\n \n+set files_warning 0\n proc display_all_files {} {\n \tglobal ui_index ui_workdir\n \tglobal file_states file_lists\n \tglobal last_clicked\n+\tglobal files_warning\n \n \t$ui_index conf -state normal\n \t$ui_workdir conf -state normal\n@@ -1713,7 +1717,18 @@ proc display_all_files {} {\n \tset file_lists($ui_index) [list]\n \tset file_lists($ui_workdir) [list]\n \n-\tforeach path [lsort [array names file_states]] {\n+\tset to_display [lsort [array names file_states]]\n+\tset display_limit [get_config gui.maxfilesdisplayed]\n+\tif {[llength $to_display] > $display_limit} {\n+\t\tif {!$files_warning} {\n+\t\t\t# do not repeatedly warn:\n+\t\t\tset files_warning 1\n+\t\t\tinfo_popup [mc \"Displaying only %s of %s files.\" \\\n+\t\t\t\t$display_limit [llength $to_display]]\n+\t\t}\n+\t\tset to_display [lrange $to_display 0 [expr {$display_limit-1}]]\n+\t}\n+\tforeach path $to_display {\n \t\tset s $file_states($path)\n \t\tset m [lindex $s 0]\n \t\tset icon_name [lindex $s 1]\ndiff --git a/po/git-gui.pot b/po/git-gui.pot\nindex 53b7d36..074582d 100644\n--- a/po/git-gui.pot\n+++ b/po/git-gui.pot\n@@ -90,6 +90,11 @@ msgstr \"\"\n msgid \"Ready.\"\n msgstr \"\"\n \n+#: git-gui.sh:1726\n+#, tcl-format\n+msgid \"Displaying only %s of %s files.\"\n+msgstr \"\"\n+\n #: git-gui.sh:1819\n msgid \"Unmodified\"\n msgstr \"\"\n-- \n1.6.4\n"},{"id":"120297","messageId":"20090811202927.GZ1033@spearce.org","threadId":"19986","inReplyTo":"4A81B738.7090507@zwell.net","subject":"Re: [PATCH] Limit git-gui to display a maximum number of files","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-08-11T20:29:27Z","receivedAt":"2009-08-11T20:29:27Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Dan Zwell <dzwell@zwell.net> wrote:\n> When there is a large number of new or modified files,\n> \"display_all_files\" takes a long time, and git-gui appears to\n> hang. This change limits the number of files that are displayed.\n> This limit can be set as gui.maxfilesdisplayed, and is\n> 5000 by default.\n>\n> A warning is shown when the list of files is truncated.\n>\n> Signed-off-by: Dan Zwell <dzwell@zwell.net>\n> ---\n> By the way, is the right way to deal with strings to be\n> translated? See the end of the patch.\n\nNo.\n\n> +\t\t\tset warning \"Displaying only $display_limit of \"\n> +\t\t\tappend warning \"[llength $to_display] files.\"\n> +\t\t\tinfo_popup [mc $warning]\n\nThis should be:\n\ninfo_popup [mc \"Displaying only %s of %s files.\" $display_limit [llength $to_display]]\n\n> +msgid \"Displaying only %s of %s files.\"\n> +msgstr \"\"\n\nSo that then the placeholders are available here...\n\n-- \nShawn.\n"},{"id":"120410","messageId":"20090812144345.GC1033@spearce.org","threadId":"19986","inReplyTo":"4A81BD58.8070300@zwell.net","subject":"Re: [PATCH] Limit git-gui to display a maximum number of files","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-08-12T14:43:45Z","receivedAt":"2009-08-12T14:43:45Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Dan Zwell <dzwell@zwell.net> wrote:\n> When there is a large number of new or modified files,\n> \"display_all_files\" takes a long time, and git-gui appears to\n> hang. This change limits the number of files that are displayed.\n> This limit can be set as gui.maxfilesdisplayed, and is\n> 5000 by default.\n>\n> A warning is shown when the list of files is truncated.\n\nThanks, applied.\n\n-- \nShawn.\n"},{"id":"120417","messageId":"20090812152409.GA5407@blimp.localdomain","threadId":"19986","inReplyTo":"20090812144345.GC1033@spearce.org","subject":"[PATCH] git-gui: Update russian translation","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2009-08-12T15:24:10Z","receivedAt":"2009-08-12T15:24:10Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Signed-off-by: Alex Riesen <raa.lkml@gmail.com>\n---\n\nShawn O. Pearce, Wed, Aug 12, 2009 16:43:45 +0200:\n> Dan Zwell <dzwell@zwell.net> wrote:\n> > When there is a large number of new or modified files,\n> > \"display_all_files\" takes a long time, and git-gui appears to\n> > hang. This change limits the number of files that are displayed.\n> > This limit can be set as gui.maxfilesdisplayed, and is\n> > 5000 by default.\n> >\n> > A warning is shown when the list of files is truncated.\n> \n> Thanks, applied.\n> \n\nAnd the updated translation.\n\nBut now, when I really think about the change, it looks useless.\nWhat has the _number_ of files has to do with the files you actually\nhave to handle? As the sorting of the file list cannot be changed (and\nit wouldn't be a big help anyway), you have no chance to get to your\nfile if it happens to be past the limit!\n\nWouldn't a pathname/glob filter in the command-line (or file/path\nselection dialog) to limit the scope be more appropriate and useful?\nAnd have the file list reading to happen in background, as gitk does?\n\n po/ru.po |   28 ++++++++++++++++------------\n 1 files changed, 16 insertions(+), 12 deletions(-)\n\ndiff --git a/po/ru.po b/po/ru.po\nindex 0ffc4a4..364c074 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -90,12 +90,18 @@ msgstr \"Вызов программы поддержки репозитория\n \n #: git-gui.sh:1384\n msgid \"Commit declined by prepare-commit-msg hook.\"\n-msgstr \"Сохранение прервано программой поддержки репозитория prepare-commit-msg\"\n+msgstr \"\"\n+\"Сохранение прервано программой поддержки репозитория prepare-commit-msg\"\n \n #: git-gui.sh:1542 lib/browser.tcl:246\n msgid \"Ready.\"\n msgstr \"Готово.\"\n \n+#: git-gui.sh:1726\n+#, tcl-format\n+msgid \"Displaying only %s of %s files.\"\n+msgstr \"Показано %s из %s файлов.\"\n+\n #: git-gui.sh:1819\n msgid \"Unmodified\"\n msgstr \"Не изменено\"\n@@ -1297,8 +1303,8 @@ msgid \"\"\n msgstr \"\"\n \"Невозможно исправить состояние во время операции слияния.\\n\"\n \"\\n\"\n-\"Текущее слияние не завершено. Невозможно исправить предыдущее \"\n-\"сохраненное состояние, не прерывая эту операцию.\\n\"\n+\"Текущее слияние не завершено. Невозможно исправить предыдущее сохраненное \"\n+\"состояние, не прерывая эту операцию.\\n\"\n \n #: lib/commit.tcl:48\n msgid \"Error loading commit data for amend:\"\n@@ -1723,8 +1729,7 @@ msgid \"\"\n msgstr \"\"\n \"Невозможно выполнить слияние во время исправления.\\n\"\n \"\\n\"\n-\"Завершите исправление данного состояния перед выполнением операции \"\n-\"слияния.\\n\"\n+\"Завершите исправление данного состояния перед выполнением операции слияния.\\n\"\n \n #: lib/merge.tcl:27\n msgid \"\"\n@@ -1888,8 +1893,8 @@ msgstr \"\"\n #, tcl-format\n msgid \"File %s seems to have unresolved conflicts, still stage?\"\n msgstr \"\"\n-\"Файл %s кажется содержит необработаные конфликты. \"\n-\"Продолжить подготовку к сохранению?\"\n+\"Файл %s кажется содержит необработаные конфликты. Продолжить подготовку к \"\n+\"сохранению?\"\n \n #: lib/mergetool.tcl:60\n #, tcl-format\n@@ -2213,8 +2218,8 @@ msgid \"\"\n \"One or more of the merge tests failed because you have not fetched the \"\n \"necessary commits.  Try fetching from %s first.\"\n msgstr \"\"\n-\"Некоторые тесты на слияние не прошли, потому что Вы не \"\n-\"получили необходимые состояния. Попытайтесь получить их из %s.\"\n+\"Некоторые тесты на слияние не прошли, потому что Вы не получили необходимые \"\n+\"состояния. Попытайтесь получить их из %s.\"\n \n #: lib/remote_branch_delete.tcl:207\n msgid \"Please select one or more branches to delete.\"\n@@ -2381,8 +2386,8 @@ msgstr \"Выполнение: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n-msgstr \"Программа %s успешно завершилась.\"\n+msgid \"Tool completed successfully: %s\"\n+msgstr \"Программа %s завершилась успешно.\"\n \n #: lib/tools.tcl:151\n #, tcl-format\n@@ -2538,4 +2543,3 @@ msgstr \"Использовать thin pack (для медленных сетев\n #: lib/transport.tcl:179\n msgid \"Include tags\"\n msgstr \"Передать метки\"\n-\n-- \n1.6.4.140.gc6dfd\n"},{"id":"120420","messageId":"20090812154016.GG1033@spearce.org","threadId":"19986","inReplyTo":"20090812152409.GA5407@blimp.localdomain","subject":"Re: [PATCH] git-gui: Update russian translation","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-08-12T15:40:17Z","receivedAt":"2009-08-12T15:40:17Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Alex Riesen <raa.lkml@gmail.com> wrote:\n> Shawn O. Pearce, Wed, Aug 12, 2009 16:43:45 +0200:\n> > Dan Zwell <dzwell@zwell.net> wrote:\n> > > When there is a large number of new or modified files,\n> > > \"display_all_files\" takes a long time, and git-gui appears to\n> > > hang. This change limits the number of files that are displayed.\n> > > This limit can be set as gui.maxfilesdisplayed, and is\n> > > 5000 by default.\n> > >\n> > > A warning is shown when the list of files is truncated.\n> > \n> > Thanks, applied.\n> \n> But now, when I really think about the change, it looks useless.\n> What has the _number_ of files has to do with the files you actually\n> have to handle? As the sorting of the file list cannot be changed (and\n> it wouldn't be a big help anyway), you have no chance to get to your\n> file if it happens to be past the limit!\n> \n> Wouldn't a pathname/glob filter in the command-line (or file/path\n> selection dialog) to limit the scope be more appropriate and useful?\n> And have the file list reading to happen in background, as gitk does?\n\nGood point.  I suspect the problem wasn't so much with Tcl doing the\nlist processing as it was with Tk actually creating the underlying\nicons and stuff for each file name.  But with the list clipped,\nyou are right, you are basically SOL.  You can't do much beyond\ndropping back to the CLI and using the CLI tools.\n\nIMHO, if we aren't going to handle 20k file names, we should at least\npunt and tell the user we aren't going to handle 20k file names,\nrather than just play Outlook wannabe and lockup the entire UI until\nthe user gets bored and kill -9's us.  So this patch is better than\nnothing, it at least lets the user know we have given up on them.\n\n-- \nShawn.\n"},{"id":"120428","messageId":"4A82E51E.3040806@zwell.net","threadId":"19986","inReplyTo":"20090812154016.GG1033@spearce.org","subject":"Re: [PATCH] git-gui: Update russian translation","fromName":"Dan Zwell","fromEmail":"dzwell@zwell.net","sentAt":"2009-08-12T15:51:58Z","receivedAt":"2009-08-12T15:51:58Z","isPatch":true,"sender":{"key":"dzwell@zwell.net","avatar":null},"body":"> Alex Riesen <raa.lkml@gmail.com> wrote:\n>> But now, when I really think about the change, it looks useless.\n>> What has the _number_ of files has to do with the files you actually\n>> have to handle? As the sorting of the file list cannot be changed (and\n>> it wouldn't be a big help anyway), you have no chance to get to your\n>> file if it happens to be past the limit!\n\n> Good point.  I suspect the problem wasn't so much with Tcl doing the\n> list processing as it was with Tk actually creating the underlying\n> icons and stuff for each file name.  But with the list clipped,\n> you are right, you are basically SOL.  You can't do much beyond\n> dropping back to the CLI and using the CLI tools.\n> \n> IMHO, if we aren't going to handle 20k file names, we should at least\n> punt and tell the user we aren't going to handle 20k file names,\n> rather than just play Outlook wannabe and lockup the entire UI until\n> the user gets bored and kill -9's us.  So this patch is better than\n> nothing, it at least lets the user know we have given up on them.\n> \n\nA warning would be good, but this gives users more information. In my \ncase, I only wanted to see a few files, but the rest were from a \ndirectory that should have been in .gitignore. If I had seen the \nfilenames, I would have known which directory was the culprit. This way, \nyou don't need to drop to the command line to fix the problem.\n\n-Dan\n"}]}