Merge lp:~gagern/bzr/bug513322-first into lp:bzr

[Martin von Gagern]

[Martin Pool (mbp)]

This is definitely a user-visible change so should be in NEWS.

It would be nice to have a test for this too.

review: Needs Fixing

[lp:~gagern/bzr/bug513322-first]

4083. By Martin von Gagern on 2010-03-25

merge from bzr.dev

4084. By Martin von Gagern on 2010-03-25

Mention fix for #513322 in NEWS.

4085. By Martin von Gagern on 2010-03-25

Added basic test cases for GNU Changelog format.

4086. By Martin von Gagern on 2010-03-25

merge from bzr.dev

[Martin von Gagern (gagern)]

NEWS and test cases added.

Problem with NEWS changes is that they tend to cause merge conflicts. I'd appreciate if you could merge this soon, so I won't have to track too many changes from bzr.dev.

[Robert Collins (lifeless)]

On Thu, 2010-03-25 at 09:30 +0000, Martin von Gagern wrote:
> NEWS and test cases added.
>
> Problem with NEWS changes is that they tend to cause merge conflicts.

configure the newsmerge plugin, and that should go away ;)

-Rob

[Martin von Gagern (gagern)]

@Rob: Thanks for the tip. PQM uses the news_merge plugin?
Launchpad at least doesn't, which made me file bug 546899 for it.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin von Gagern wrote:
> @Rob: Thanks for the tip. PQM uses the news_merge plugin?
> Launchpad at least doesn't, which made me file bug 546899 for it.

I believe PQM does not yet use it. When you say "Launchpad" you mean for
code review? At least for me, I've learned to ignore those conflicts,
and just focus on the content. But I'm used to NEWS conflicting all the
time.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkurlI4ACgkQJdeBCYSNAANKLACdFEwbb3L19+dThd7XR6UTsw1m
qd4AoIp/xxbnmiKsTwAqngl83XDO/Xzz
=Ij0f
-----END PGP SIGNATURE-----

Unmerged revisions

=== modified file 'NEWS'
--- NEWS	2010-03-24 13:58:37 +0000
+++ NEWS	2010-03-25 08:30:53 +0000
@@ -167,6 +167,9 @@
   better with sudo.
   (Parth Malwankar, #376388)
 
+* Use first apparent author not committer in GNU Changelog format.
+  (Martin von Gagern, #513322)
+
 API Changes
 ***********
 

=== modified file 'bzrlib/log.py'
--- bzrlib/log.py	2010-03-19 10:16:06 +0000
+++ bzrlib/log.py	2010-03-25 08:30:53 +0000
@@ -1679,7 +1679,7 @@
                                self.show_timezone,
                                date_fmt='%Y-%m-%d',
                                show_offset=False)
-        committer_str = revision.rev.committer.replace (' <', '  <')
+        committer_str = revision.rev.get_apparent_authors()[0].replace (' <', '  <')
         to_file.write('%s  %s\n\n' % (date_str,committer_str))
 
         if revision.delta is not None and revision.delta.has_changed():

=== modified file 'bzrlib/tests/test_log.py'
--- bzrlib/tests/test_log.py	2010-02-23 07:43:11 +0000
+++ bzrlib/tests/test_log.py	2010-03-25 08:30:53 +0000
@@ -877,6 +877,43 @@
             formatter_kwargs=dict(levels=0))
 
 
+class TestGnuChangelogFormatter(TestCaseForLogFormatter):
+
+    def test_gnu_changelog(self):
+        wt = self.make_standard_commit('nicky', authors=[])
+        self.assertFormatterResult('''\
[phone]  Lorem Ipsum  <[e-mail]>
+
+\tadd a
+
+''',
+            wt.branch, log.GnuChangelogLogFormatter)
+
+    def test_with_authors(self):
+        wt = self.make_standard_commit('nicky',
+            authors=['Fooa Fooz <[e-mail]>',
+                     'Bari Baro <[e-mail]>'])
+        self.assertFormatterResult('''\
[phone]  Fooa Fooz  <[e-mail]>
+
+\tadd a
+
+''',
+            wt.branch, log.GnuChangelogLogFormatter)
+
+    def test_verbose(self):
+        wt = self.make_standard_commit('nicky')
+        self.assertFormatterResult('''\
[phone]  John Doe  <[e-mail]>
+
+\t* a:
+
+\tadd a
+
+''',
+            wt.branch, log.GnuChangelogLogFormatter,
+            show_log_kwargs=dict(verbose=True))
+
 class TestGetViewRevisions(tests.TestCaseWithTransport, TestLogMixin):
 
     def _get_view_revisions(self, *args, **kwargs):