[MERGE][Bug #52479] Message at the end of commit for bound branches
Daniel Watkins
D.M.Watkins at warwick.ac.uk
Sat Aug 25 20:14:51 BST 2007
If a branch is bound, this bundle adds details of its master branch to
the 'Committed revision...' message.
--
Daniel Watkins (Odd_Bloke) <D.M.Watkins at warwick.ac.uk>
University of Warwick Christian Focus President
University of Warwick Computing Society WUGLUG Liaison Officer
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: d.m.watkins at warwick.ac.uk-20070825190351-\
# qbjrmoovuuln2m3k
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: 7aa74d1e97bcab0b9b5d3bc50c4a57700608da27
# timestamp: 2007-08-25 21:08:23 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20070824133750-r25v5g25g1flggy6
#
# Begin patch
=== modified file 'NEWS'
--- NEWS 2007-08-24 13:02:26 +0000
+++ NEWS 2007-08-25 19:03:51 +0000
@@ -36,6 +36,9 @@
* patch verification for merge directives is reactivated, and works with
CRLF and CR files. (Aaron Bentley)
+ * The message given when committing to a bound branch now includes the
+ location of the master branch. (Daniel Watkins, #52479)
+
IMPROVEMENTS:
* ``pull`` and ``merge`` are much faster at installing bundle format 4.
=== modified file 'bzrlib/commit.py'
--- bzrlib/commit.py 2007-08-15 11:24:06 +0000
+++ bzrlib/commit.py 2007-08-25 19:01:34 +0000
@@ -89,7 +89,7 @@
def snapshot_change(self, change, path):
pass
- def completed(self, revno, rev_id):
+ def completed(self, revno, rev_id, location=None):
pass
def deleted(self, file_id):
@@ -121,8 +121,12 @@
return
self._note("%s %s", change, path)
- def completed(self, revno, rev_id):
- self._note('Committed revision %d.', revno)
+ def completed(self, revno, rev_id, location=None):
+ if location is not None:
+ location = ' to "' + location + '"'
+ else:
+ location = ''
+ self._note('Committed revision %d%s.', revno, location)
def deleted(self, file_id):
self._note('deleted %s', file_id)
@@ -320,6 +324,8 @@
self.work_tree.branch.repository.abort_write_group()
raise
+ master_location = None
+
# Upload revision data to the master.
# this will propagate merged revisions too if needed.
if self.bound_branch:
@@ -331,6 +337,7 @@
# local branch to be out of date
self.master_branch.set_last_revision_info(new_revno,
self.rev_id)
+ master_location = self.branch.get_bound_location()
# and now do the commit locally.
self.branch.set_last_revision_info(new_revno, self.rev_id)
@@ -339,7 +346,7 @@
self._set_progress_stage("Updating the working tree")
rev_tree = self.builder.revision_tree()
self.work_tree.set_parent_trees([(self.rev_id, rev_tree)])
- self.reporter.completed(new_revno, self.rev_id)
+ self.reporter.completed(new_revno, self.rev_id, master_location)
self._process_hooks(old_revno, new_revno)
finally:
self._cleanup()
=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- bzrlib/tests/blackbox/test_commit.py 2007-08-07 14:57:35 +0000
+++ bzrlib/tests/blackbox/test_commit.py 2007-08-25 19:02:06 +0000
@@ -152,6 +152,20 @@
'Committed revision 2.\n',
err)
+ def test_verbose_bound_commit_includes_master_location(self):
+ """Location of master is included when committing to bound branch"""
+ a_tree = self.make_branch_and_tree('a')
+ self.build_tree(['a/b'])
+ a_tree.add('b')
+ a_tree.commit(message='Initial message')
+
+ b_tree = a_tree.branch.create_checkout('b')
+ self.build_tree_contents([('a/b', 'foo')])
+ expected = "file://" + os.getcwd() + "/a/"
+ os.chdir('b')
+ out, err = self.run_bzr('commit -m blah --unchanged')
+ self.assertEqual(err, 'Committed revision 2 to "%s".\n' % expected)
+
def test_commit_merge_reports_all_modified_files(self):
# the commit command should show all the files that are shown by
# bzr diff or bzr status when committing, even when they were not
# Begin bundle
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070825/aa990144/attachment.pgp
More information about the bazaar
mailing list