Rev 3999: Add merge indication to line format (Neil Martinsen-Burrell) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Feb 11 00:07:33 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3999
revision-id: pqm at pqm.ubuntu.com-20090211000730-hzn2dne4230w8vyv
parent: pqm at pqm.ubuntu.com-20090210201334-ovwbsvsqvsozwomf
parent: ian.clatworthy at canonical.com-20090210231720-iazeb9i4jt52ti77
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-11 00:07:30 +0000
message:
Add merge indication to line format (Neil Martinsen-Burrell)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
------------------------------------------------------------
revno: 3998.1.1
revision-id: ian.clatworthy at canonical.com-20090210231720-iazeb9i4jt52ti77
parent: pqm at pqm.ubuntu.com-20090210201334-ovwbsvsqvsozwomf
parent: nmb at wartburg.edu-20090206225956-vyvdktg2wlaqal9t
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Wed 2009-02-11 09:17:20 +1000
message:
Add merge indication to line format (Neil Martinsen-Burrell)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
------------------------------------------------------------
revno: 3983.2.2
revision-id: nmb at wartburg.edu-20090206225956-vyvdktg2wlaqal9t
parent: nmb at wartburg.edu-20090205200329-bhneu8nhzhdgv0m0
parent: pqm at pqm.ubuntu.com-20090205215322-dlhyepy2fid5i7w6
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: long-line-merge-indicators
timestamp: Fri 2009-02-06 16:59:56 -0600
message:
merged bzr.dev
modified:
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3983.2.1
revision-id: nmb at wartburg.edu-20090205200329-bhneu8nhzhdgv0m0
parent: pqm at pqm.ubuntu.com-20090205110039-w9oelsyvyx160qwy
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: long-line-merge-indicators
timestamp: Thu 2009-02-05 14:03:29 -0600
message:
add merge indication to the line format
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
=== modified file 'NEWS'
--- a/NEWS 2009-02-10 19:33:16 +0000
+++ b/NEWS 2009-02-10 23:17:20 +0000
@@ -8,12 +8,29 @@
IN DEVELOPMENT
--------------
+ COMPATIBILITY BREAKS:
+
+ * ``bzr log --line`` now indicates which revisions are merges with
+ `[merge]` after the date. Scripts which parse the output of this
+ command may need to be adjusted.
+ (Neil Martinsen-Burrell)
+
+ NEW FEATURES:
+
IMPROVEMENTS:
* ``bzr branch`` now has a ``--no-tree`` option which turns off the
generation of a working tree in the new branch.
(Daniel Watkins, John Klinger, #273993)
+ BUG FIXES:
+
+ DOCUMENTATION:
+
+ API CHANGES:
+
+ INTERNALS:
+
bzr 1.12rc1 "1234567890" 2009-02-10
-----------------------------------
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py 2009-02-08 13:33:08 +0000
+++ b/bzrlib/log.py 2009-02-10 23:17:20 +0000
@@ -1361,6 +1361,8 @@
out.append("%s:" % revno)
out.append(self.truncate(self.short_author(rev), 20))
out.append(self.date_string(rev))
+ if len(rev.parent_ids) > 1:
+ out.append('[merge]')
if tags:
tag_str = '{%s}' % (', '.join(tags))
out.append(tag_str)
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py 2009-01-31 04:17:43 +0000
+++ b/bzrlib/tests/blackbox/test_log.py 2009-02-05 20:03:29 +0000
@@ -616,7 +616,7 @@
log = normalize_log(out)
# Not supported by this formatter so expect plain output
self.assertEqualDiff(subst_dates(log), """\
-2: Lorem Ipsum 2005-11-22 merge branch 1
+2: Lorem Ipsum 2005-11-22 [merge] merge branch 1
1: Lorem Ipsum 2005-11-22 first post
""")
=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py 2009-02-08 13:33:08 +0000
+++ b/bzrlib/tests/test_log.py 2009-02-10 23:17:20 +0000
@@ -1100,7 +1100,7 @@
log.show_log(wt.branch, formatter)
self.assertEqualDiff("""\
3: Jane Foo 2005-11-22 {v1.0, v1.0rc1} rev-3
-2: Joe Foo 2005-11-22 {v0.2} rev-2
+2: Joe Foo 2005-11-22 [merge] {v0.2} rev-2
1: Joe Foo 2005-11-22 rev-1
""",
logfile.getvalue())
@@ -1177,7 +1177,7 @@
formatter = log.LineLogFormatter(to_file=logfile, levels=0)
log.show_log(wt.branch, formatter)
self.assertEqualDiff("""\
-2: Joe Foo 2005-11-22 rev-2
+2: Joe Foo 2005-11-22 [merge] rev-2
1.1.1: Joe Foo 2005-11-22 rev-merged
1: Joe Foo 2005-11-22 rev-1
""",
=== modified file 'bzrlib/tests/test_status.py'
--- a/bzrlib/tests/test_status.py 2009-01-14 03:57:48 +0000
+++ b/bzrlib/tests/test_status.py 2009-02-10 23:17:20 +0000
@@ -114,7 +114,7 @@
show_pending_merges(tree, output, verbose=True)
self.assertEqualDiff('pending merges:\n'
' Joe Foo 2007-12-04 another non-ghost\n'
- ' Joe Foo 2007-12-04 commit with ghost\n'
+ ' Joe Foo 2007-12-04 [merge] commit with ghost\n'
' (ghost) a-ghost-revision\n'
' Joe Foo 2007-12-04 a non-ghost\n',
output.getvalue())
More information about the bazaar-commits
mailing list