[Pkg-bazaar-commits] ./bzr-email/unstable r46: Merge new upstream snapshot.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 46
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Tue 2008-08-05 17:48:28 +0200
message:
  Merge new upstream snapshot.
modified:
  debian/changelog
  debian/control
  emailer.py
    ------------------------------------------------------------
    revno: 24.1.10
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: email
    timestamp: Thu 2008-06-05 12:40:57 -0500
    message:
      Special case showing a single revision without a merge.
      
      This cuts out 2s of 'bzr commit' time for committing to a bzr.dev tree.
    modified:
      emailer.py
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-08-04 20:08:41 +0000
+++ b/debian/changelog	2008-08-05 15:48:28 +0000
@@ -1,4 +1,4 @@
-bzr-email (0.0.1~bzr33-1) unstable; urgency=low
+bzr-email (0.0.1~bzr34-1) unstable; urgency=low
 
   * New upstream snapshot.
   * Bump standards version to 3.8.0.

=== modified file 'debian/control'
--- a/debian/control	2008-06-16 19:36:52 +0000
+++ b/debian/control	2008-08-05 15:48:28 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
 Uploaders: Jelmer Vernooij <jelmer at samba.org>
 Homepage: https://launchpad.net/bzr-email
-Build-Depends-Indep: bzr (>= 0.90~)
+Build-Depends-Indep: bzr (>= 1.0~)
 Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python-dev
 Standards-Version: 3.8.0
 XS-Python-Version: >= 2.4
@@ -13,7 +13,7 @@
 
 Package: bzr-email
 Architecture: all
-Depends: bzr (>= 0.15~rc1), ${python:Depends}
+Depends: bzr (>= 1.0~), ${python:Depends}
 Enhances: bzr
 XB-Python-Version: ${python:Versions}
 Description: Notification email plugin for Bazaar

=== modified file 'emailer.py'
--- a/emailer.py	2007-09-19 21:38:05 +0000
+++ b/emailer.py	2008-06-05 17:40:57 +0000
@@ -46,7 +46,7 @@
         self.revno = self.branch.revision_id_to_revno(self._revision_id)
 
     def body(self):
-        from bzrlib.log import log_formatter, show_log
+        from bzrlib import log
 
         rev1 = rev2 = self.revno
         if rev1 == 0:
@@ -63,17 +63,25 @@
 
         outf.write('At %s\n\n' % self.url())
 
-        lf = log_formatter('long',
-                           show_ids=True,
-                           to_file=outf
-                           )
+        lf = log.log_formatter('long',
+                               show_ids=True,
+                               to_file=outf
+                               )
 
-        show_log(self.branch,
-                 lf,
-                 start_revision=rev1,
-                 end_revision=rev2,
-                 verbose=True
-                 )
+        if len(self.revision.parent_ids) <= 1:
+            # This is not a merge, so we can special case the display of one
+            # revision, and not have to encur the show_log overhead.
+            lr = log.LogRevision(self.revision, self.revno, 0, None)
+            lf.log_revision(lr)
+        else:
+            # let the show_log code figure out what revisions need to be
+            # displayed, as this is a merge
+            log.show_log(self.branch,
+                         lf,
+                         start_revision=rev1,
+                         end_revision=rev2,
+                         verbose=True
+                         )
 
         return outf.getvalue()