Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 13 9月, 2015 2 次提交
  3. 13 8月, 2015 2 次提交
  5. 17 5月, 2015 7 次提交
  7. 03 5月, 2015 1 次提交
    • P
      gitk: Fix error when changing colors after closing "List references" window · eb859df8
      由 Paul Mackerras 提交于 
      This fixes an error that manifests itself if the user opens the
"List references" window and the closes it, and subsequently opens
the Preferences window and changes one of the colors.  When the
user clicks OK, and error popup appears with the message:

Error: invalid command name ".showrefs.list"

This is because .showrefs.list was added to the list of windows to
be notified on foreground/background color changes, but the window
no longer exists.  We fix the bug by checking whether the window
exists before trying to change its colors.  As an optimization, we
also avoid adding the .showrefs.list window to the list a second
time.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      eb859df8
  9. 02 5月, 2015 1 次提交
  11. 06 4月, 2015 3 次提交
  13. 15 3月, 2015 8 次提交
    • P
      gitk: Update .po files · c846920f
      由 Paul Mackerras 提交于 
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      c846920f
    • A
      gitk: l10n: Add Catalan translation · f7fa39b0
      由 Alex Henrie 提交于 
      Signed-off-by: NAlex Henrie <alexhenrie24@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      f7fa39b0
    • 0
      gitk: Fix typo in Russian translation · 66e3f017
      由 0xAX 提交于 
      Signed-off-by: N0xAX <kuleshovmail@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      66e3f017
    • A
      gitk: Remove tcl-format flag from a message that shouldn't have it · 8a1692f6
      由 Alex Henrie 提交于 
      xgettext sees "% o" and interprets it as a placeholder for an octal
number preceded by a space. However, in this case it's not actually a
placeholder, and most translations will replace the "% o" sequence with
something else. Removing the tcl-format flag from this string prevents
tools like Poedit from freaking out when "% o" doesn't appear in the
translated string.

The corrected flag will appear in each translation's po file the next time
the translation is updated with `make update-po`.
Signed-off-by: NAlex Henrie <alexhenrie24@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      8a1692f6
    • C
      gitk: Pass --invert-grep option down to "git log" · ce232c3a
      由 Christoph Junghans 提交于 
      "git log --grep=<string>" shows only commits with messages that
match the given string, but sometimes it is useful to be able to
show only commits that do *not* have certain messages (e.g. "show
me ones that are not FIXUP commits").

Now the underlying "git log" learned the "--invert-grep" option.
The option syntactically behaves similar to "--all-match" that
requires that all of the grep strings to match and semantically
behaves the opposite---it requires that none of the grep strings to
match.

Teach "gitk" to allow users to pass it down to underlying "git log"
command by adding it to the known_view_options array.
Signed-off-by: NChristoph Junghans <ottxor@gentoo.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      ce232c3a
    • M
      gitk: Synchronize config file writes · eaf7e835
      由 Max Kirillov 提交于 
      If several gitk instances are closed simultaneously, the savestuff
procedure can run at the same time, resulting in a conflict which may
cause losing of some of the instance's changes, failing the saving
operation or even corrupting the configuration file. This can happen,
for example, at user session closing, or at group closing of all
instances of an application which is possible in some desktop
environments.

To avoid this, make sure that only one saving operation is in
progress.  It is guarded by existence of the $config_file_tmp
file. Creating the file and moving it to $config_file are both atomic
operations, so it should be reliable.

Reading does not need to be syncronized, because moving is an atomic
operation, and the $config_file always refers to a full and correct file.
But, if there is a stale $config_file_tmp file, report it at gitk start.
If such file is detected when saving, just report it abort the save, as
for other errors in saving.
Signed-off-by: NMax Kirillov <max@max630.net>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      eaf7e835
    • M
      gitk: Report errors in saving config file · 1dd29606
      由 Max Kirillov 提交于 
      Signed-off-by: NMax Kirillov <max@max630.net>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      1dd29606
    • M
      gitk: Only write changed configuration variables · 995f792b
      由 Max Kirillov 提交于 
      When gitk contains some changed parameter, and there is an existing
instance of gitk where the parameter is still old, it is reverted to
that old value when that instance exits.

Instead, store a parameter in config only if it has been modified in
the exiting instance. Otherwise, preserve the value which currently is in
file.  This allows editing the configuration when several instances are
running, without rollback of the modification if some other
instance where the configuration was not edited is closed last.

For scalar variables, use trace(3tcl) to detect their change. Since
`trace` can send bogus events, doublecheck if the value has really
been changed, but once it is marked as changed, do not reset it back
to unchanged ever, because if user has restored the original value,
it's the decision which should be stored as well as modified value.

Treat view list especially: instead of rewriting the whole list, merge
individual views. Place old and updated views in their old places,
add new ones to the end of list. Collect modified views explicitly, in
newviewok{} and delview{}.

Do not merge geometry values. They are almost always changing because
user moves and resises windows, and there is no way to find which one of
the geometries is most desired. Just overwrite them unconditionally,
like earlier.
Signed-off-by: NMax Kirillov <max@max630.net>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      995f792b
  15. 02 3月, 2015 2 次提交
  17. 30 10月, 2014 3 次提交
  19. 08 8月, 2014 2 次提交
  21. 27 6月, 2014 2 次提交
  23. 15 6月, 2014 6 次提交
  25. 21 2月, 2014 1 次提交