[Pkg-bazaar-commits] ./bzr-stats/unstable r32: * New upstream snapshot.

Jelmer Vernooij jelmer at debian.org
Fri Apr 10 07:20:17 UTC 2009


------------------------------------------------------------
revno: 32
committer: Jelmer Vernooij <jelmer at debian.org>
branch nick: debian
timestamp: Thu 2009-03-19 17:02:24 +0100
message:
  * New upstream snapshot.
   + Fixes deprecation warning.
removed:
  .bzrignore
modified:
  __init__.py
  debian/changelog
  debian/control
    ------------------------------------------------------------
    revno: 10.6.1
    committer: Paul Hummer <paul.hummer at canonical.com>
    branch nick: stats
    timestamp: Sun 2008-07-27 10:17:02 +1200
    message:
      Revisions with missing emails are no longer all attributed to the same person
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 10.6.2
    committer: Paul Hummer <paul at eventuallyanyway.com>
    branch nick: import-branch-support
    timestamp: Wed 2009-01-14 16:02:15 -0700
    message:
      Fixed a typo per review
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 10.7.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2009-01-15 00:15:09 +0100
    message:
      Merge support for coping with missing emails. 
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 10.7.2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2009-03-13 19:37:26 +0100
    message:
      Remove some uses of get_apparent_author.
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 10.7.3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2009-03-19 16:30:36 +0100
    message:
      Remove use of get_apparent_authors.
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 10.2.18
    tags: upstream-0.0.1~bzr30
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: upstream
    timestamp: Thu 2009-03-19 17:01:12 +0100
    message:
      Import upstream version 0.0.1~bzr30
    removed:
      .bzrignore
    modified:
      __init__.py
-------------- next part --------------
=== removed file '.bzrignore'
--- a/.bzrignore	2006-07-11 14:37:38 +0000
+++ b/.bzrignore	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-*.py[co]

=== modified file '__init__.py'
--- a/__init__.py	2008-08-04 19:49:51 +0000
+++ b/__init__.py	2009-03-19 15:30:36 +0000
@@ -42,7 +42,8 @@
         fullname = config.parse_username(committer)[0]
         counts.setdefault(fullname, 0)
         counts[fullname] += 1
-    return sorted(((count, name) for name,count in counts.iteritems()), reverse=True)
+    return sorted(((count, name) for name,count in counts.iteritems()),
+        reverse=True)
 
 
 def collapse_by_person(committers):
@@ -64,7 +65,10 @@
     counter_to_info = {}
     counter = 0
     for email, revs in committers.iteritems():
-        fullnames = find_fullnames(rev.get_apparent_author() for rev in revs)
+        authors = []
+        for rev in revs:
+            authors += rev.get_apparent_authors()
+        fullnames = find_fullnames(authors)
         match = None
         for count, fullname in fullnames:
             if fullname and fullname in name_to_counter:
@@ -101,11 +105,16 @@
         revisions = a_repo.get_revisions(revids)
         for count, rev in enumerate(revisions):
             pb.update('checking', count, len(revids))
-            email = config.parse_username(rev.get_apparent_author())[1]
-            committers.setdefault(email, []).append(rev)
+            for author in rev.get_apparent_authors():
+                username = config.parse_username(author)
+                if username[1] == '':
+                    email = username[0]
+                else:
+                    email = username[1]
+                committers.setdefault(email, []).append(rev)
     finally:
         pb.finished()
-    
+
     return committers
 
 
@@ -127,7 +136,7 @@
 
 def get_diff_info(a_repo, start_rev, end_rev):
     """Get only the info for new revisions between the two revisions
-    
+
     This lets us figure out what has actually changed between 2 revisions.
     """
     pb = ui.ui_factory.nested_progress_bar()
@@ -144,11 +153,12 @@
 
         for count, rev in enumerate(revisions):
             pb.update('checking', count, len(ancestry))
-            try:
-                email = config.extract_email_address(rev.get_apparent_author())
-            except errors.BzrError:
-                email = rev.get_apparent_author()
-            committers.setdefault(email, []).append(rev)
+            for author in rev.get_apparent_authors():
+                try:
+                    email = config.extract_email_address(author)
+                except errors.BzrError:
+                    email = author
+                committers.setdefault(email, []).append(rev)
     finally:
         a_repo.unlock()
         pb.finished()
@@ -168,9 +178,15 @@
         sorted_fullnames = sorted(((count, fullname)
                                   for fullname,count in fullnames.iteritems()),
                                   reverse=True)
-        to_file.write('%4d %s <%s>\n'
-                      % (count, sorted_fullnames[0][1],
-                         sorted_emails[0][1]))
+        # There is a chance sometimes with svn imports that the full name and
+        # email can BOTH be blank.
+        if sorted_fullnames[0][1] == '':
+            to_file.write('%4d %s\n'
+                          % (count, 'Unknown'))
+        else:
+            to_file.write('%4d %s <%s>\n'
+                          % (count, sorted_fullnames[0][1],
+                             sorted_emails[0][1]))
         if len(sorted_fullnames) > 1:
             print '     Other names:'
             for count, fname in sorted_fullnames[1:]:
@@ -339,10 +355,10 @@
                 if len(rev.parent_ids) > 1:
                     continue
                 for c in set(classify_delta(delta)):
-                    author = rev.get_apparent_author()
-                    if not author in ret[c]:
-                        ret[c][author] = 0
-                    ret[c][author] += 1
+                    for author in rev.get_apparent_authors():
+                        if not author in ret[c]:
+                            ret[c][author] = 0
+                        ret[c][author] += 1
         finally:
             pb.finished()
     finally:

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-10-01 12:51:21 +0000
+++ b/debian/changelog	2009-03-19 16:02:24 +0000
@@ -1,3 +1,10 @@
+bzr-stats (0.0.1~bzr30-1) unstable; urgency=low
+
+  * New upstream snapshot.
+   + Fixes deprecation warning.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Thu, 19 Mar 2009 17:01:14 +0100
+
 bzr-stats (0.0.1~bzr27-1) unstable; urgency=low
 
   * New upstream snapshot. 

=== modified file 'debian/control'
--- a/debian/control	2009-03-05 15:51:20 +0000
+++ b/debian/control	2009-03-19 16:02:24 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
 Uploaders: Jelmer Vernooij <jelmer at samba.org>
-Build-Depends-Indep: bzr (>= 1.0), python-central (>= 0.5)
+Build-Depends-Indep: bzr (>= 1.13~), python-central (>= 0.5)
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python
 Standards-Version: 3.8.0
 XS-Python-Version: >= 2.4
@@ -13,7 +13,7 @@
 
 Package: bzr-stats
 Architecture: all
-Depends: bzr (>= 1.0), ${python:Depends}, ${misc:Depends}
+Depends: bzr (>= 1.13~), ${python:Depends}, ${misc:Depends}
 Enhances: bzr
 XB-Python-Version: ${python:Versions}
 Description: statistics plugin for Bazaar



More information about the Pkg-bazaar-commits mailing list