* Re: [RFC/PATCH 2/8] docbook: improve css style
From: Felipe Contreras @ 2009-03-24 0:21 UTC (permalink / raw)
To: Michael J Gruber; +Cc: Jeff King, git
In-Reply-To: <49C7A8AF.9080500@drmicha.warpmail.net>
On Mon, Mar 23, 2009 at 5:20 PM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> Felipe Contreras venit, vidit, dixit 23.03.2009 11:31:
>> On Mon, Mar 23, 2009 at 8:42 AM, Jeff King <peff@peff.net> wrote:
>>> On Sun, Mar 22, 2009 at 08:05:15PM +0200, Felipe Contreras wrote:
>>>
>>>> tt.literal, code.literal {
>>>> color: navy;
>>>> + font-size: 1em;
>>>> +}
>>>
>>> Isn't 1em already the default size? Or are you trying to override some
>>> other size specification elsewhere? It's hard to tell what the goal is
>>> because your commit message merely says "improve".
>>
>> That's correct.
>>
>> The problem is that when the user has a different size for the
>> sans-serif and monospace fonts it looks horrible when they are on the
>> same paragraph. I thought 1em did the trick, but you are right, it
>> doesn't.
>>
>> It looks like the only way to fix this is to set absolute sizes.
>>
>
> Also, it seems that everything which is not black is blue, except for
> terms, which are green and slanted. I don't think that looks nice
> together. How about slanted blue?
What's wrong with having 2 colors?
--
Felipe Contreras
^ permalink raw reply
* Re: [RFC/PATCH 2/8] docbook: improve css style
From: Felipe Contreras @ 2009-03-24 0:20 UTC (permalink / raw)
To: Jeff King; +Cc: git
In-Reply-To: <20090323064242.GB1119@coredump.intra.peff.net>
On Mon, Mar 23, 2009 at 8:42 AM, Jeff King <peff@peff.net> wrote:
> On Sun, Mar 22, 2009 at 08:05:15PM +0200, Felipe Contreras wrote:
>
>> tt.literal, code.literal {
>> color: navy;
>> + font-size: 1em;
>> +}
>
> Isn't 1em already the default size? Or are you trying to override some
> other size specification elsewhere? It's hard to tell what the goal is
> because your commit message merely says "improve".
I've updated the CSS. Can you take a look again?
I changed the font-size to normal, except for the code chunks. Also, I
changed the font of the in-paragrah code tags to sans-serif, that's
the most sane way I can think to fix the problem with different
font-size configured for monospace font.
I also reverted the line-height change.
--- a/Documentation/docbook-xsl.css
+++ b/Documentation/docbook-xsl.css
@@ -15,9 +15,8 @@ body blockquote {
html body {
margin: 1em 5% 1em 5%;
- line-height: 1em;
+ line-height: 1.2;
font-family: sans-serif;
- font-size: small;
}
body div {
@@ -130,7 +129,7 @@ body pre {
tt.literal, code.literal {
color: navy;
- font-size: 1em;
+ font-family: sans-serif;
}
code.literal:before { content: "'"; }
@@ -148,6 +147,7 @@ div.literallayout p {
div.literallayout {
font-family: monospace;
+ font-size: small;
margin: 0em;
color: navy;
border: 1px solid silver;
--
Felipe Contreras
^ permalink raw reply
* Re: .gitk should created hidden in windows
From: Pat Thoyts @ 2009-03-24 0:04 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Steve Wagner, git
In-Reply-To: <18887.26239.115820.450313@cargo.ozlabs.ibm.com>
Paul Mackerras wrote:
> Please try this patch and let me know if it does what you want.
>
[snip]
This patch works fine on my Vista installation. The .gitk file is now
hidden.
An alternative that was discussed was to move it rather than hide it so
that it ends up in the Application Data folder along with settings for
other applications. The following patch does this but hits rather more
lines of code and ends up needing to check the original location as well.
diff --git a/gitk b/gitk
index a7294a1..5ec6e7b 100755
--- a/gitk
+++ b/gitk
@@ -2509,12 +2509,13 @@ proc savestuff {w} {
global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
global cmitmode wrapcomment datetimeformat limitdiffs
global colors bgcolor fgcolor diffcolors diffcontext selectbgcolor
- global autoselect extdifftool perfile_attrs markbgcolor
+ global autoselect extdifftool perfile_attrs markbgcolor rcfile
if {$stuffsaved} return
if {![winfo viewable .]} return
- catch {
- set f [open "~/.gitk-new" w]
+ set tmpfile "${rcfile}-new"
+ if {[catch {
+ set f [open $tmpfile {CREAT WRONLY}]
puts $f [list set mainfont $mainfont]
puts $f [list set textfont $textfont]
puts $f [list set uifont $uifont]
@@ -2555,7 +2556,10 @@ proc savestuff {w} {
}
puts $f "}"
close $f
- file rename -force "~/.gitk-new" "~/.gitk"
+ file rename -force $tmpfile $rcfile
+ } err]} {
+ tk_messageBox -icon error -message $err \
+ -title "Failed to save preferences"
}
set stuffsaved 1
}
@@ -10790,7 +10794,13 @@ namespace import ::msgcat::mc
## And eventually load the actual message catalog
::msgcat::mcload $gitk_msgsdir
-catch {source ~/.gitk}
+set rcfile ~/.gitk
+if {$::tcl_platform(platform) eq "windows"} {
+ # Load old settings file if present
+ if {[file exists ~/.gitk]} {catch {source ~/.gitk}}
+ set rcfile [file join $env(APPDATA) gitk.settings]
+}
+catch {source $rcfile}
font create optionfont -family sans-serif -size -12
^ permalink raw reply related
* Re: [PATCH] difftool: add support for an extended revision syntax
From: Junio C Hamano @ 2009-03-23 23:50 UTC (permalink / raw)
To: David Aguilar; +Cc: git
In-Reply-To: <1237803348-9329-1-git-send-email-davvid@gmail.com>
David Aguilar <davvid@gmail.com> writes:
> This makes answering that question considerably easier.
> Users can now simply say:
>
> $ git difftool <file>~
>
> to compare <file> in the worktree against its
> previous version, and:
>
> $ git difftool <file>~2 <file>~
>
> to compare <file> from 2 versions ago to <file>'s
> previous version, etc.
These two examples are not that interesting. Because you can say:
$ git log -p -1 file
$ git log -p -2 file
(admittedly you need to skip the first entry of the output in the latter
one to get to what you are interested in).
What existing syntax does not allow you to say easily is something like:
$ git difftool <file>~4 <file>
That is, "I do not care about the intermediate states, but want to see the
4 changes consolidated in one".
As I told you in my previous message, I am not convinced a short-and-sweet
notation such as tilde-four is expressive enough for most user's needs (I
suspect most users use git as a fast CVS and have rather linear history,
in which case "Nth commit that changes the file, following only the first
parent chain down from the HEAD" _could_ be a perfectly fine and useful
semantics), but if it is, I think it would not be too involved to patch
revision.c::handle_revision_arg() to make it available to everybody.
> This makes the following statements equivalent:
>
> $ git difftool !
> $ git difftool HEAD!
> $ git difftool HEAD~ HEAD
Which would be:
$ git log -p -1 file
right?
Perhaps we would want a convenient way for "log -p" or "show -p" to drive
difftool as a backend?
^ permalink raw reply
* [PATCH v3 2/2] git-gui: minor spelling fix and string factorisation.
From: Sam Hocevar @ 2009-03-23 23:42 UTC (permalink / raw)
To: Git List
In-Reply-To: <20090323233924.GA29922@zoy.org>
Properly spell "successful" and slightly rewrite a couple of strings
that actually say the same thing in order to reduce translation work.
Update .pot and .po files accordingly since no new translation is
required.
---
This patch is unchanged since the last version.
lib/branch_delete.tcl | 4 ++--
lib/remote_branch_delete.tcl | 4 +---
lib/tools.tcl | 2 +-
po/de.po | 12 +-----------
po/fr.po | 12 +-----------
po/git-gui.pot | 9 +--------
po/hu.po | 12 +-----------
po/it.po | 12 +-----------
po/ja.po | 12 +-----------
po/nb.po | 12 +-----------
po/ru.po | 10 ----------
po/sv.po | 12 +-----------
po/zh_cn.po | 10 ----------
13 files changed, 12 insertions(+), 111 deletions(-)
diff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl
index ef1930b..20d5e42 100644
--- a/lib/branch_delete.tcl
+++ b/lib/branch_delete.tcl
@@ -51,7 +51,7 @@ constructor dialog {} {
$w.check \
[mc "Delete Only If Merged Into"] \
]
- $w_check none [mc "Always (Do not perform merge test.)"]
+ $w_check none [mc "Always (Do not perform merge checks)"]
pack $w.check -anchor nw -fill x -pady 5 -padx 5
foreach h [load_all_heads] {
@@ -112,7 +112,7 @@ method _delete {} {
}
if {$to_delete eq {}} return
if {$check_cmt eq {}} {
- set msg [mc "Recovering deleted branches is difficult. \n\n Delete the selected branches?"]
+ set msg [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]
if {[tk_messageBox \
-icon warning \
-type yesno \
diff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl
index 89eb0f7..4e02fc0 100644
--- a/lib/remote_branch_delete.tcl
+++ b/lib/remote_branch_delete.tcl
@@ -213,9 +213,7 @@ method _delete {} {
-type yesno \
-title [wm title $w] \
-parent $w \
- -message [mc "Recovering deleted branches is difficult.
-
-Delete the selected branches?"]] ne yes} {
+ -message [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]] ne yes} {
return
}
diff --git a/lib/tools.tcl b/lib/tools.tcl
index 6ae63b6..95e6e55 100644
--- a/lib/tools.tcl
+++ b/lib/tools.tcl
@@ -146,7 +146,7 @@ proc tools_complete {fullname w {ok 1}} {
}
if {$ok} {
- set msg [mc "Tool completed succesfully: %s" $fullname]
+ set msg [mc "Tool completed successfully: %s" $fullname]
} else {
set msg [mc "Tool failed: %s" $fullname]
}
diff --git a/po/de.po b/po/de.po
index a6f730b..51abb50 100644
--- a/po/de.po
+++ b/po/de.po
@@ -773,16 +773,6 @@ msgstr "Immer (ohne Zusammenführungstest)"
msgid "The following branches are not completely merged into %s:"
msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:"
-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Gelöschte Zweige können nur mit größerem Aufwand wiederhergestellt werden.\n"
-"\n"
-"Gewählte Zweige jetzt löschen?"
-
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
@@ -2506,7 +2496,7 @@ msgstr "Starten: %s"
#: lib/tools.tcl:149
#, tcl-format
-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"
msgstr "Werkzeug erfolgreich abgeschlossen: %s"
#: lib/tools.tcl:151
diff --git a/po/fr.po b/po/fr.po
index e6bf1b4..9b828a2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -780,16 +780,6 @@ msgstr "Toujours (Ne pas faire de test de fusion.)"
msgid "The following branches are not completely merged into %s:"
msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %s :"
-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Il est difficile de récupérer des branches supprimées.\n"
-"\n"
-"Supprimer les branches sélectionnées ?"
-
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
@@ -2412,7 +2402,7 @@ msgstr "Lancement de : %s"
#: lib/tools.tcl:149
#, tcl-format
-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"
msgstr "L'outil a terminé avec succès : %s"
#: lib/tools.tcl:151
diff --git a/po/git-gui.pot b/po/git-gui.pot
index 15aea0d..53b7d36 100644
--- a/po/git-gui.pot
+++ b/po/git-gui.pot
@@ -753,13 +753,6 @@ msgstr ""
msgid "The following branches are not completely merged into %s:"
msgstr ""
-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
@@ -2220,7 +2213,7 @@ msgstr ""
#: lib/tools.tcl:149
#, tcl-format
-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"
msgstr ""
#: lib/tools.tcl:151
diff --git a/po/hu.po b/po/hu.po
index f761b64..0f87bc1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -776,16 +776,6 @@ msgstr "Mindig (Ne legyen merge teszt.)"
msgid "The following branches are not completely merged into %s:"
msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:"
-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"A törölt branchek visszaállítása bonyolult. \n"
-"\n"
-" Biztosan törli a kiválasztott brancheket?"
-
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
@@ -2399,7 +2389,7 @@ msgstr "Futtatás: %s..."
#: lib/tools.tcl:149
#, tcl-format
-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"
msgstr "Az eszköz sikeresen befejeződött: %s"
#: lib/tools.tcl:151
diff --git a/po/it.po b/po/it.po
index 294e595..762632c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -778,16 +778,6 @@ msgstr "Sempre (Non effettuare verifiche di fusione)."
msgid "The following branches are not completely merged into %s:"
msgstr "I rami seguenti non sono stati fusi completamente in %s:"
-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Ricomporre rami cancellati può essere complicato. \n"
-"\n"
-" Eliminare i rami selezionati?"
-
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
@@ -2418,7 +2408,7 @@ msgstr "Eseguo: %s"
#: lib/tools.tcl:149
#, tcl-format
-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"
msgstr "Il programma esterno è terminato con successo: %s"
#: lib/tools.tcl:151
diff --git a/po/ja.po b/po/ja.po
index 09d60be..63c4695 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -773,16 +773,6 @@ msgstr "無条件(マージテストしない)"
msgid "The following branches are not completely merged into %s:"
msgstr "以下のブランチは %s に完全にマージされていません:"
-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"ブランチを削除すると元に戻すのは困難です。 \n"
-"\n"
-" 選択したブランチを削除しますか？"
-
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
@@ -2382,7 +2372,7 @@ msgstr "実行中: %s"
#: lib/tools.tcl:149
#, tcl-format
-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"
msgstr "ツールが完了しました: %s"
#: lib/tools.tcl:151
diff --git a/po/nb.po b/po/nb.po
index 1c5137d..6de93c2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -761,16 +761,6 @@ msgstr "Alltid (Ikke utfør sammenslåingstest.)"
msgid "The following branches are not completely merged into %s:"
msgstr "Følgende grener er ikke fullstendig slått sammen med %s:"
-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Gjenoppretting av fjernede grener er vanskelig. \n"
-"\n"
-" Fjern valgte grener?"
-
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
@@ -2331,7 +2321,7 @@ msgstr "Kjører: %s"
#: lib/tools.tcl:149
#, tcl-format
-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"
msgstr "Verktøyet ble fullført med suksess: %s"
#: lib/tools.tcl:151
diff --git a/po/ru.po b/po/ru.po
index db55b3e..04df2aa 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -661,16 +661,6 @@ msgstr "Всегда (не выполнять проверку на объеди
msgid "The following branches are not completely merged into %s:"
msgstr "Следующие ветви объединены с %s не полностью:"
-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Восстанавливать удаленные ветви сложно. \n"
-"\n"
-" Удалить выбранные ветви?"
-
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
diff --git a/po/sv.po b/po/sv.po
index 167654c..c1535f9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -780,16 +780,6 @@ msgstr "Alltid (utför inte sammanslagningstest)."
msgid "The following branches are not completely merged into %s:"
msgstr "Följande grenar är inte till fullo sammanslagna med %s:"
-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Det är svårt att återställa borttagna grenar.\n"
-"\n"
-" Ta bort valda grenar?"
-
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
@@ -2398,7 +2388,7 @@ msgstr "Exekverar: %s"
#: lib/tools.tcl:149
#, tcl-format
-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"
msgstr "Verktyget avslutades framgångsrikt: %s"
#: lib/tools.tcl:151
diff --git a/po/zh_cn.po b/po/zh_cn.po
index d2c6866..91c1be2 100644
--- a/po/zh_cn.po
+++ b/po/zh_cn.po
@@ -676,16 +676,6 @@ msgstr "总是合并 (不作合并测试.)"
msgid "The following branches are not completely merged into %s:"
msgstr "下列分支没有完全被合并到 %s:"
-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"恢复被删除的分支非常困难.\n"
-"\n"
-"是否要删除所选分支?"
-
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
--
1.6.2.1
^ permalink raw reply related
* Re: [PATCH] gitk: put all startup code into a proc to enable re-sourcing
From: Pat Thoyts @ 2009-03-23 23:40 UTC (permalink / raw)
To: Paul Mackerras; +Cc: git
In-Reply-To: <18887.24242.451428.980685@cargo.ozlabs.ibm.com>
Paul Mackerras wrote:
> Pat Thoyts writes:
>
>> All the startup code is moved into a procedure. All the variables
>> get initialized using 'variable' to ensure they are in the global
>> namespace. This makes it possible to re-source the script during
>> development from the Tk console or a tkcon interactive session.
>>
>> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
>
> The patch does other stuff as well, that should be mentioned in the
> patch description or split out into a separate patch - namely it
> changes error_popup on win32 (why?) and it introduces some ttk widget
> use into confirm_popup.
>
> Paul.
The changes to error_popup -- its fugly on windows. We have
tk_messageBox for showing message boxes and where available this
function will use a native messagebox which will look normal for the
platform.
However, these should be in the theme patch and not in a code
refactoring patch. So I apologize and will redo more carefully.
Pat Thoyts
^ permalink raw reply
* [PATCH v3 1/2] git-gui: various French translation fixes
From: Sam Hocevar @ 2009-03-23 23:39 UTC (permalink / raw)
To: git; +Cc: Christian Couder, Nicolas Sebrecht
Mostly grammar, spelling and typography fixes, but also a few wording
enhancements here and there.
---
This patch includes everything acked by Christian and Nicolas, without
the part that tried to find a better translation for "revert". These will
need to be discussed later.
po/fr.po | 202 +++++++++++++++++++++++++++++++-------------------------------
1 files changed, 101 insertions(+), 101 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index 45773ab..e6bf1b4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -62,7 +62,7 @@ msgstr ""
"\n"
"%s nécessite au moins Git 1.5.0.\n"
"\n"
-"Peut'on considérer que '%s' est en version 1.5.0 ?\n"
+"Peut-on considérer que '%s' est en version 1.5.0 ?\n"
#: git-gui.sh:1062
msgid "Git directory not found:"
@@ -82,7 +82,7 @@ msgstr "Aucun répertoire de travail"
#: git-gui.sh:1247 lib/checkout_op.tcl:305
msgid "Refreshing file status..."
-msgstr "Rafraichissement du status des fichiers..."
+msgstr "Rafraîchissement du statut des fichiers..."
#: git-gui.sh:1303
msgid "Scanning for modified files ..."
@@ -163,7 +163,7 @@ msgstr "Dépôt"
#: git-gui.sh:2281
msgid "Edit"
-msgstr "Edition"
+msgstr "Édition"
#: git-gui.sh:2283 lib/choose_rev.tcl:561
msgid "Branch"
@@ -199,7 +199,7 @@ msgstr "Naviguer dans la branche..."
#: git-gui.sh:2316
msgid "Visualize Current Branch's History"
-msgstr "Visualiser historique branche courante"
+msgstr "Visualiser l'historique de la branche courante"
#: git-gui.sh:2320
msgid "Visualize All Branch History"
@@ -208,12 +208,12 @@ msgstr "Voir l'historique de toutes les branches"
#: git-gui.sh:2327
#, tcl-format
msgid "Browse %s's Files"
-msgstr "Naviguer l'arborescence de %s"
+msgstr "Parcourir l'arborescence de %s"
#: git-gui.sh:2329
#, tcl-format
msgid "Visualize %s's History"
-msgstr "Voir l'historique de la branche: %s"
+msgstr "Voir l'historique de la branche : %s"
#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67
msgid "Database Statistics"
@@ -230,7 +230,7 @@ msgstr "Vérifier le dépôt"
#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7
#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
msgid "Create Desktop Icon"
-msgstr "Créer icône sur bureau"
+msgstr "Créer une icône sur le bureau"
#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
msgid "Quit"
@@ -320,7 +320,7 @@ msgstr "Désindexer"
#: git-gui.sh:2484 lib/index.tcl:410
msgid "Revert Changes"
-msgstr "Annuler les modifications (revert)"
+msgstr "Annuler les modifications"
#: git-gui.sh:2491 git-gui.sh:3069
msgid "Show Less Context"
@@ -382,7 +382,7 @@ msgstr "Documentation en ligne"
#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
msgid "Show SSH Key"
-msgstr "Montrer clé SSH"
+msgstr "Montrer la clé SSH"
#: git-gui.sh:2707
#, tcl-format
@@ -445,7 +445,7 @@ msgstr "Fichier :"
#: git-gui.sh:3078
msgid "Refresh"
-msgstr "Rafraichir"
+msgstr "Rafraîchir"
#: git-gui.sh:3099
msgid "Decrease Font Size"
@@ -457,7 +457,7 @@ msgstr "Agrandir la police"
#: git-gui.sh:3111 lib/blame.tcl:281
msgid "Encoding"
-msgstr "Encodage"
+msgstr "Codage des caractères"
#: git-gui.sh:3122
msgid "Apply/Reverse Hunk"
@@ -469,7 +469,7 @@ msgstr "Appliquer/Inverser la ligne"
#: git-gui.sh:3137
msgid "Run Merge Tool"
-msgstr "Lancer outil de merge"
+msgstr "Lancer l'outil de fusion"
#: git-gui.sh:3142
msgid "Use Remote Version"
@@ -527,7 +527,7 @@ msgid ""
"Tcl binary distributed by Cygwin."
msgstr ""
"\n"
-"Ceci est du à un problème connu avec\n"
+"Ceci est dû à un problème connu avec\n"
"le binaire Tcl distribué par Cygwin."
#: git-gui.sh:3336
@@ -630,11 +630,11 @@ msgstr "Fichier original :"
#: lib/blame.tcl:1021
msgid "Cannot find HEAD commit:"
-msgstr "Impossible de trouver le commit HEAD:"
+msgstr "Impossible de trouver le commit HEAD :"
#: lib/blame.tcl:1076
msgid "Cannot find parent commit:"
-msgstr "Impossible de trouver le commit parent:"
+msgstr "Impossible de trouver le commit parent :"
#: lib/blame.tcl:1091
msgid "Unable to display parent"
@@ -646,7 +646,7 @@ msgstr "Erreur lors du chargement des différences :"
#: lib/blame.tcl:1232
msgid "Originally By:"
-msgstr "A l'origine par :"
+msgstr "À l'origine par :"
#: lib/blame.tcl:1238
msgid "In File:"
@@ -691,11 +691,11 @@ msgstr "Détacher de la branche locale"
#: lib/branch_create.tcl:22
msgid "Create Branch"
-msgstr "Créer branche"
+msgstr "Créer une branche"
#: lib/branch_create.tcl:27
msgid "Create New Branch"
-msgstr "Créer nouvelle branche"
+msgstr "Créer une nouvelle branche"
#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377
msgid "Create"
@@ -719,7 +719,7 @@ msgstr "Révision initiale"
#: lib/branch_create.tcl:72
msgid "Update Existing Branch:"
-msgstr "Mettre à jour branche existante :"
+msgstr "Mettre à jour une branche existante :"
#: lib/branch_create.tcl:75
msgid "No"
@@ -727,7 +727,7 @@ msgstr "Non"
#: lib/branch_create.tcl:80
msgid "Fast Forward Only"
-msgstr "Mise-à-jour rectiligne seulement (fast-forward)"
+msgstr "Mise à jour rectiligne seulement (fast-forward)"
#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
msgid "Reset"
@@ -769,7 +769,7 @@ msgstr "Branches locales"
#: lib/branch_delete.tcl:52
msgid "Delete Only If Merged Into"
-msgstr "Supprimer seulement si fusionnée dans:"
+msgstr "Supprimer seulement si fusionnée dans :"
#: lib/branch_delete.tcl:54
msgid "Always (Do not perform merge test.)"
@@ -786,7 +786,7 @@ msgid ""
"\n"
" Delete the selected branches?"
msgstr ""
-"Récupérer des branches supprimées est difficile.\n"
+"Il est difficile de récupérer des branches supprimées.\n"
"\n"
"Supprimer les branches sélectionnées ?"
@@ -796,7 +796,7 @@ msgid ""
"Failed to delete branches:\n"
"%s"
msgstr ""
-"La suppression des branches suivantes a échouée :\n"
+"La suppression des branches suivantes a échoué :\n"
"%s"
#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
@@ -902,11 +902,11 @@ msgstr "La stratégie de fusion '%s' n'est pas supportée."
#: lib/checkout_op.tcl:261
#, tcl-format
msgid "Failed to update '%s'."
-msgstr "La mise à jour de '%s' a échouée."
+msgstr "La mise à jour de '%s' a échoué."
#: lib/checkout_op.tcl:273
msgid "Staging area (index) is already locked."
-msgstr "L'index (staging area) est déjà vérouillé"
+msgstr "L'index (staging area) est déjà verrouillé."
#: lib/checkout_op.tcl:288
msgid ""
@@ -918,7 +918,7 @@ msgid ""
"The rescan will be automatically started now.\n"
msgstr ""
"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
-"dépôt\n"
+"dépôt.\n"
"\n"
"Un autre programme Git a modifié ce dépôt depuis la dernière "
"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir "
@@ -956,9 +956,9 @@ msgid ""
"If you wanted to be on a branch, create one now starting from 'This Detached "
"Checkout'."
msgstr ""
-"Vous n'êtes plus ur une branche locale.\n"
+"Vous n'êtes plus sur une branche locale.\n"
"\n"
-"Si vous vouliez être sur une branche, créez en une maintenant en partant de "
+"Si vous vouliez être sur une branche, créez-en une maintenant en partant de "
"'Cet emprunt détaché'."
#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
@@ -1000,7 +1000,7 @@ msgstr ""
"mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a "
"échouée.\n"
"\n"
-"Cela n'aurait pas du se produire. %s va abandonner et se terminer."
+"Cela n'aurait pas dû se produire. %s va abandonner et se terminer."
#: lib/choose_font.tcl:39
msgid "Select"
@@ -1023,8 +1023,8 @@ msgid ""
"This is example text.\n"
"If you like this text, it can be your font."
msgstr ""
-"C'est un texte d'exemple.\n"
-"Si vous aimez ce texte, vous pouvez choisir cette police"
+"Ceci est un texte d'exemple.\n"
+"Si vous aimez ce texte, vous pouvez choisir cette police."
#: lib/choose_repository.tcl:28
msgid "Git Gui"
@@ -1040,7 +1040,7 @@ msgstr "Nouveau..."
#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465
msgid "Clone Existing Repository"
-msgstr "Cloner dépôt existant"
+msgstr "Cloner un dépôt existant"
#: lib/choose_repository.tcl:106
msgid "Clone..."
@@ -1048,7 +1048,7 @@ msgstr "Cloner..."
#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983
msgid "Open Existing Repository"
-msgstr "Ouvrir dépôt existant"
+msgstr "Ouvrir un dépôt existant"
#: lib/choose_repository.tcl:119
msgid "Open..."
@@ -1056,17 +1056,17 @@ msgstr "Ouvrir..."
#: lib/choose_repository.tcl:132
msgid "Recent Repositories"
-msgstr "Dépôt récemment utilisés"
+msgstr "Dépôts récemment utilisés"
#: lib/choose_repository.tcl:138
msgid "Open Recent Repository:"
-msgstr "Ouvrir dépôt récent :"
+msgstr "Ouvrir un dépôt récent :"
#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309
#: lib/choose_repository.tcl:316
#, tcl-format
msgid "Failed to create repository %s:"
-msgstr "La création du dépôt %s a échouée :"
+msgstr "La création du dépôt %s a échoué :"
#: lib/choose_repository.tcl:387
msgid "Directory:"
@@ -1093,11 +1093,11 @@ msgstr "Cloner"
#: lib/choose_repository.tcl:473
msgid "Source Location:"
-msgstr "Emplacement source:"
+msgstr "Emplacement source :"
#: lib/choose_repository.tcl:484
msgid "Target Directory:"
-msgstr "Répertoire cible:"
+msgstr "Répertoire cible :"
#: lib/choose_repository.tcl:496
msgid "Clone Type:"
@@ -1137,7 +1137,7 @@ msgstr "L'emplacement %s existe déjà."
#: lib/choose_repository.tcl:622
msgid "Failed to configure origin"
-msgstr "La configuration de l'origine a échouée."
+msgstr "La configuration de l'origine a échoué."
#: lib/choose_repository.tcl:634
msgid "Counting objects"
@@ -1242,7 +1242,7 @@ msgstr "fichiers"
#: lib/choose_repository.tcl:962
msgid "Initial file checkout failed."
-msgstr "Chargement initial du fichier échoué."
+msgstr "Le chargement initial du fichier a échoué."
#: lib/choose_repository.tcl:978
msgid "Open"
@@ -1284,7 +1284,7 @@ msgstr "Révision invalide : %s"
#: lib/choose_rev.tcl:338
msgid "No revision selected."
-msgstr "Pas de révision selectionnée."
+msgstr "Pas de révision sélectionnée."
#: lib/choose_rev.tcl:346
msgid "Revision expression is empty."
@@ -1292,7 +1292,7 @@ msgstr "L'expression de révision est vide."
#: lib/choose_rev.tcl:531
msgid "Updated"
-msgstr "Mise-à-jour:"
+msgstr "Mise à jour:"
#: lib/choose_rev.tcl:559
msgid "URL"
@@ -1320,8 +1320,8 @@ msgid ""
msgstr ""
"Impossible de corriger pendant une fusion.\n"
"\n"
-"Vous êtes actuellement au milieu d'une fusion qui n'a pas été completement "
-"terminée. Vous ne pouvez pas corriger le commit précédant sauf si vous "
+"Vous êtes actuellement au milieu d'une fusion qui n'a pas été complètement "
+"terminée. Vous ne pouvez pas corriger le commit précédent sauf si vous "
"abandonnez la fusion courante.\n"
#: lib/commit.tcl:49
@@ -1409,7 +1409,7 @@ msgstr ""
#: lib/commit.tcl:211
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
-msgstr "attention : Tcl ne supporte pas l'encodage '%s'."
+msgstr "attention : Tcl ne supporte pas le codage '%s'."
#: lib/commit.tcl:227
msgid "Calling pre-commit hook..."
@@ -1469,12 +1469,12 @@ msgstr "commit-tree a échoué :"
#: lib/commit.tcl:373
msgid "update-ref failed:"
-msgstr "update-ref a échoué"
+msgstr "update-ref a échoué :"
#: lib/commit.tcl:461
#, tcl-format
msgid "Created commit %s: %s"
-msgstr "Commit créé %s : %s"
+msgstr "Commit %s créé : %s"
#: lib/console.tcl:59
msgid "Working... please wait..."
@@ -1581,24 +1581,24 @@ msgid ""
"LOCAL: deleted\n"
"REMOTE:\n"
msgstr ""
-"LOCAL: supprimé\n"
-"DISTANT:\n"
+"LOCAL : supprimé\n"
+"DISTANT :\n"
#: lib/diff.tcl:125
msgid ""
"REMOTE: deleted\n"
"LOCAL:\n"
msgstr ""
-"DISTANT: supprimé\n"
-"LOCAL:\n"
+"DISTANT : supprimé\n"
+"LOCAL :\n"
#: lib/diff.tcl:132
msgid "LOCAL:\n"
-msgstr "LOCAL:\n"
+msgstr "LOCAL :\n"
#: lib/diff.tcl:135
msgid "REMOTE:\n"
-msgstr "DISTANT:\n"
+msgstr "DISTANT :\n"
#: lib/diff.tcl:197 lib/diff.tcl:296
#, tcl-format
@@ -1624,7 +1624,7 @@ msgid ""
"* Showing only first %d bytes.\n"
msgstr ""
"* Le fichier non suivi fait %d octets.\n"
-"* On montre seulement les premiers %d octets.\n"
+"* Seuls les %d premiers octets sont montrés.\n"
#: lib/diff.tcl:228
#, tcl-format
@@ -1635,7 +1635,7 @@ msgid ""
msgstr ""
"\n"
"* Fichier suivi raccourcis ici de %s.\n"
-"* Pour voir le fichier entier, utiliser un éditeur externe.\n"
+"* Pour voir le fichier entier, utilisez un éditeur externe.\n"
#: lib/diff.tcl:436
msgid "Failed to unstage selected hunk."
@@ -1680,7 +1680,7 @@ msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter."
#: lib/index.tcl:6
msgid "Unable to unlock the index."
-msgstr "Impossible de dévérouiller l'index."
+msgstr "Impossible de déverrouiller l'index."
#: lib/index.tcl:15
msgid "Index Error"
@@ -1700,12 +1700,12 @@ msgstr "Continuer"
#: lib/index.tcl:31
msgid "Unlock Index"
-msgstr "Déverouiller l'index"
+msgstr "Déverrouiller l'index"
#: lib/index.tcl:287
#, tcl-format
msgid "Unstaging %s from commit"
-msgstr "Désindexation de: %s"
+msgstr "Désindexation de : %s"
#: lib/index.tcl:326
msgid "Ready to commit."
@@ -1804,11 +1804,11 @@ msgid ""
msgstr ""
"Vous êtes au milieu d'une modification.\n"
"\n"
-"Le fichier %s est modifié.\n"
+"Le fichier %s a été modifié.\n"
"\n"
"Vous devriez terminer le commit courant avant de lancer une fusion. En "
"faisait comme cela, vous éviterez de devoir éventuellement abandonner une "
-"fusion ayant échouée.\n"
+"fusion ayant échoué.\n"
#: lib/merge.tcl:107
#, tcl-format
@@ -1826,7 +1826,7 @@ msgstr "La fusion s'est faite avec succès."
#: lib/merge.tcl:133
msgid "Merge failed. Conflict resolution is required."
-msgstr "La fusion a echouée. Il est nécessaire de résoudre les conflicts."
+msgstr "La fusion a echoué. Il est nécessaire de résoudre les conflits."
#: lib/merge.tcl:158
#, tcl-format
@@ -1914,16 +1914,16 @@ msgid ""
"\n"
"This operation can be undone only by restarting the merge."
msgstr ""
-"Noter que le diff ne montre que les modifications en conflict.\n"
+"Noter que le diff ne montre que les modifications en conflit.\n"
"\n"
"%s sera écrasé.\n"
"\n"
-"Cette opération ne peut être défaite qu'en relançant la fusion."
+"Cette opération ne peut être inversée qu'en relançant la fusion."
#: lib/mergetool.tcl:45
#, tcl-format
msgid "File %s seems to have unresolved conflicts, still stage?"
-msgstr "Le fichier %s semble avoir des conflicts non résolus, indéxer quand même ?"
+msgstr "Le fichier %s semble avoir des conflits non résolus, indexer quand même ?"
#: lib/mergetool.tcl:60
#, tcl-format
@@ -1932,11 +1932,11 @@ msgstr "Ajouter une résolution pour %s"
#: lib/mergetool.tcl:141
msgid "Cannot resolve deletion or link conflicts using a tool"
-msgstr "Impossible de résoudre la suppression ou de relier des conflicts en utilisant un outil"
+msgstr "Impossible de résoudre la suppression ou de relier des conflits en utilisant un outil"
#: lib/mergetool.tcl:146
msgid "Conflict file does not exist"
-msgstr "Le fichier en conflict n'existe pas."
+msgstr "Le fichier en conflit n'existe pas."
#: lib/mergetool.tcl:264
#, tcl-format
@@ -1958,7 +1958,7 @@ msgid ""
"Error retrieving versions:\n"
"%s"
msgstr ""
-"Erreur lors de la récupération des versions:\n"
+"Erreur lors de la récupération des versions :\n"
"%s"
#: lib/mergetool.tcl:343
@@ -1968,7 +1968,7 @@ msgid ""
"\n"
"%s"
msgstr ""
-"Impossible de lancer l'outil de fusion:\n"
+"Impossible de lancer l'outil de fusion :\n"
"\n"
"%s"
@@ -1983,12 +1983,12 @@ msgstr "L'outil de fusion a échoué."
#: lib/option.tcl:11
#, tcl-format
msgid "Invalid global encoding '%s'"
-msgstr "Encodage global invalide '%s'"
+msgstr "Codage global '%s' invalide"
#: lib/option.tcl:19
#, tcl-format
msgid "Invalid repo encoding '%s'"
-msgstr "Encodage de dépôt invalide '%s'"
+msgstr "Codage de dépôt '%s' invalide"
#: lib/option.tcl:117
msgid "Restore Defaults"
@@ -2001,7 +2001,7 @@ msgstr "Sauvegarder"
#: lib/option.tcl:131
#, tcl-format
msgid "%s Repository"
-msgstr "Dépôt: %s"
+msgstr "Dépôt : %s"
#: lib/option.tcl:132
msgid "Global (All Repositories)"
@@ -2069,7 +2069,7 @@ msgstr "Nouveau modèle de nom de branche"
#: lib/option.tcl:155
msgid "Default File Contents Encoding"
-msgstr "Encodage du contenu des fichiers par défaut"
+msgstr "Codage du contenu des fichiers par défaut"
#: lib/option.tcl:203
msgid "Change"
@@ -2098,11 +2098,11 @@ msgstr "Préférences"
#: lib/option.tcl:314
msgid "Failed to completely save options:"
-msgstr "La sauvegarde complète des options a échouée :"
+msgstr "La sauvegarde complète des options a échoué :"
#: lib/remote.tcl:163
msgid "Remove Remote"
-msgstr "Supprimer dépôt distant"
+msgstr "Supprimer un dépôt distant"
#: lib/remote.tcl:168
msgid "Prune from"
@@ -2118,11 +2118,11 @@ msgstr "Pousser vers"
#: lib/remote_add.tcl:19
msgid "Add Remote"
-msgstr "Ajouter dépôt distant"
+msgstr "Ajouter un dépôt distant"
#: lib/remote_add.tcl:24
msgid "Add New Remote"
-msgstr "Ajouter nouveau dépôt distant"
+msgstr "Ajouter un nouveau dépôt distant"
#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
msgid "Add"
@@ -2134,7 +2134,7 @@ msgstr "Détails des dépôts distants"
#: lib/remote_add.tcl:50
msgid "Location:"
-msgstr "Emplacement:"
+msgstr "Emplacement :"
#: lib/remote_add.tcl:62
msgid "Further Action"
@@ -2146,7 +2146,7 @@ msgstr "Récupérer immédiatement"
#: lib/remote_add.tcl:71
msgid "Initialize Remote Repository and Push"
-msgstr "Initialiser dépôt distant et pousser"
+msgstr "Initialiser un dépôt distant et pousser"
#: lib/remote_add.tcl:77
msgid "Do Nothing Else Now"
@@ -2193,7 +2193,7 @@ msgstr "Mise en place de %s (à %s)"
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
msgid "Delete Branch Remotely"
-msgstr "Supprimer branche à distance"
+msgstr "Supprimer une branche à distance"
#: lib/remote_branch_delete.tcl:47
msgid "From Repository"
@@ -2244,8 +2244,8 @@ msgid ""
"One or more of the merge tests failed because you have not fetched the "
"necessary commits. Try fetching from %s first."
msgstr ""
-"Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez pas "
-"récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord."
+"Un ou plusieurs des tests de fusion ont échoué parce que vous n'avez pas "
+"récupéré les commits nécessaires. Essayez de récupérer à partir de %s d'abord."
#: lib/remote_branch_delete.tcl:207
msgid "Please select one or more branches to delete."
@@ -2257,14 +2257,14 @@ msgid ""
"\n"
"Delete the selected branches?"
msgstr ""
-"Récupérer des branches supprimées est difficile.\n"
+"Il est difficile de récupérer des branches supprimées.\n"
"\n"
-"Souhaitez vous supprimer les branches sélectionnées ?"
+"Supprimer les branches sélectionnées ?"
#: lib/remote_branch_delete.tcl:226
#, tcl-format
msgid "Deleting branches from %s"
-msgstr "Supprimer les branches de %s"
+msgstr "Suppression des branches de %s"
#: lib/remote_branch_delete.tcl:286
msgid "No repository selected."
@@ -2285,7 +2285,7 @@ msgstr "Suivant"
#: lib/search.tcl:24
msgid "Prev"
-msgstr "Précédant"
+msgstr "Précédent"
#: lib/search.tcl:25
msgid "Case-Sensitive"
@@ -2293,7 +2293,7 @@ msgstr "Sensible à la casse"
#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
msgid "Cannot write shortcut:"
-msgstr "Impossible d'écrire le raccourcis :"
+msgstr "Impossible d'écrire le raccourci :"
#: lib/shortcut.tcl:136
msgid "Cannot write icon:"
@@ -2318,7 +2318,7 @@ msgstr "Réinitialisation du dictionnaire à %s."
#: lib/spellcheck.tcl:73
msgid "Spell checker silently failed on startup"
-msgstr "La vérification d'orthographe a échouée silentieusement au démarrage"
+msgstr "La vérification d'orthographe a échoué silencieusement au démarrage"
#: lib/spellcheck.tcl:80
msgid "Unrecognized spell checker"
@@ -2351,11 +2351,11 @@ msgstr "Générer une clé"
#: lib/sshkey.tcl:56
msgid "Copy To Clipboard"
-msgstr "Copier dans le presse papier"
+msgstr "Copier dans le presse-papier"
#: lib/sshkey.tcl:70
msgid "Your OpenSSH Public Key"
-msgstr "Votre clé publique Open SSH"
+msgstr "Votre clé publique OpenSSH"
#: lib/sshkey.tcl:78
msgid "Generating..."
@@ -2368,7 +2368,7 @@ msgid ""
"\n"
"%s"
msgstr ""
-"Impossible de lancer ssh-keygen:\n"
+"Impossible de lancer ssh-keygen :\n"
"\n"
"%s"
@@ -2398,7 +2398,7 @@ msgstr "Lancer %s nécessite qu'un fichier soit sélectionné."
#: lib/tools.tcl:90
#, tcl-format
msgid "Are you sure you want to run %s?"
-msgstr "Êtes vous sûr de vouloir lancer %s ?"
+msgstr "Êtes-vous sûr de vouloir lancer %s ?"
#: lib/tools.tcl:110
#, tcl-format
@@ -2422,11 +2422,11 @@ msgstr "L'outil a échoué : %s"
#: lib/tools_dlg.tcl:22
msgid "Add Tool"
-msgstr "Ajouter outil"
+msgstr "Ajouter un outil"
#: lib/tools_dlg.tcl:28
msgid "Add New Tool Command"
-msgstr "Ajouter nouvelle commande d'outil"
+msgstr "Ajouter une nouvelle commande d'outil"
#: lib/tools_dlg.tcl:33
msgid "Add globally"
@@ -2438,7 +2438,7 @@ msgstr "Détails sur l'outil"
#: lib/tools_dlg.tcl:48
msgid "Use '/' separators to create a submenu tree:"
-msgstr "Utiliser les séparateurs '/' pour créer un arbre de sous menus :"
+msgstr "Utiliser les séparateurs '/' pour créer un arbre de sous-menus :"
#: lib/tools_dlg.tcl:61
msgid "Command:"
@@ -2462,7 +2462,7 @@ msgstr "Ne pas montrer la fenêtre de sortie des commandes"
#: lib/tools_dlg.tcl:97
msgid "Run only if a diff is selected ($FILENAME not empty)"
-msgstr "Lancer seulement si un diff est selectionné ($FILENAME non vide)"
+msgstr "Lancer seulement si un diff est sélectionné ($FILENAME non vide)"
#: lib/tools_dlg.tcl:121
msgid "Please supply a name for the tool."
@@ -2479,7 +2479,7 @@ msgid ""
"Could not add tool:\n"
"%s"
msgstr ""
-"Impossible d'ajouter l'outil:\n"
+"Impossible d'ajouter l'outil :\n"
"%s"
#: lib/tools_dlg.tcl:190
--
1.6.2.1
^ permalink raw reply related
* Re: [PATCH] difftool: add support for an extended revision syntax
From: David Aguilar @ 2009-03-23 23:33 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Michael J Gruber, git
In-Reply-To: <7vhc1j6czf.fsf@gitster.siamese.dyndns.org>
On Mon, Mar 23, 2009 at 4:22 PM, Junio C Hamano <gitster@pobox.com> wrote:
> David Aguilar <davvid@gmail.com> writes:
>
>> Keep in mind that the syntax that this patch added does not have file~3
>> = HEAD~3. file~3 means finding file as it existed 3 changes-to-file
>> ago, which is != to HEAD~3 if file did not change in the last 3 commits.
>
> If your motive is to introduce inconsistency to the UI by adding this kind
> of new notation _only to difftool_, I have to reconsider moving it out of
> contrib/ area.
I totally agree that this patch was half-baked, not fully defined,
and should be dropped. I hope that doesn't influence
your decision for the rest of the patches that came before it.
The notion of "3 commits ago" is ambiguous in a merge-heavy work flow
and using ~ would only confuse things, so I'll see if we can find a better
way to do it, but it shouldn't happen in difftool (if it happens at all).
>
> While I do not fundamentally oppose to add convenient notations for useful
> concepts, you need to start at making sure if this "three changes ago" is
> a well defined concept to begin with.
>
> And it is not a well defined concept in a merge-heavy environment, unless
> you define what you mean by "three changes ago".
>
> If you consider this history:
>
> ---Y---o---X---M---o mainline = HEAD
> /
> ---A---B---C topic
>
> where A, B, C and X, Y are the only commits that touched the file you are
> interested in, how do you define 3-changes-ago?
>
> Maybe X was just a totally uninteresting typofix to a comment, while A, B
> and C were adding a very interesting new feature. Don't forget that M
> also changes the file from either of its parents (X or C). Does M count
> as the last change? Or does it not count because it is just a mechanical
> unconflicting merge? Which one of X or C is the penultimate change? The
> one with an earlier committer timestamp? Tiebreaking with timestamps is
> known to be flawed in the presense of clock skew.
>
> For the consistency of the UI, "starting at HEAD, following first-parent
> ancestry, find N-th commit that touches the path, ignoring all the side
> branches" MUST be the semantics of a notation that uses tilde followed by
> number (so file~3 must mean Y in the above picture), because HEAD~3 is
> defined as "three parents ago, only following the first parent ancestry".
> Anything else will invite user confusion.
>
> But I do not think it is necessarily useful to follow only the first
> parent ancestry to find "three-changes ago" (if such a concept exists).
> If you want a notation that means something else, such as X (because
> chronologically the commits that touched the file are M, C and X in the
> ideal world that everybody has well synchronized clock), you shouldn't use
> tilde-number notation but use something else.
>
Understood and thanks for the help,
--
David
^ permalink raw reply
* Re: [PATCH] Documentation: push.default applies to all remotes
From: Junio C Hamano @ 2009-03-23 23:32 UTC (permalink / raw)
To: Finn Arne Gangstad; +Cc: git, Santi Béjar
In-Reply-To: <1237850318-3671-1-git-send-email-santi@agolina.net>
Santi Béjar <santi@agolina.net> writes:
> push.default is not only for the current remote but setting the default
> behavior for all remotes.
>
> Signed-off-by: Santi Béjar <santi@agolina.net>
> ---
> Hi,
>
> this applies on top of next.
>
> Documentation/config.txt | 11 +++--------
> 1 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 089569a..7f5fe43 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1215,19 +1215,14 @@ push.default::
> Defines the action git push should take if no refspec is given
> on the command line, no refspec is configured in the remote, and
> no refspec is implied by any of the options given on the command
> - line.
> -+
> -The term `current remote` means the remote configured for the current
> -branch, or `origin` if no remote is configured. `origin` is also used
> -if you are not on any branch. Possible values are:
> + line. Possible values are:
> +
> * `nothing` do not push anything.
> -* `matching` push all matching branches to the current remote.
> +* `matching` push all matching branches.
> All branches having the same name in both ends are considered to be
> matching. This is the current default value.
> * `tracking` push the current branch to the branch it is tracking.
> -* `current` push the current branch to a branch of the same name on the
> - current remote.
> +* `current` push the current branch to a branch of the same name.
>
> rebase.stat::
> Whether to show a diffstat of what changed upstream since the last
This makes sense; I can understand why "same name" wanted to be qualified
with "on the current remote", but the sentence reads just fine without it.
It is clear that the "same name" compares the set of branches the local
repository has with the set of branches in the other repository we are
pushing into.
If we want to explain that a "git push" that does not say where-to decides
where to push by looking at branch.<name>.remote configuration and falling
back to origin, push.default is not the place to explain it. This
configuration variable is not involved in that decision in any way.
The description for branch.<name>.remote can be updated to say it is used
for both fetch and push.
^ permalink raw reply
* Re: [PATCH] gitk: make use of themed widgets where available
From: Pat Thoyts @ 2009-03-23 23:28 UTC (permalink / raw)
To: Paul Mackerras; +Cc: git
In-Reply-To: <18887.8064.114036.850741@drongo.ozlabs.ibm.com>
Paul Mackerras wrote:
> Pat Thoyts writes:
>
>> This patch improves the appearence of gitk on Windows XP and Vista
>> by making use of the themed widgets that are provided in Tk 8.5
>> and above. For good Vista support 8.6 will be needed.
>>
>> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
>
> Thanks for the patch. It does seem to do a bit more than the commit
> description says, though:
>
> - It adds a toggle-fullscreen function. I'd prefer that was done in a
> separate patch.
Sure. This seems to be a recurring issue that I need to take care of.
> - It makes various changes to the layout in the non-ttk case - in
> particular various message widgets get turned into label widgets.
> Are label widgets entirely equivalent to message widgets?
It depends on how the message widget is being used - but for simple cases
they are equivalent. The message widget has some more options for placing
the text within but is no themed equivalent for message.
> Also, the patch has been corrupted by your mailer: on lines containing
> only a "+", the "+" has been deleted.
Damn - I'm surprised Gnus mashed anything in a patch file.
> I have a few questions about specific things you've done in the patch:
>
>> +proc ttk_toplevel {w args} {
>> + variable use_ttk
>> + eval [linsert $args 0 ::toplevel $w]
>> + if {$use_ttk} {
>> + place [ttk::frame $w._toplevel_background] -x 0 -y 0 -relwidth 1 -relheight 1
>
> What is the effect of this line, or what would happen if it wasn't
> there?
A 'toplevel' widget is not themed so it picks up the default Tk options
for the current platform. Where the theme background colour for a frame
is significantly different to the Tk background colour this becomes
obvious. For instance:
package require Tk 8.5
ttk::style theme use clam
pack [ttk::frame .f -height 100 -width 100] -padx 10 -pady 10
will show a different 10 pixel border around the frame in the Tk default
colour. On some themes the difference is not too noticable, on others
its significant.
>> proc show_error {w top msg} {
>> + variable use_ttk
>> + set ttk [expr {$use_ttk ? "ttk" : ""}]
>
> Is there a strong reason for using variable here rather than global,
> or is it just habit?
habit.
> It looks to me as though $ttk might as well be a global variable,
> rather than computing it from $use_ttk everywhere that we need it.
Agreed
>> @@ -1945,8 +1975,10 @@ proc makewindow {} {
>> }
>> . configure -menu .bar
>>
>> + place [${ttk}::frame ._main_background] -x 0 -y 0 -relwidth 1 -relheight 1
>
> Once again, what's the reason for using place and the extra frame?
As above. The other alternative would be to pack or grid a ttk::frame
and then make all the other widgets children of this and pack/grid them
inside. This is a simpler option.
>
>> + if {$use_ttk} {
>> + #set p1 [expr {[winfo screenwidth .] - (40 * $charspc)}]
>> + #set p0 [expr {[winfo screenwidth .] - (100 * $charspc)}]
>> + #.tf.histframe.pwclist sashpos 0 585
>> + #.tf.histframe.pwclist sashpos 1 868
>> + } else {
>> + eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
>> + eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
>> + }
>
> Looks like that could be cleaned up a bit.
Doh. I have this fixed properly locally (I'll comment at the end).
>> - set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
>> - [mc "containing:"] \
>> - [mc "touching paths:"] \
>> - [mc "adding/removing string:"]]
>> + if {$use_ttk} {
>> + set values [list [mc "containing:"] [mc "touching paths:"] \
>> + [mc "adding/removing string:"]]
>> + set gm [ttk::combobox .tf.lbar.gdttype -width 10\
>> + -values $values -textvariable gdtype]
>> + } else {
>> + set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
>> + [mc "containing:"] \
>> + [mc "touching paths:"] \
>> + [mc "adding/removing string:"]]
>> + }
>
> We could profitably use a helper function here that would take the
> list of alternatives and make the combobox/optionMenu.
>
>> - $top.tohead conf -state readonly
>> + $top.tohead configure -state readonly
>
> Do all the other instances of conf need to be changed to configure,
> and if so, why?
Using abbreviated subcommand or option names should really be restricted
to interactive code. In script files its better to write it out in full
as you never know in some future version Tk might get more subcommands
added and the abbreviation may no longer be unique.
However, such changes should be put in a separate style patch.
>
>> - checkbutton $top.showlocal -text [mc "Show local changes"] \
>> - -font optionfont -variable showlocalchanges
>> + ${ttk}::checkbutton $top.showlocal -text [mc "Show local changes"] \
>> + -variable showlocalchanges
>
> Why do we lose the -font optionfont?
The point to the ttk widgets is that the visual style of the widget
becomes dictated by the theme and it should no longer be necessary to
specify lots of options on each widget to get it looking reasonable.
When running on Windows, the graphical elements should be drawn using
the system configured fonts and in Tk 8.5+ this is read from the system
parameters info. So if a user configures her system to use large fonts
via the system display properties control panel, then large fonts is
what she will now get.
In fact the ttk::checkbutton doesn't accept a -font option to discourage
people from overriding the users chosen system settings. If you really
need to set the font for a checkbutton then you create a new style and
set the font for that style. Or cheat and use a tk::checkbutton which
provides all the same options it has always done.
For instance:
ttk::style configure Fat.Checkbutton -font {Arial 12 bold}
pack [ttk::checkbutton .check -text Emboldened -style Fat.Checkbutton]
I will redo the ttk patch on top of the new commits and take better care
to isolate them into descrete chunks of work. I have noticed since
posting the patch that it broke the preferences dialog on Linux and the
positions of the panedwindow splitters stopped being saved so these need
rolling into a new patch as well.
Pat Thoyts
^ permalink raw reply
* Re: [PATCH] difftool: add support for an extended revision syntax
From: Junio C Hamano @ 2009-03-23 23:22 UTC (permalink / raw)
To: David Aguilar; +Cc: Michael J Gruber, git
In-Reply-To: <20090323163343.GB16258@gmail.com>
David Aguilar <davvid@gmail.com> writes:
> Keep in mind that the syntax that this patch added does not have file~3
> = HEAD~3. file~3 means finding file as it existed 3 changes-to-file
> ago, which is != to HEAD~3 if file did not change in the last 3 commits.
If your motive is to introduce inconsistency to the UI by adding this kind
of new notation _only to difftool_, I have to reconsider moving it out of
contrib/ area.
While I do not fundamentally oppose to add convenient notations for useful
concepts, you need to start at making sure if this "three changes ago" is
a well defined concept to begin with.
And it is not a well defined concept in a merge-heavy environment, unless
you define what you mean by "three changes ago".
If you consider this history:
---Y---o---X---M---o mainline = HEAD
/
---A---B---C topic
where A, B, C and X, Y are the only commits that touched the file you are
interested in, how do you define 3-changes-ago?
Maybe X was just a totally uninteresting typofix to a comment, while A, B
and C were adding a very interesting new feature. Don't forget that M
also changes the file from either of its parents (X or C). Does M count
as the last change? Or does it not count because it is just a mechanical
unconflicting merge? Which one of X or C is the penultimate change? The
one with an earlier committer timestamp? Tiebreaking with timestamps is
known to be flawed in the presense of clock skew.
For the consistency of the UI, "starting at HEAD, following first-parent
ancestry, find N-th commit that touches the path, ignoring all the side
branches" MUST be the semantics of a notation that uses tilde followed by
number (so file~3 must mean Y in the above picture), because HEAD~3 is
defined as "three parents ago, only following the first parent ancestry".
Anything else will invite user confusion.
But I do not think it is necessarily useful to follow only the first
parent ancestry to find "three-changes ago" (if such a concept exists).
If you want a notation that means something else, such as X (because
chronologically the commits that touched the file are M, C and X in the
ideal world that everybody has well synchronized clock), you shouldn't use
tilde-number notation but use something else.
^ permalink raw reply
* [PATCH] Documentation: push.default applies to all remotes
From: Santi Béjar @ 2009-03-23 23:18 UTC (permalink / raw)
To: git
push.default is not only for the current remote but setting the default
behavior for all remotes.
Signed-off-by: Santi Béjar <santi@agolina.net>
---
Hi,
this applies on top of next.
Documentation/config.txt | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 089569a..7f5fe43 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1215,19 +1215,14 @@ push.default::
Defines the action git push should take if no refspec is given
on the command line, no refspec is configured in the remote, and
no refspec is implied by any of the options given on the command
- line.
-+
-The term `current remote` means the remote configured for the current
-branch, or `origin` if no remote is configured. `origin` is also used
-if you are not on any branch. Possible values are:
+ line. Possible values are:
+
* `nothing` do not push anything.
-* `matching` push all matching branches to the current remote.
+* `matching` push all matching branches.
All branches having the same name in both ends are considered to be
matching. This is the current default value.
* `tracking` push the current branch to the branch it is tracking.
-* `current` push the current branch to a branch of the same name on the
- current remote.
+* `current` push the current branch to a branch of the same name.
rebase.stat::
Whether to show a diffstat of what changed upstream since the last
--
1.6.1.258.g7ff14
^ permalink raw reply related
* Re: [RFC/WIP 0/2] Documentation clean-up: git commands
From: Chris Johnsen @ 2009-03-23 23:13 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Michael J Gruber, git
In-Reply-To: <7vwsag5hva.fsf@gitster.siamese.dyndns.org>
On 2009 Mar 23, at 11:22, Junio C Hamano wrote:
> Michael J Gruber <git@drmicha.warpmail.net> writes:
>
>> - Do we want it this way (`git command`)?
>
> That's my personal preference but other people may differ; wasn't
> there an
> issue with "man" backend losing the typesetting information?
An issue that came up recently was that the backticks seem to have no
typeset representation in the official kernel.org manpages.
In my recent fumbling with the documentation generation, I have often
been using git-init.txt as a "test bed". It shows clearly enough that
backticks, by themselves, are not represented in the official manpages:
$ git grep core/templates Documentation/git-init.txt
Documentation/git-init.txt:directory is `/usr/share/git-core/
templates`.
There we see the path in backticks with a period outside the
backticks. If any inline typesetting were to come between "core/
templates" and ".", I think this command would turn it up:
$ git log -p -Score/templates. origin/man -- man1/git-init.1
It gets two hits. The first where the sentence is introduced, and a
second where the period is escaped:
43e513c (Autogenerated man pages for v1.5.0-rc1, 2007-01-12)
2cbdf46 (Autogenerated manpages for v1.5.6.2-212-g08b5, 2008-07-06)
The last one leaves us with "core/templates\.". So search again to
see if that has changed since the last one:
git log -p -Score/templates\\. origin/man -- man1/git-init.1
Nope, that only shows the one hit (2cbdf46). In case I made an error
using the `git log` to do the searching, I also checked by hand by
loading the diffs from <http://git.kernel.org/?p=git/
git.git;a=history;f=man1/git-init.1;hb=man> (they agree, no
formatting around that path in any of the generated git-init.1).
When I generate the manpage on my machine (asciidoc 8.3.1; docbook-
xsl 1.74.0), I do get some formatting for backticks:
$ grep core/templates Documentation/git-init.1
Provide the directory from which templates will be used\&. The
default template directory is \FC/usr/share/git\-core/templates\F[]\&.
From what I can tell the \FC is supposed to introduce monospace type
and \F[] is to reset to the previous type. When I run it through
groff -man -Tps, it does come out in a monospaced font. The change
in font is not obvious when viewing the manpage in a tty-based
manpage viewer (which was my original "gripe"), but there is some
typesetting info there for pages I generate.
I suspect the main difference between my generated pages and the
official pages (at least for typesetting of literal text) is the
docbook-xsl version (though I have not dug into previous versions of
dcobook-xsl to bolster this hypothesis).
I have a series of patches prepared to "cleanup" and modify
{callout,manpage-1.72}.xsl and asciidoc.conf, but I am still running
a series of "make doc" runs across the changes to try to make sure
they are sane. Here is a preview:
Documentation: move callouts.xsl to manpage-{base,normal}.xsl
Documentation: use parametrized manpage-base.xsl with manpage-
{1.72,normal}.xsl
Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff
Documentation: move quieting params into manpage-base.xsl
Documentation: move "spurious .sp" code into manpage-base.xsl
Documentation: asciidoc.conf: always use <literallayout> for [blocktext]
Documentation: asciidoc.conf: fix verse block with block titles
Documentation: option to render literal text as italic for manpages
The first three restructure things a bit. The next three make some
cleanups that could be dropped if they are deemed inappropriate. The
last one add an option that changes the manpage formatting used
around asciidoc backticked strings (literal text).
I plan on sending the patches along after my trial doc-generations
finish and I have reviewed the results (my machine is slow, it may
not be until tomorrow).
--
Chris
^ permalink raw reply
* Re: Git for Windows 1.6.2.1-preview20090322
From: Rostislav Svoboda @ 2009-03-23 23:07 UTC (permalink / raw)
To: git, msysgit
In-Reply-To: <4285cd450903231503x5d332bfft17b01e598d11bc09@mail.gmail.com>
Hi
I use the new msysgit 1.6.2.1-preview20090322 exactly one day but it
seems to be significantly slower than the previous version...
Am I the only one who observes it?
Bost
^ permalink raw reply
* Re: git svn teething problems - initial clone okay - fetches not working
From: Aaron Gray @ 2009-03-23 22:49 UTC (permalink / raw)
To: Tim Visher; +Cc: pascal, Git Mailing List
In-Reply-To: <c115fd3c0903231458t7ac8ac69if6b7bdb3a7d8861b@mail.gmail.com>
On Mon, Mar 23, 2009 at 5:31 PM, Aaron Gray
<aaronngray.lists@googlemail.com> wrote:
>> Aaron Gray a écrit :
>>>
>>> Anyway I am having the problem that I can do a 'git svn fetch' and I see
>>> changes coming in. But the gitweb and another git clone from it do not
>>> reflect those changes. The repository is still showing its two days old.
>>
>> You need a:
>>
>> $ git svn rebase
>
> I tried that.
>
>> to fetch *and* merge the changes into the local tracking branch (master
>> by default).
>
> Pascal,
>
> Could you give me a full set of instructions for importing :-
>
> http://llvm.org/svn/llvm-project/llvm
>
It sounds like your working directory might be dirty. Are you sure
all of your changes have been committed?
Probably. I am getting an error on doing 'git svn rebase' :-
many filenames * : needs update
update---index --refresh: command returned error: 1
Could you please give me the command to import the above SVN repository so I
can redo the thing from scratch.
Many thanks in advance,
Aaron
^ permalink raw reply
* Re: Git for Windows 1.6.2.1-preview20090322
From: Ludvig Strigeus @ 2009-03-23 22:03 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, msysgit
In-Reply-To: <alpine.DEB.1.00.0903222149330.10279@pacific.mpi-cbg.de>
On Sun, Mar 22, 2009 at 10:17 PM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> - There are a few issues with ssh hanging (Issue 197), permission denied
> on renaming pack files (mentioned in Issue 194), and spurious write
> errors during rebase (Issue 200) that seem not to be reproducible on
> most computers.
I had this problem with write errors during rebase. I tracked it down
to having the files open in Visual Studio while doing the rebase. As
soon as a file is changed, Visual Studio seems to open the file (as
part of its feature to detect if files changed on disk), which
confliced with git for some reason. As soon as I closed MSVS, rebase
worked well.
/Ludde
^ permalink raw reply
* Re: git svn teething problems - initial clone okay - fetches not working
From: Tim Visher @ 2009-03-23 21:58 UTC (permalink / raw)
To: Aaron Gray; +Cc: pascal, Git Mailing List
In-Reply-To: <0381B9A616514FC2A05BACAB07EE3117@HPLAPTOP>
On Mon, Mar 23, 2009 at 5:31 PM, Aaron Gray
<aaronngray.lists@googlemail.com> wrote:
>> Aaron Gray a écrit :
>>>
>>> Anyway I am having the problem that I can do a 'git svn fetch' and I see
>>> changes coming in. But the gitweb and another git clone from it do not
>>> reflect those changes. The repository is still showing its two days old.
>>
>> You need a:
>>
>> $ git svn rebase
>
> I tried that.
>
>> to fetch *and* merge the changes into the local tracking branch (master
>> by default).
>
> Pascal,
>
> Could you give me a full set of instructions for importing :-
>
> http://llvm.org/svn/llvm-project/llvm
>
It sounds like your working directory might be dirty. Are you sure
all of your changes have been committed?
--
In Christ,
Timmy V.
http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail
^ permalink raw reply
* checkout/update boiler plate for --filter-index?
From: Marcel Cary @ 2009-03-23 21:33 UTC (permalink / raw)
To: Git Mailing List
I'm trying to do a historical find-and-replace on my code:
git grep -F foo > files
git filter-branch --index-filter "
cat `pwd`/files | xargs git checkout --
cat `pwd`/files | xargs sed -i 's/foo/bar/g; '
cat `pwd`/files | xargs git update-index --
" ancestor..HEAD
When I instead use --tree-filter and skip the checkout/update-index,
it works how I want (but it takes a while...). But when I use --index-
filter, the resulting history shows the "foo" to "bar" change
happening *after* new code is added, rather than originally adding
"bar".
How can I checkout just a few files and update them to take advantage
of the speed of index operations?
Marcel
^ permalink raw reply
* Re: git svn teething problems - initial clone okay - fetches not working
From: Aaron Gray @ 2009-03-23 21:31 UTC (permalink / raw)
To: pascal; +Cc: Git Mailing List
In-Reply-To: <49C7F92A.5050809@obry.net>
> Aaron Gray a écrit :
>> Anyway I am having the problem that I can do a 'git svn fetch' and I see
>> changes coming in. But the gitweb and another git clone from it do not
>> reflect those changes. The repository is still showing its two days old.
>
> You need a:
>
> $ git svn rebase
I tried that.
> to fetch *and* merge the changes into the local tracking branch (master
> by default).
Pascal,
Could you give me a full set of instructions for importing :-
http://llvm.org/svn/llvm-project/llvm
Thanks,
Aaron
^ permalink raw reply
* large(25G) repository in git
From: Adam Heath @ 2009-03-23 21:10 UTC (permalink / raw)
To: git
We maintain a website in git. This website has a bunch of backend
server code, and a bunch of data files. Alot of these files are full
videos.
We use git, so that the distributed nature of website development can
be supported. Quite often, you'll have a production server, with
online changes occurring(we support in-browser editting of content), a
preview server, where large-scale code changes can be previewed, then
a development server, one per programmer(or more).
Last friday, I was doing a checkin on the production server, and found
1.6G of new files. git was quite able at committing that. However,
pushing was problematic. I was pushing over ssh; so, a new ssh
connection was open to the preview server. After doing so, git tried
to create a new pack file. This took *ages*, and the ssh connection
died. So did git, when it finally got done with the new pack, and
discovered the ssh connection was gone.
So, to work around that, I ran git gc. When done, I discovered that
git repacked the *entire* repository. While not something I care for,
I can understand that, and live with it. It just took *hours* to do so.
Then, what really annoys me, is that when I finally did the push, it
tried sending the single 27G pack file, when the remote already had
25G of the repository in several different packs(the site was an
hg->git conversion). This part is just unacceptable.
So, here are my questions/observations:
1: Handle the case of the ssh connection dying during git push(seems
simple).
2: Is there an option to tell git to *not* be so thorough when trying
to find similiar files. videos/doc/pdf/etc aren't always very
deltafiable, so I'd be happy to just do full content compares.
3: delta packs seem to be poorly done. it seems that if one repo gets
repacked completely, that the entire new pack gets sent, when the
target has most of the objects already.
4: Are there any config options I can set to help in this? There are
tons of options, and some documentation as to what each one does, but
no recommended practices type doc, that describes what should be done
for different kinds of workflows.
ps: Thank you for your time. I hope that someone has answers for me.
pps: I'm not subscribed, please cc me. If I need to be subscribed,
I'll do so, if told.
^ permalink raw reply
* Re: git svn teething problems - initial clone okay - fetches not working
From: Pascal Obry @ 2009-03-23 21:03 UTC (permalink / raw)
To: Aaron Gray; +Cc: Git Mailing List
In-Reply-To: <2BACA6CC2F9647C19C0463120219E694@HPLAPTOP>
Aaron Gray a écrit :
> Anyway I am having the problem that I can do a 'git svn fetch' and I see
> changes coming in. But the gitweb and another git clone from it do not
> reflect those changes. The repository is still showing its two days old.
You need a:
$ git svn rebase
to fetch *and* merge the changes into the local tracking branch (master
by default).
Pascal.
--
--|------------------------------------------------------
--| Pascal Obry Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--| http://www.obry.net - http://v2p.fr.eu.org
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B
^ permalink raw reply
* Re: Importing Bzr revisions
From: David Reitter @ 2009-03-23 21:00 UTC (permalink / raw)
To: Pieter de Bie; +Cc: Junio C Hamano, git
In-Reply-To: <CF094EC6-72B6-4523-92ED-6582ADC4C1EE@frim.nl>
[-- Attachment #1: Type: text/plain, Size: 1024 bytes --]
On Mar 23, 2009, at 4:15 PM, Pieter de Bie wrote:
>> Could you update the documentation as to how to install the git-bzr
>> script?
>> (I searched for "plugin" in the git user manual, and google, and
>> didn't find anything. I haven't used git much, so I'm a bit naive
>> as regards to such a question.)
>
> There's nothing to install, just call the script.. if you run it
> without commands it should give some usage information. The README
> in the repository should tell the rest. If you'd like to call it
> using 'git bzr' rather than 'git-bzr', you have to put it somewhere
> in your PATH
Sure, okay, thanks. (In my bzr mindset I didn't realize that "git
bzr" just elegantly translated to "git-bzr".)
I'm currently attempting to convert those 100k revisions from the
emacs repository, averaging 5.5min/1000 revisions. Judging from CPU
load (if that's a valid thing to do), I see a 9:1 distribution of the
workload (bzr, reading, vs. git, writing).
Thanks for helping me out with this so far.
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 2193 bytes --]
^ permalink raw reply
* Re: [PATCH] Add warning about known issues to documentation of cvsimport
From: Ferry Huberts (Pelagic) @ 2009-03-23 20:33 UTC (permalink / raw)
To: Heiko Voigt; +Cc: Junio C Hamano, git
In-Reply-To: <20090323195304.GC26678@macbook.lan>
Heiko Voigt wrote:
> The described issues are compiled from the tests by Michael Haggerty and me.
> Because it is not apparent that these can be fixed anytime soon at least warn
> unwary users not to rely on the inbuilt cvsimport to much.
>
> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
> ---
> Documentation/git-cvsimport.txt | 34 ++++++++++++++++++++++++++++++++++
> 1 files changed, 34 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
> index b7a8c10..3123725 100644
> --- a/Documentation/git-cvsimport.txt
> +++ b/Documentation/git-cvsimport.txt
> @@ -24,6 +24,9 @@ repository, or incrementally import into an existing one.
> Splitting the CVS log into patch sets is done by 'cvsps'.
> At least version 2.1 is required.
>
> +*WARNING:* for certain situations the import leads to incorrect results.
> +Please see the section <<issues,ISSUES>> for further reference.
> +
> You should *never* do any work of your own on the branches that are
> created by 'git-cvsimport'. By default initial import will create and populate a
> "master" branch from the CVS repository's main branch which you're free
> @@ -164,6 +167,37 @@ If '-v' is specified, the script reports what it is doing.
> Otherwise, success is indicated the Unix way, i.e. by simply exiting with
> a zero exit status.
>
> +[[issues]]
> +ISSUES
> +------
> +Problems related to timestamps:
> +
> + * If timestamps of commits in the cvs repository are not stable enough
> + to be used for ordering commits
> + * If any files were ever "cvs import"ed more than once (e.g., import of
> + more than one vendor release)
> + * If the timestamp order of different files cross the revision order
> + within the commit matching time window
> +
> +Problems related to branches:
> +
> + * Branches on which no commits have been made are not imported
> + * All files from the branching point are added to a branch even if
> + never added in cvs
> + * files added to the source branch *after* a daughter branch was
> + created: If previously no commit was made on the daugther branch they
> + will erroneously be added to the daughter branch in git
> +
> +Problems related to tags:
> +
> +* Multiple tags on the same revision are not imported
> +
> +If you suspect that any of these issues may apply to the repository you
> +want to import consider using these alternative tools which proved to be
> +more stable in practise:
> +
> +* cvs2git (part of cvs2svn), `http://cvs2svn.tigris.org`
> +* parsecvs, `http://cgit.freedesktop.org/~keithp/parsecvs`
>
> Author
> ------
maybe you can also add remarks about autocrlf and safecrlf?
both need to be off
^ permalink raw reply
* Re: Importing Bzr revisions
From: Pieter de Bie @ 2009-03-23 20:15 UTC (permalink / raw)
To: David Reitter; +Cc: Junio C Hamano, git
In-Reply-To: <D05262B5-9B18-49C9-8312-E69926F967AF@gmail.com>
On 23 mrt 2009, at 15:18, David Reitter wrote:
> Could you update the documentation as to how to install the git-bzr
> script?
> (I searched for "plugin" in the git user manual, and google, and
> didn't find anything. I haven't used git much, so I'm a bit naive
> as regards to such a question.)
There's nothing to install, just call the script.. if you run it
without commands it should give some usage information. The README in
the repository should tell the rest. If you'd like to call it using
'git bzr' rather than 'git-bzr', you have to put it somewhere in your
PATH
^ permalink raw reply
* Re: git svn teething problems - initial clone okay - fetches not working
From: Aaron Gray @ 2009-03-23 20:02 UTC (permalink / raw)
To: Tim Visher; +Cc: Git Mailing List
In-Reply-To: <c115fd3c0903231243n1cddf1f1ra88b00ca8db83044@mail.gmail.com>
>I had a lot of success when I was more actively using `git svn` with
>`git svn rebase`. Just be sure that you're doing your work in local
>branches and then merging back into the main trunk branches that are
>tracking the svn repo, that way you can always get the latest changes
>from your clean trunk branch.
I tried a rebase and filenames with 'needs update' after them flew by then
an error message :-
update-index --refresh: command returned error: 1
Aaron
On Mon, Mar 23, 2009 at 3:30 PM, Aaron Gray
<aaronngray.lists@googlemail.com> wrote:
> Hi,
>
> I am a newbie to git, so be warned :)
>
> I have installed git-daemon, and gitweb on an F10 server.
>
> Basically managed to do a 'git svn clone' on LLVM, it took 11 hours !
>
> Anyway I am having the problem that I can do a 'git svn fetch' and I see
> changes coming in. But the gitweb and another git clone from it do not
> reflect those changes. The repository is still showing its two days old.
>
> I am obviously missing something. The only documentation I could find on
> 'git svn' was the command line help and 'man git-svn'.
>
> Hope you can help,
>
> Aaron
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
In Christ,
Timmy V.
http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox