1 |
commit: 9a3f6d109fdeddac19ae2316b2847c0a90a8c399 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Apr 28 07:43:13 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 5 01:22:00 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3f6d10 |
7 |
|
8 |
net-irc/irker: remove unused patch |
9 |
|
10 |
Closes: https://bugs.gentoo.org/650188 |
11 |
|
12 |
.../files/2.17-irkerhook-Remove-file-listing.patch | 104 --------------------- |
13 |
1 file changed, 104 deletions(-) |
14 |
|
15 |
diff --git a/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch |
16 |
deleted file mode 100644 |
17 |
index 356bc9ae264..00000000000 |
18 |
--- a/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch |
19 |
+++ /dev/null |
20 |
@@ -1,104 +0,0 @@ |
21 |
-From a5fca5ebbede155329e44fd4b4a4268c0c86ff3f Mon Sep 17 00:00:00 2001 |
22 |
-From: Bertrand Jacquin <bertrand@×××××××.bzh> |
23 |
-Date: Mon, 7 Oct 2013 13:33:30 +0200 |
24 |
-Subject: [PATCH 2/2] irkerhook: Remove file listing |
25 |
- |
26 |
---- |
27 |
- irkerhook.py | 28 +++------------------------- |
28 |
- 1 file changed, 3 insertions(+), 25 deletions(-) |
29 |
- |
30 |
-diff --git a/irkerhook.py b/irkerhook.py |
31 |
-index 18c9b01..0ba6834 100755 |
32 |
---- a/irkerhook.py |
33 |
-+++ b/irkerhook.py |
34 |
-@@ -66,7 +66,6 @@ class Commit: |
35 |
- self.rev = None |
36 |
- self.mail = None |
37 |
- self.author = None |
38 |
-- self.files = None |
39 |
- self.logmsg = None |
40 |
- self.url = None |
41 |
- self.author_date = None |
42 |
-@@ -237,7 +236,7 @@ class GitExtractor(GenericExtractor): |
43 |
- self.channels = do("git config --get irker.channels") |
44 |
- self.email = do("git config --get irker.email") |
45 |
- self.tcp = do("git config --bool --get irker.tcp") |
46 |
-- self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' |
47 |
-+ self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' |
48 |
- self.tinyifier = do("git config --get irker.tinyifier") or default_tinyifier |
49 |
- self.color = do("git config --get irker.color") |
50 |
- self.urlprefix = do("git config --get irker.urlprefix") or "gitweb" |
51 |
-@@ -286,9 +285,6 @@ class GitExtractor(GenericExtractor): |
52 |
- if self.urlprefix in ('gitweb', 'cgit'): |
53 |
- # Also truncate the commit used for the announced urls |
54 |
- commit.commit = commit.rev |
55 |
-- # Extract the meta-information for the commit |
56 |
-- commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit)) |
57 |
-- commit.files = " ".join(commit.files.strip().split("\n")[1:]) |
58 |
- # Design choice: for git we ship only the first message line, which is |
59 |
- # conventionally supposed to be a summary of the commit. Under |
60 |
- # other VCSes a different choice may be appropriate. |
61 |
-@@ -309,7 +305,7 @@ class SvnExtractor(GenericExtractor): |
62 |
- if tok.startswith("--repository="): |
63 |
- self.repository = tok[13:] |
64 |
- self.project = os.path.basename(self.repository) |
65 |
-- self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' |
66 |
-+ self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' |
67 |
- self.urlprefix = "viewcvs" |
68 |
- self.load_preferences(os.path.join(self.repository, "irker.conf")) |
69 |
- self.do_overrides() |
70 |
-@@ -323,7 +319,6 @@ class SvnExtractor(GenericExtractor): |
71 |
- commit.rev = "r%s" % self.id |
72 |
- commit.author = self.svnlook("author") |
73 |
- commit.commit_date = self.svnlook("date").partition('(')[0] |
74 |
-- commit.files = self.svnlook("dirs-changed").strip().replace("\n", " ") |
75 |
- commit.logmsg = self.svnlook("log").strip() |
76 |
- return commit |
77 |
- def svnlook(self, info): |
78 |
-@@ -367,7 +362,7 @@ class HgExtractor(GenericExtractor): |
79 |
- self.channels = ui.config('irker', 'channels') |
80 |
- self.email = ui.config('irker', 'email') |
81 |
- self.tcp = str(ui.configbool('irker', 'tcp')) # converted to bool again in do_overrides |
82 |
-- self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' |
83 |
-+ self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' |
84 |
- self.tinyifier = ui.config('irker', 'tinyifier') or default_tinyifier |
85 |
- self.color = ui.config('irker', 'color') |
86 |
- self.urlprefix = (ui.config('irker', 'urlprefix') or |
87 |
-@@ -397,9 +392,6 @@ class HgExtractor(GenericExtractor): |
88 |
- commit.author_date = \ |
89 |
- datetime.datetime.fromtimestamp(ctx.date()[0]).strftime('%Y-%m-%d %H:%M:%S') |
90 |
- commit.logmsg = ctx.description() |
91 |
-- # Extract changed files from status against first parent |
92 |
-- st = self.repository.status(ctx.p1().node(), ctx.node()) |
93 |
-- commit.files = ' '.join(st[0] + st[1] + st[2]) |
94 |
- return commit |
95 |
- |
96 |
- def hg_hook(ui, repo, **kwds): |
97 |
-@@ -440,17 +432,6 @@ def ship(extractor, commit, debug): |
98 |
- sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data) |
99 |
- raise SystemExit(1) |
100 |
- |
101 |
-- # Rewrite the file list if too long. The objective here is only |
102 |
-- # to be easier on the eyes. |
103 |
-- if extractor.cialike \ |
104 |
-- and extractor.cialike.lower() != "none" \ |
105 |
-- and len(metadata.files) > int(extractor.cialike): |
106 |
-- files = metadata.files.split() |
107 |
-- dirs = set([d.rpartition('/')[0] for d in files]) |
108 |
-- if len(dirs) == 1: |
109 |
-- metadata.files = "(%s files)" % (len(files),) |
110 |
-- else: |
111 |
-- metadata.files = "(%s files in %s dirs)" % (len(files), len(dirs)) |
112 |
- # Message reduction. The assumption here is that IRC can't handle |
113 |
- # lines more than 510 characters long. If we exceed that length, we |
114 |
- # try knocking out the file list, on the theory that for notification |
115 |
-@@ -458,9 +439,6 @@ def ship(extractor, commit, debug): |
116 |
- # there's nothing much can be done other than ship it expecting the IRC |
117 |
- # server to truncate. |
118 |
- privmsg = unicode(metadata) |
119 |
-- if len(privmsg) > 510: |
120 |
-- metadata.files = "" |
121 |
-- privmsg = unicode(metadata) |
122 |
- |
123 |
- # Anti-spamming guard. It's deliberate that we get maxchannels not from |
124 |
- # the user-filtered metadata but from the extractor data - means repo |