1
=== modified file 'bzr/__init__.py'
2
--- bzr/__init__.py	2010-11-01 16:32:39 +0000
3
+++ bzr/__init__.py	2011-01-08 11:09:00 +0000
4
@@ -17,7 +17,7 @@
5
17
# You should have received a copy of the GNU Lesser General Public License
17
# You should have received a copy of the GNU Lesser General Public License
6
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
7
19
19
9
20
"""Post-commit hook to submit the commit to Zeitgeist (http://www.zeitgeist-project.com)
20
"""Post-commit and post-pull hook to submit the commit to Zeitgeist (http://www.zeitgeist-project.com)
10
21
21
11
22
Requires bzr 0.15 or higher.
22
Requires bzr 0.15 or higher.
12
23
23
13
@@ -63,8 +63,9 @@
14
63
    _text += str(new_revno) + "\n"
63
    _text += str(new_revno) + "\n"
15
64
    _text += revision.message.rstrip()
64
    _text += revision.message.rstrip()
16
65
65
17
66
    uri = master.base + "#revision=" + str(new_revno)
18
66
    subject = Subject.new_for_values(
67
    subject = Subject.new_for_values(
20
67
        uri=unicode(master.base),
68
        uri=unicode(uri),
21
68
        interpretation=unicode(Interpretation.FOLDER),
69
        interpretation=unicode(Interpretation.FOLDER),
22
69
        manifestation=unicode(Manifestation.FILE_DATA_OBJECT),
70
        manifestation=unicode(Manifestation.FILE_DATA_OBJECT),
23
70
        text=unicode(_text),
71
        text=unicode(_text),
24
@@ -88,8 +89,10 @@
25
88
    _text += (" to revision ")
89
    _text += (" to revision ")
26
89
    _text += str(master.revno())+":\n"
90
    _text += str(master.revno())+":\n"
27
90
    _text += revision.get_summary()
91
    _text += revision.get_summary()
28
92
29
93
    uri = master.base + "#revision=" + str(master.revno())
30
91
    subject = Subject.new_for_values(
94
    subject = Subject.new_for_values(
32
92
        uri=unicode(master.base),
95
        uri=unicode(uri),
33
93
        interpretation=unicode(Interpretation.FOLDER),
96
        interpretation=unicode(Interpretation.FOLDER),
34
94
        manifestation=unicode(Manifestation.FILE_DATA_OBJECT),
97
        manifestation=unicode(Manifestation.FILE_DATA_OBJECT),
35
95
        text=unicode(_text),
98
        text=unicode(_text),
36
96
99
37
=== modified file 'chrome/zeitgeist.js'
38
--- chrome/zeitgeist.js	2010-11-25 16:26:14 +0000
39
+++ chrome/zeitgeist.js	2011-01-08 11:09:00 +0000
40
@@ -46,7 +46,9 @@
41
46
	sendAccessEvent(request);
46
	sendAccessEvent(request);
42
47
}
47
}
43
48
48
45
49
plugin.setActor("application://google-chrome.desktop");
49
var is_chromium = /chromium/.test( navigator.userAgent.toLowerCase() );
46
50
if (!is_chromium) plugin.setActor("application://google-chrome.desktop");
47
51
else plugin.setActor("application://chromium-browser.desktop");
48
50
52
49
51
//chrome.extension.onConnect.addListener (onExtensionConnect);
53
//chrome.extension.onConnect.addListener (onExtensionConnect);
50
52
chrome.extension.onRequest.addListener (onExtensionRequest);
54
chrome.extension.onRequest.addListener (onExtensionRequest);
Status:	Merged
Merge reported by:	Michal Hruby
Merged at revision:	not available
Proposed branch:	lp:~cando/zeitgeist-datasources/fix_chromium
Merge into:	lp:zeitgeist-datasources/0.8
Diff against target:	50 lines (+9/-4) 2 files modified bzr/__init__.py (+6/-3) chrome/zeitgeist.js (+3/-1)
To merge this branch:	bzr merge lp:~cando/zeitgeist-datasources/fix_chromium
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michal Hruby (community)		2011-01-08	Approve on 2011-01-11
Review via email: mp+45599@code.launchpad.net