From b231d0deabf8c5e5def785e65d4d62d9355fbcd4 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 21 Sep 2021 03:46:51 +0800 Subject: [PATCH 1/2] Ignore Sync errors on pipes when doing `CheckAttributeReader.CheckPath`, fix the hang of `git cat-file` (#17096) * Ignore Sync errors on pipes when doing `CheckAttributeReader.CheckPath` * apply env patch * Drop the Sync and fix a number of issues with the Close function Signed-off-by: Andrew Thornton * add logs for DBIndexer and CheckPath * Fix some more closing bugs Signed-off-by: Andrew Thornton * Add test case for language_stats Signed-off-by: Andrew Thornton * Update modules/indexer/stats/db.go Co-authored-by: Lauris BH Co-authored-by: Andrew Thornton Co-authored-by: Lauris BH Co-authored-by: 6543 <6543@obermui.de> --- modules/git/repo_attribute.go | 74 +++++--- modules/git/repo_language_stats_gogit.go | 44 +++-- modules/git/repo_language_stats_nogogit.go | 47 +++-- modules/git/repo_language_stats_test.go | 34 ++++ .../repos/language_stats_repo/COMMIT_EDITMSG | 3 + .../git/tests/repos/language_stats_repo/HEAD | 1 + .../tests/repos/language_stats_repo/config | 5 + .../repos/language_stats_repo/description | 1 + .../hooks/applypatch-msg.sample | 15 ++ .../hooks/commit-msg.sample | 24 +++ .../hooks/fsmonitor-watchman.sample | 173 ++++++++++++++++++ .../hooks/post-update.sample | 8 + .../hooks/pre-applypatch.sample | 14 ++ .../hooks/pre-commit.sample | 49 +++++ .../hooks/pre-merge-commit.sample | 13 ++ .../language_stats_repo/hooks/pre-push.sample | 53 ++++++ .../hooks/pre-rebase.sample | 169 +++++++++++++++++ .../hooks/pre-receive.sample | 24 +++ .../hooks/prepare-commit-msg.sample | 42 +++++ .../hooks/push-to-checkout.sample | 78 ++++++++ .../language_stats_repo/hooks/update.sample | 128 +++++++++++++ .../git/tests/repos/language_stats_repo/index | Bin 0 -> 553 bytes .../repos/language_stats_repo/info/exclude | 6 + .../tests/repos/language_stats_repo/logs/HEAD | 1 + .../logs/refs/heads/master | 1 + .../42/25ecfaf6bafbcfa31ea5cbd8121c36d9457085 | Bin 0 -> 116 bytes .../4a/c803638e4b8995146e329a05e096fa2c77a03d | Bin 0 -> 73 bytes .../64/4c37ad7fe64ac012df7e59d27a92e3137c640e | Bin 0 -> 53 bytes .../6c/633a0067b463e459ae952716b17ae36aa30adc | Bin 0 -> 371 bytes .../8e/b563dc106e3dfd3ad0fa81f7a0c5e2604f80cd | Bin 0 -> 201 bytes .../8f/ee858da5796dfb37704761701bb8e800ad9ef3 | Bin 0 -> 828 bytes .../aa/a21bf84c8b2304608d3fc83b747840f2456299 | Bin 0 -> 54 bytes .../da/a5abe3c5f42cae598e362e8a8db6284565d6bb | Bin 0 -> 64 bytes .../language_stats_repo/refs/heads/master | 1 + modules/indexer/stats/db.go | 17 +- 35 files changed, 960 insertions(+), 65 deletions(-) create mode 100644 modules/git/repo_language_stats_test.go create mode 100644 modules/git/tests/repos/language_stats_repo/COMMIT_EDITMSG create mode 100644 modules/git/tests/repos/language_stats_repo/HEAD create mode 100644 modules/git/tests/repos/language_stats_repo/config create mode 100644 modules/git/tests/repos/language_stats_repo/description create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/applypatch-msg.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/commit-msg.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/fsmonitor-watchman.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/post-update.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/pre-applypatch.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/pre-commit.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/pre-merge-commit.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/pre-push.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/pre-rebase.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/pre-receive.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/prepare-commit-msg.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/push-to-checkout.sample create mode 100755 modules/git/tests/repos/language_stats_repo/hooks/update.sample create mode 100644 modules/git/tests/repos/language_stats_repo/index create mode 100644 modules/git/tests/repos/language_stats_repo/info/exclude create mode 100644 modules/git/tests/repos/language_stats_repo/logs/HEAD create mode 100644 modules/git/tests/repos/language_stats_repo/logs/refs/heads/master create mode 100644 modules/git/tests/repos/language_stats_repo/objects/42/25ecfaf6bafbcfa31ea5cbd8121c36d9457085 create mode 100644 modules/git/tests/repos/language_stats_repo/objects/4a/c803638e4b8995146e329a05e096fa2c77a03d create mode 100644 modules/git/tests/repos/language_stats_repo/objects/64/4c37ad7fe64ac012df7e59d27a92e3137c640e create mode 100644 modules/git/tests/repos/language_stats_repo/objects/6c/633a0067b463e459ae952716b17ae36aa30adc create mode 100644 modules/git/tests/repos/language_stats_repo/objects/8e/b563dc106e3dfd3ad0fa81f7a0c5e2604f80cd create mode 100644 modules/git/tests/repos/language_stats_repo/objects/8f/ee858da5796dfb37704761701bb8e800ad9ef3 create mode 100644 modules/git/tests/repos/language_stats_repo/objects/aa/a21bf84c8b2304608d3fc83b747840f2456299 create mode 100644 modules/git/tests/repos/language_stats_repo/objects/da/a5abe3c5f42cae598e362e8a8db6284565d6bb create mode 100644 modules/git/tests/repos/language_stats_repo/refs/heads/master diff --git a/modules/git/repo_attribute.go b/modules/git/repo_attribute.go index 0bd7d7e49c947..aace64425388a 100644 --- a/modules/git/repo_attribute.go +++ b/modules/git/repo_attribute.go @@ -12,6 +12,8 @@ import ( "os" "strconv" "strings" + + "code.gitea.io/gitea/modules/log" ) // CheckAttributeOpts represents the possible options to CheckAttribute @@ -112,42 +114,48 @@ func (c *CheckAttributeReader) Init(ctx context.Context) error { if len(c.IndexFile) > 0 && CheckGitVersionAtLeast("1.7.8") == nil { cmdArgs = append(cmdArgs, "--cached") - c.env = []string{"GIT_INDEX_FILE=" + c.IndexFile} + c.env = append(c.env, "GIT_INDEX_FILE="+c.IndexFile) } if len(c.WorkTree) > 0 && CheckGitVersionAtLeast("1.7.8") == nil { - c.env = []string{"GIT_WORK_TREE=" + c.WorkTree} + c.env = append(c.env, "GIT_WORK_TREE="+c.WorkTree) } - if len(c.Attributes) > 0 { - cmdArgs = append(cmdArgs, c.Attributes...) - cmdArgs = append(cmdArgs, "--") - } else { + c.env = append(c.env, "GIT_FLUSH=1") + + if len(c.Attributes) == 0 { lw := new(nulSeparatedAttributeWriter) lw.attributes = make(chan attributeTriple) + lw.closed = make(chan struct{}) c.stdOut = lw c.stdOut.Close() return fmt.Errorf("no provided Attributes to check") } + cmdArgs = append(cmdArgs, c.Attributes...) + cmdArgs = append(cmdArgs, "--") + c.ctx, c.cancel = context.WithCancel(ctx) c.cmd = NewCommandContext(c.ctx, cmdArgs...) + var err error + c.stdinReader, c.stdinWriter, err = os.Pipe() if err != nil { + c.cancel() return err } if CheckGitVersionAtLeast("1.8.5") == nil { lw := new(nulSeparatedAttributeWriter) lw.attributes = make(chan attributeTriple, 5) - + lw.closed = make(chan struct{}) c.stdOut = lw } else { lw := new(lineSeparatedAttributeWriter) lw.attributes = make(chan attributeTriple, 5) - + lw.closed = make(chan struct{}) c.stdOut = lw } return nil @@ -155,13 +163,14 @@ func (c *CheckAttributeReader) Init(ctx context.Context) error { // Run run cmd func (c *CheckAttributeReader) Run() error { + defer func() { + _ = c.Close() + }() stdErr := new(bytes.Buffer) err := c.cmd.RunInDirTimeoutEnvFullPipelineFunc(c.env, -1, c.Repo.Path, c.stdOut, stdErr, c.stdinReader, func(_ context.Context, _ context.CancelFunc) error { close(c.running) return nil }) - defer c.cancel() - _ = c.stdOut.Close() if err != nil && c.ctx.Err() != nil && err.Error() != "signal: killed" { return fmt.Errorf("failed to run attr-check. Error: %w\nStderr: %s", err, stdErr.String()) } @@ -170,27 +179,31 @@ func (c *CheckAttributeReader) Run() error { } // CheckPath check attr for given path -func (c *CheckAttributeReader) CheckPath(path string) (map[string]string, error) { +func (c *CheckAttributeReader) CheckPath(path string) (rs map[string]string, err error) { + defer func() { + if err != nil { + log.Error("CheckPath returns error: %v", err) + } + }() + select { case <-c.ctx.Done(): return nil, c.ctx.Err() case <-c.running: } - if _, err := c.stdinWriter.Write([]byte(path + "\x00")); err != nil { - defer c.cancel() + if _, err = c.stdinWriter.Write([]byte(path + "\x00")); err != nil { + defer c.Close() return nil, err } - if err := c.stdinWriter.Sync(); err != nil { - defer c.cancel() - return nil, err - } - - rs := make(map[string]string) + rs = make(map[string]string) for range c.Attributes { select { - case attr := <-c.stdOut.ReadAttribute(): + case attr, ok := <-c.stdOut.ReadAttribute(): + if !ok { + return nil, c.ctx.Err() + } rs[attr.Attribute] = attr.Value case <-c.ctx.Done(): return nil, c.ctx.Err() @@ -201,13 +214,16 @@ func (c *CheckAttributeReader) CheckPath(path string) (map[string]string, error) // Close close pip after use func (c *CheckAttributeReader) Close() error { + err := c.stdinWriter.Close() + _ = c.stdinReader.Close() + _ = c.stdOut.Close() + c.cancel() select { case <-c.running: default: close(c.running) } - defer c.cancel() - return c.stdinWriter.Close() + return err } type attributeWriter interface { @@ -224,6 +240,7 @@ type attributeTriple struct { type nulSeparatedAttributeWriter struct { tmp []byte attributes chan attributeTriple + closed chan struct{} working attributeTriple pos int } @@ -267,13 +284,20 @@ func (wr *nulSeparatedAttributeWriter) ReadAttribute() <-chan attributeTriple { } func (wr *nulSeparatedAttributeWriter) Close() error { + select { + case <-wr.closed: + return nil + default: + } close(wr.attributes) + close(wr.closed) return nil } type lineSeparatedAttributeWriter struct { tmp []byte attributes chan attributeTriple + closed chan struct{} } func (wr *lineSeparatedAttributeWriter) Write(p []byte) (n int, err error) { @@ -356,6 +380,12 @@ func (wr *lineSeparatedAttributeWriter) ReadAttribute() <-chan attributeTriple { } func (wr *lineSeparatedAttributeWriter) Close() error { + select { + case <-wr.closed: + return nil + default: + } close(wr.attributes) + close(wr.closed) return nil } diff --git a/modules/git/repo_language_stats_gogit.go b/modules/git/repo_language_stats_gogit.go index 3abce1f0773de..1f2738a5a8716 100644 --- a/modules/git/repo_language_stats_gogit.go +++ b/modules/git/repo_language_stats_gogit.go @@ -15,6 +15,7 @@ import ( "code.gitea.io/gitea/modules/analyze" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" "github.com/go-enry/go-enry/v2" "github.com/go-git/go-git/v5" @@ -50,25 +51,32 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err indexFilename, deleteTemporaryFile, err := repo.ReadTreeToTemporaryIndex(commitID) if err == nil { defer deleteTemporaryFile() - - checker = &CheckAttributeReader{ - Attributes: []string{"linguist-vendored", "linguist-generated", "linguist-language"}, - Repo: repo, - IndexFile: indexFilename, - } - ctx, cancel := context.WithCancel(DefaultContext) - if err := checker.Init(ctx); err != nil { - log.Error("Unable to open checker for %s. Error: %v", commitID, err) - } else { - go func() { - err = checker.Run() - if err != nil { - log.Error("Unable to open checker for %s. Error: %v", commitID, err) - cancel() - } + tmpWorkTree, err := ioutil.TempDir("", "empty-work-dir") + if err == nil { + defer func() { + _ = util.RemoveAll(tmpWorkTree) }() + + checker = &CheckAttributeReader{ + Attributes: []string{"linguist-vendored", "linguist-generated", "linguist-language"}, + Repo: repo, + IndexFile: indexFilename, + WorkTree: tmpWorkTree, + } + ctx, cancel := context.WithCancel(DefaultContext) + if err := checker.Init(ctx); err != nil { + log.Error("Unable to open checker for %s. Error: %v", commitID, err) + } else { + go func() { + err = checker.Run() + if err != nil { + log.Error("Unable to open checker for %s. Error: %v", commitID, err) + cancel() + } + }() + } + defer cancel() } - defer cancel() } } @@ -99,7 +107,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err if language, has := attrs["linguist-language"]; has && language != "unspecified" && language != "" { // group languages, such as Pug -> HTML; SCSS -> CSS group := enry.GetLanguageGroup(language) - if len(group) == 0 { + if len(group) != 0 { language = group } diff --git a/modules/git/repo_language_stats_nogogit.go b/modules/git/repo_language_stats_nogogit.go index c3b96ea841e06..8e9a3d6bcd58f 100644 --- a/modules/git/repo_language_stats_nogogit.go +++ b/modules/git/repo_language_stats_nogogit.go @@ -12,10 +12,12 @@ import ( "bytes" "context" "io" + "io/ioutil" "math" "code.gitea.io/gitea/modules/analyze" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" "github.com/go-enry/go-enry/v2" ) @@ -69,25 +71,32 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err indexFilename, deleteTemporaryFile, err := repo.ReadTreeToTemporaryIndex(commitID) if err == nil { defer deleteTemporaryFile() - - checker = &CheckAttributeReader{ - Attributes: []string{"linguist-vendored", "linguist-generated", "linguist-language"}, - Repo: repo, - IndexFile: indexFilename, - } - ctx, cancel := context.WithCancel(DefaultContext) - if err := checker.Init(ctx); err != nil { - log.Error("Unable to open checker for %s. Error: %v", commitID, err) - } else { - go func() { - err = checker.Run() - if err != nil { - log.Error("Unable to open checker for %s. Error: %v", commitID, err) - cancel() - } + tmpWorkTree, err := ioutil.TempDir("", "empty-work-dir") + if err == nil { + defer func() { + _ = util.RemoveAll(tmpWorkTree) }() + + checker = &CheckAttributeReader{ + Attributes: []string{"linguist-vendored", "linguist-generated", "linguist-language"}, + Repo: repo, + IndexFile: indexFilename, + WorkTree: tmpWorkTree, + } + ctx, cancel := context.WithCancel(DefaultContext) + if err := checker.Init(ctx); err != nil { + log.Error("Unable to open checker for %s. Error: %v", commitID, err) + } else { + go func() { + err = checker.Run() + if err != nil { + log.Error("Unable to open checker for %s. Error: %v", commitID, err) + cancel() + } + }() + } + defer cancel() } - defer cancel() } } @@ -123,12 +132,11 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err if language, has := attrs["linguist-language"]; has && language != "unspecified" && language != "" { // group languages, such as Pug -> HTML; SCSS -> CSS group := enry.GetLanguageGroup(language) - if len(group) == 0 { + if len(group) != 0 { language = group } sizes[language] += f.Size() - continue } } @@ -186,7 +194,6 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err } sizes[language] += f.Size() - continue } diff --git a/modules/git/repo_language_stats_test.go b/modules/git/repo_language_stats_test.go new file mode 100644 index 0000000000000..a77266413aa64 --- /dev/null +++ b/modules/git/repo_language_stats_test.go @@ -0,0 +1,34 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +//go:build !gogit +// +build !gogit + +package git + +import ( + "path/filepath" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestRepository_GetLanguageStats(t *testing.T) { + repoPath := filepath.Join(testReposDir, "language_stats_repo") + gitRepo, err := OpenRepository(repoPath) + if !assert.NoError(t, err) { + t.Fatal() + } + defer gitRepo.Close() + + stats, err := gitRepo.GetLanguageStats("8fee858da5796dfb37704761701bb8e800ad9ef3") + if !assert.NoError(t, err) { + t.Fatal() + } + + assert.EqualValues(t, map[string]int64{ + "Python": 134, + "Java": 112, + }, stats) +} diff --git a/modules/git/tests/repos/language_stats_repo/COMMIT_EDITMSG b/modules/git/tests/repos/language_stats_repo/COMMIT_EDITMSG new file mode 100644 index 0000000000000..ec4d890919877 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/COMMIT_EDITMSG @@ -0,0 +1,3 @@ +Add some test files for GetLanguageStats + +Signed-off-by: Andrew Thornton diff --git a/modules/git/tests/repos/language_stats_repo/HEAD b/modules/git/tests/repos/language_stats_repo/HEAD new file mode 100644 index 0000000000000..cb089cd89a7d7 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/modules/git/tests/repos/language_stats_repo/config b/modules/git/tests/repos/language_stats_repo/config new file mode 100644 index 0000000000000..515f4836297fd --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/config @@ -0,0 +1,5 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true diff --git a/modules/git/tests/repos/language_stats_repo/description b/modules/git/tests/repos/language_stats_repo/description new file mode 100644 index 0000000000000..498b267a8c781 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/modules/git/tests/repos/language_stats_repo/hooks/applypatch-msg.sample b/modules/git/tests/repos/language_stats_repo/hooks/applypatch-msg.sample new file mode 100755 index 0000000000000..a5d7b84a67345 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/modules/git/tests/repos/language_stats_repo/hooks/commit-msg.sample b/modules/git/tests/repos/language_stats_repo/hooks/commit-msg.sample new file mode 100755 index 0000000000000..b58d1184a9d43 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/modules/git/tests/repos/language_stats_repo/hooks/fsmonitor-watchman.sample b/modules/git/tests/repos/language_stats_repo/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000000000..14ed0aa42de0f --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/fsmonitor-watchman.sample @@ -0,0 +1,173 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + } + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $last_update_token, + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/modules/git/tests/repos/language_stats_repo/hooks/post-update.sample b/modules/git/tests/repos/language_stats_repo/hooks/post-update.sample new file mode 100755 index 0000000000000..ec17ec1939b7c --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/modules/git/tests/repos/language_stats_repo/hooks/pre-applypatch.sample b/modules/git/tests/repos/language_stats_repo/hooks/pre-applypatch.sample new file mode 100755 index 0000000000000..4142082bcb939 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/modules/git/tests/repos/language_stats_repo/hooks/pre-commit.sample b/modules/git/tests/repos/language_stats_repo/hooks/pre-commit.sample new file mode 100755 index 0000000000000..e144712c85c05 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/modules/git/tests/repos/language_stats_repo/hooks/pre-merge-commit.sample b/modules/git/tests/repos/language_stats_repo/hooks/pre-merge-commit.sample new file mode 100755 index 0000000000000..399eab1924e39 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/modules/git/tests/repos/language_stats_repo/hooks/pre-push.sample b/modules/git/tests/repos/language_stats_repo/hooks/pre-push.sample new file mode 100755 index 0000000000000..4ce688d32b753 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/modules/git/tests/repos/language_stats_repo/hooks/pre-rebase.sample b/modules/git/tests/repos/language_stats_repo/hooks/pre-rebase.sample new file mode 100755 index 0000000000000..6cbef5c370d8c --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/modules/git/tests/repos/language_stats_repo/hooks/pre-receive.sample b/modules/git/tests/repos/language_stats_repo/hooks/pre-receive.sample new file mode 100755 index 0000000000000..a1fd29ec14823 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/modules/git/tests/repos/language_stats_repo/hooks/prepare-commit-msg.sample b/modules/git/tests/repos/language_stats_repo/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000000000..10fa14c5ab013 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/modules/git/tests/repos/language_stats_repo/hooks/push-to-checkout.sample b/modules/git/tests/repos/language_stats_repo/hooks/push-to-checkout.sample new file mode 100755 index 0000000000000..af5a0c0018b5e --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/modules/git/tests/repos/language_stats_repo/index b/modules/git/tests/repos/language_stats_repo/index new file mode 100644 index 0000000000000000000000000000000000000000..e6c02231716df89a12fa7ee496d2b8f681527d8b GIT binary patch literal 553 zcmZ?q402{*U|<4b)`@?5BjE0&w7tK6p zuM^D4ecqi@Me>Yhu|AmgOQ(E+Edzh1Zep%(qHaNDNk)F2UIEy=s`YZph6fToAT-E4 zMggaAH1i6aRNwsiw(Ix##d1qe-w={9yXjic${>=JSeB@pk(!f}ub-QknWqQhgIo!6 zXZ0rqH9J8V4Rz;KqRbTl8&;N@my%xuH4|u#y8OSd*)SSx-W_R9H1n|gTNL79s7t}_ z)hnn3yE7!n)fMDi22%wiuD-3wcLefm|5{!6)%bnE(MJjX4QCNvWH3}P;99jv`iD=q zGD||Q{R!)m3WrawNi&g62P;bPF<)E%% 1632140318 +0100 commit (initial): Add some test files for GetLanguageStats diff --git a/modules/git/tests/repos/language_stats_repo/logs/refs/heads/master b/modules/git/tests/repos/language_stats_repo/logs/refs/heads/master new file mode 100644 index 0000000000000..ce489502bb796 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 8fee858da5796dfb37704761701bb8e800ad9ef3 Andrew Thornton 1632140318 +0100 commit (initial): Add some test files for GetLanguageStats diff --git a/modules/git/tests/repos/language_stats_repo/objects/42/25ecfaf6bafbcfa31ea5cbd8121c36d9457085 b/modules/git/tests/repos/language_stats_repo/objects/42/25ecfaf6bafbcfa31ea5cbd8121c36d9457085 new file mode 100644 index 0000000000000000000000000000000000000000..ff3b642734150dc12c49eb637fb6c9322012ae8f GIT binary patch literal 116 zcmV-)0E_>40ZYosPf{>6G-4^kN#UyIQh-Vomn4<| zRg~ptrYPhlX69)GmlS2@rANmqBo?I?YjP<7l_~^R7MG;v>gAV~=oJ8EOLFowl)$Db Wl!J^@RMNEOQmEys5XHZsF2+7DSRsf9V=y!@Ff%bx$Vkn}$=55WWbit{oZRQ#IaMUjXcp^(X}@&J L7uW&-FaZx{HjWkw literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/language_stats_repo/objects/6c/633a0067b463e459ae952716b17ae36aa30adc b/modules/git/tests/repos/language_stats_repo/objects/6c/633a0067b463e459ae952716b17ae36aa30adc new file mode 100644 index 0000000000000000000000000000000000000000..873cb7187dfe5934941716569ab1b76fe181f23d GIT binary patch literal 371 zcmbKk9!7p(QRo{{}nsGxXNbMQs3M+H9}J7S6z%X3#Q{iUwa zRNub1`N4eUf0FmE?yztv2;Rr8uYbI{vS7Zh%ES;sX%Ht8!VzwAmpaI=z+|UClf0yQ=qDXq493 z=D*s8n^Px>@7w*m(#A@Gq0y~T*NTI!_WGvlnVavR=sR_@MApW(IgMog$tW_eZnk!eRx zWvYChk*VC{Ydlr`%wNO%vXZ|;$_h`qOnoV*yE3n5>4jNq)qC$M{9^EN2%iT41YV(| literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/language_stats_repo/objects/8e/b563dc106e3dfd3ad0fa81f7a0c5e2604f80cd b/modules/git/tests/repos/language_stats_repo/objects/8e/b563dc106e3dfd3ad0fa81f7a0c5e2604f80cd new file mode 100644 index 0000000000000000000000000000000000000000..f89ecb7d607f53fa5bbeb8886a50a77b8ab0a69b GIT binary patch literal 201 zcmV;)05<=40V^p=O;s>5Fl8__FfcPQQP4}zEJ-XWDauSLElDkAxV3ck2>vP({N3_wi~K4Q#UbJH&M5svLquvPp^Q%>jZOhpLgd}kvyYWtPiIB(kWkHYhnNd z3R#I|iMko7IXU?Zs}@QB@aa}&N$9mdVO>(;@X0l4Ce*y##LPUsvedkk{31P&4hARH zH^08^`h9+}+|tuGgk;Qax)!uT420MTH8RD=d~N+RuLDB&>mn~zO?oU`lfnl80FYD{ D5k*{W literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/language_stats_repo/objects/8f/ee858da5796dfb37704761701bb8e800ad9ef3 b/modules/git/tests/repos/language_stats_repo/objects/8f/ee858da5796dfb37704761701bb8e800ad9ef3 new file mode 100644 index 0000000000000000000000000000000000000000..0219c2d565cdf6892d4633f715f275b2f5c600ce GIT binary patch literal 828 zcmV-C1H=4y0iBe~&Z9;Ug|p@}C2#6@z2pmiqT0k7kAQwYAi$x~e#&o(ttU&XbNT-m9 zCtP#`kXksP7YIIki@O&584sA<{+-4xj+5V8g#QAJz_AQZbBqW`nxSbT{c#kd|L4y8 zd@OVD_0PzvW;nppJa9HNM+z<{^@mOX0+hb-mL*A6atR(vRi(!r%l5ZbLJ$8Cn1knR z=x7mxp3V=_<6vYmFDZHL|I`W4(?w8A)J~64Gqb5Pon&%`_GVYK%$VRLdfU$S%$P|) zAKS=l$i4nNMs*Z5cQMs?n*ha5W_i->Mr?>gxs}-+y_nIW#;4fM5wzwJaqnq4 zZ{T@bo%S!XN`%|=a7hAqxf|g`^31_`E=a=iJs{ni9v){;y!(|k&Dn#LrnoyX)ARX$ z*AexIPDwD~aVpJ2L;wM*75kPWuSybfo1NelmPW*EbZ0$J7UhPO4%tFqDMMQ*iv7gU zdWEHsJs_1nL5ToI=yQju3$^IoOJ3$n3W4t&z-<#Sf-QKLheSJ2w1mUrD=-ado6 zM79Zy>?+7b;ZQ7cWGOQHRngi8&sVJC54vHr`3X{7iK}4A#%Qa zdT4r?y*xPONEYl%L<0=%9XD~D{Ff%bx$W6@5)5}UMOJs0Tee>(vuHWYu%Pl>9LrBK# MrfWef0A_I#MnPW|jsO4v literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/language_stats_repo/objects/da/a5abe3c5f42cae598e362e8a8db6284565d6bb b/modules/git/tests/repos/language_stats_repo/objects/da/a5abe3c5f42cae598e362e8a8db6284565d6bb new file mode 100644 index 0000000000000000000000000000000000000000..9d4d4b1a04fe12cba1b27260a5f9f935e1b05641 GIT binary patch literal 64 zcmV-G0Kflu0ZYosPf{>5V$jknOU+BkFVf3OEK5|#$;?YH%`7g_g$SmmaB1lkAVhN# WfzpZTskQ-?B^mj7TwDNKei)XuX&k8l literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/language_stats_repo/refs/heads/master b/modules/git/tests/repos/language_stats_repo/refs/heads/master new file mode 100644 index 0000000000000..679afcc5063b8 --- /dev/null +++ b/modules/git/tests/repos/language_stats_repo/refs/heads/master @@ -0,0 +1 @@ +8fee858da5796dfb37704761701bb8e800ad9ef3 diff --git a/modules/indexer/stats/db.go b/modules/indexer/stats/db.go index 976bf2d632d69..87e8677a289fc 100644 --- a/modules/indexer/stats/db.go +++ b/modules/indexer/stats/db.go @@ -38,11 +38,11 @@ func (db *DBIndexer) Index(id int64) error { // Get latest commit for default branch commitID, err := gitRepo.GetBranchCommitID(repo.DefaultBranch) if err != nil { - if git.IsErrBranchNotExist(err) || git.IsErrNotExist((err)) { - log.Debug("Unable to get commit ID for defaultbranch %s in %s ... skipping this repository", repo.DefaultBranch, repo.RepoPath()) + if git.IsErrBranchNotExist(err) || git.IsErrNotExist(err) { + log.Debug("Unable to get commit ID for default branch %s in %s ... skipping this repository", repo.DefaultBranch, repo.RepoPath()) return nil } - log.Error("Unable to get commit ID for defaultbranch %s in %s. Error: %v", repo.DefaultBranch, repo.RepoPath(), err) + log.Error("Unable to get commit ID for default branch %s in %s. Error: %v", repo.DefaultBranch, repo.RepoPath(), err) return err } @@ -54,10 +54,17 @@ func (db *DBIndexer) Index(id int64) error { // Calculate and save language statistics to database stats, err := gitRepo.GetLanguageStats(commitID) if err != nil { - log.Error("Unable to get language stats for ID %s for defaultbranch %s in %s. Error: %v", commitID, repo.DefaultBranch, repo.RepoPath(), err) + log.Error("Unable to get language stats for ID %s for default branch %s in %s. Error: %v", commitID, repo.DefaultBranch, repo.RepoPath(), err) return err } - return repo.UpdateLanguageStats(commitID, stats) + err = repo.UpdateLanguageStats(commitID, stats) + if err != nil { + log.Error("Unable to update language stats for ID %s for default branch %s in %s. Error: %v", commitID, repo.DefaultBranch, repo.RepoPath(), err) + return err + } + + log.Debug("DBIndexer completed language stats for ID %s for default branch %s in %s. stats count: %d", commitID, repo.DefaultBranch, repo.RepoPath(), len(stats)) + return nil } // Close dummy function From 10108b184efe28da85bbbc7efef24a79ccbd3cd0 Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 21 Sep 2021 09:35:28 +0100 Subject: [PATCH 2/2] Add Horizontal scrollbar to inner menu on Chrome (#17086) There is a longstanding bug whereby the admin pages, in particular, have not had a horizontal scrollbar on chrome when the page is narrow. This PR simply adds overflow-x and adds a default height to the scrollbar to match that of the vertical bar. Signed-off-by: Andrew Thornton --- web_src/less/_base.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 55632687d4d74..4702cb281ebc8 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -181,6 +181,7 @@ details summary > * { ::-webkit-scrollbar { width: 10px; + height: 10px; } ::-webkit-scrollbar-thumb { box-shadow: inset 0 0 0 6px var(--color-primary); @@ -1285,6 +1286,7 @@ footer { display: flex; margin-left: auto; margin-right: auto; + overflow-x: auto; } @media @mediaSm {