Merge lp:~cando/zeitgeist-datasources/fix_bzr into lp:zeitgeist-datasources/0.8

[Stefano Candori]

In this branch i've fixed bug #695003.

[lp:~cando/zeitgeist-datasources/fix_bzr]

104. By Stefano Candori on 2011-01-05

More metadata to uri

105. By Stefano Candori on 2011-01-05

Other metadata

106. By Stefano Candori on 2011-01-05

Less metadata :)

[Michal Hruby (mhr3)]

Looks good to me.

review: Approve

[Michal Hruby (mhr3)]

On a second thought I really don't like that this is going to screw up popularity of the folder subject, it could use more discussion...

review: Abstain

[Siegfried Gevatter (rainct)]

What's the status of this? Looks good to me.

(By the way, it'd be nice to refactor code shared in post_commit & post_pull into a new method.)

[Stefano Candori (cando)]

We should debate on Michal's doubts...

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

If we add the commit number, then the advantages would outweigh the disadvantages (my 2 cents)

I would like to see this merged in the upcoming release (trying to get it out in a day or two)

review: Approve

Unmerged revisions

106. By Stefano Candori on 2011-01-05

Less metadata :)

105. By Stefano Candori on 2011-01-05

Other metadata

104. By Stefano Candori on 2011-01-05

More metadata to uri

103. By Stefano Candori on 2011-01-05

Fix #695003

=== modified file 'bzr/__init__.py'
--- bzr/__init__.py	2010-11-01 16:32:39 +0000
+++ bzr/__init__.py	2011-01-05 16:43:11 +0000
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Post-commit hook to submit the commit to Zeitgeist (http://www.zeitgeist-project.com)
+"""Post-commit and post-pull hook to submit the commit to Zeitgeist (http://www.zeitgeist-project.com)
 
 Requires bzr 0.15 or higher.
 
@@ -63,8 +63,9 @@
     _text += str(new_revno) + "\n"
     _text += revision.message.rstrip()
 
+    uri = master.base + "#revision=" + str(new_revno)
     subject = Subject.new_for_values(
-        uri=unicode(master.base),
+        uri=unicode(uri),
         interpretation=unicode(Interpretation.FOLDER),
         manifestation=unicode(Manifestation.FILE_DATA_OBJECT),
         text=unicode(_text),
@@ -88,8 +89,10 @@
     _text += (" to revision ")
     _text += str(master.revno())+":\n"
     _text += revision.get_summary()
+
+    uri = master.base + "#revision=" + str(master.revno())
     subject = Subject.new_for_values(
-        uri=unicode(master.base),
+        uri=unicode(uri),
         interpretation=unicode(Interpretation.FOLDER),
         manifestation=unicode(Manifestation.FILE_DATA_OBJECT),
         text=unicode(_text),