[MERGE][Bug #52479] Message at the end of commit for bound branches
Daniel Watkins
D.M.Watkins at warwick.ac.uk
Sun Aug 26 11:24:18 BST 2007
On Sun, 2007-08-26 at 10:41 +1000, Andrew Bennetts wrote:
> > + def test_verbose_bound_commit_includes_master_location(self):
> > + """Location of master is included when committing to bound branch"""
>
> I think “is displayed” would be clearer here than “is included”. “is included”
> makes me wonder “included where? In the revision data?”.
Fixed.
> Why do you call “self.build_tree_contents([('a/b', 'foo')])”? It seems to have
> no relevance to the rest of the test.
I'm not entirely sure. Removed.
> You can just use “expected = self.get_url('a')” here.
Changed.
> Also, you can use “self.run_bzr(..., working_dir='b')” rather than calling
> os.chdir.
Done.
--
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-20070826102337-\
# k3rdbih0a0a4rzyz
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: 1a8a7892ffd5fa907de77cd72ec1dfbaf77e3719
# timestamp: 2007-08-26 12:23:47 +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-26 10:23:37 +0000
@@ -152,6 +152,18 @@
'Committed revision 2.\n',
err)
+ def test_verbose_bound_commit_includes_master_location(self):
+ """Location of master is displayed 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')
+ expected = self.get_url('a') + "/"
+ out, err = self.run_bzr('commit -m blah --unchanged', working_dir='b')
+ 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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
woSGlTCOOA==
-------------- 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/20070826/90b919ef/attachment-0001.pgp
More information about the bazaar
mailing list