Rev 3647: (James Westby) Give the user a bit more information about which saved in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Aug 23 19:54:53 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3647
revision-id: pqm at pqm.ubuntu.com-20080823185447-4fimhc5kjnedx6t6
parent: pqm at pqm.ubuntu.com-20080823182447-e5emry5ut2d0c3ex
parent: jelmer at samba.org-20080823175741-96tg1bbfyzp91b8s
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-08-23 19:54:47 +0100
message:
(James Westby) Give the user a bit more information about which saved
location is being used.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
------------------------------------------------------------
revno: 3645.1.1
revision-id: jelmer at samba.org-20080823175741-96tg1bbfyzp91b8s
parent: pqm at pqm.ubuntu.com-20080823174134-lx67nymraun1onby
parent: jw+debian at jameswestby.net-20080802171050-yay05j3l6yoygbxc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Sat 2008-08-23 19:57:41 +0200
message:
Merge James patch with default location notification improvements.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
------------------------------------------------------------
revno: 3596.3.1
revision-id: jw+debian at jameswestby.net-20080802171050-yay05j3l6yoygbxc
parent: pqm at pqm.ubuntu.com-20080730213059-hcremsawwvcqjcj1
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.urls
timestamp: Sat 2008-08-02 18:10:50 +0100
message:
Give the user a bit more information about which saved location is being used.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-08-23 17:53:34 +0000
+++ b/bzrlib/builtins.py 2008-08-23 18:54:47 +0000
@@ -652,7 +652,7 @@
display_url = urlutils.unescape_for_display(stored_loc,
self.outf.encoding)
if not is_quiet():
- self.outf.write("Using saved location: %s\n" % display_url)
+ self.outf.write("Using saved parent location: %s\n" % display_url)
location = stored_loc
if mergeable is not None:
@@ -801,7 +801,7 @@
else:
display_url = urlutils.unescape_for_display(stored_loc,
self.outf.encoding)
- self.outf.write("Using saved location: %s\n" % display_url)
+ self.outf.write("Using saved push location: %s\n" % display_url)
location = stored_loc
_show_push_branch(br_from, revision_id, location, self.outf,
@@ -3070,13 +3070,16 @@
Report if the remembered location was used.
"""
stored_location = tree.branch.get_submit_branch()
+ stored_location_type = "submit"
if stored_location is None:
stored_location = tree.branch.get_parent()
+ stored_location_type = "parent"
mutter("%s", stored_location)
if stored_location is None:
raise errors.BzrCommandError("No location specified or remembered")
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
- note(u"%s remembered location %s", verb_string, display_url)
+ note(u"%s remembered %s location %s", verb_string,
+ stored_location_type, display_url)
return stored_location
@@ -3341,7 +3344,8 @@
" or specified.")
display_url = urlutils.unescape_for_display(parent,
self.outf.encoding)
- self.outf.write("Using last location: " + display_url + "\n")
+ self.outf.write("Using saved parent location: "
+ + display_url + "\n")
remote_branch = Branch.open(other_branch)
if remote_branch.base == local_branch.base:
@@ -4190,21 +4194,23 @@
raise errors.BzrCommandError(
'--remember requires a branch to be specified.')
stored_submit_branch = branch.get_submit_branch()
- remembered_submit_branch = False
+ remembered_submit_branch = None
if submit_branch is None:
submit_branch = stored_submit_branch
- remembered_submit_branch = True
+ remembered_submit_branch = "submit"
else:
if stored_submit_branch is None or remember:
branch.set_submit_branch(submit_branch)
if submit_branch is None:
submit_branch = branch.get_parent()
- remembered_submit_branch = True
+ remembered_submit_branch = "parent"
if submit_branch is None:
raise errors.BzrCommandError('No submit branch known or'
' specified')
- if remembered_submit_branch:
- note('Using saved location "%s" to determine what changes to submit.', submit_branch)
+ if remembered_submit_branch is not None:
+ note('Using saved %s location "%s" to determine what '
+ 'changes to submit.', remembered_submit_branch,
+ submit_branch)
if mail_to is None:
submit_config = Branch.open(submit_branch).get_config()
=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py 2008-03-07 14:15:10 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py 2008-08-02 17:10:50 +0000
@@ -176,7 +176,7 @@
base = urlutils.local_path_from_url(branch_a.base)
self.assertStartsWith(err,
- 'Merging from remembered location %s\n' % (base,))
+ 'Merging from remembered submit location %s\n' % (base,))
self.assertEndsWith(err, '+N b\nAll changes applied successfully.\n')
self.assertEquals(abspath(branch_b.get_submit_branch()),
abspath(parent))
@@ -418,10 +418,10 @@
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
tree_c = tree_a.bzrdir.sprout('c').open_workingtree()
out, err = self.run_bzr(['merge', '-d', 'c'])
- self.assertContainsRe(err, 'Merging from remembered location .*a\/')
+ self.assertContainsRe(err, 'Merging from remembered parent location .*a\/')
tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
out, err = self.run_bzr(['merge', '-d', 'c'])
- self.assertContainsRe(err, 'Merging from remembered location .*b\/')
+ self.assertContainsRe(err, 'Merging from remembered submit location .*b\/')
def test_remember_sets_submit(self):
tree_a = self.make_branch_and_tree('a')
=== modified file 'bzrlib/tests/blackbox/test_missing.py'
--- a/bzrlib/tests/blackbox/test_missing.py 2008-05-20 18:28:59 +0000
+++ b/bzrlib/tests/blackbox/test_missing.py 2008-08-02 17:10:50 +0000
@@ -142,7 +142,7 @@
# check last location
lines, err = self.run_bzr('missing', working_dir='../b')
- self.assertEquals('Using last location: %s\n'
+ self.assertEquals('Using saved parent location: %s\n'
'Branches are up to date.\n' % location,
lines)
self.assertEquals('', err)
=== modified file 'bzrlib/tests/blackbox/test_non_ascii.py'
--- a/bzrlib/tests/blackbox/test_non_ascii.py 2008-05-21 11:40:35 +0000
+++ b/bzrlib/tests/blackbox/test_non_ascii.py 2008-08-02 17:10:50 +0000
@@ -235,7 +235,7 @@
txt = self.run_bzr_decode('pull', working_dir=dirname2)
expected = osutils.pathjoin(osutils.getcwd(), dirname1)
- self.assertEqual(u'Using saved location: %s/\n'
+ self.assertEqual(u'Using saved parent location: %s/\n'
'No revisions to pull.\n' % (expected,), txt)
self.build_tree_contents(
=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py 2008-08-20 16:14:09 +0000
+++ b/bzrlib/tests/blackbox/test_push.py 2008-08-23 17:57:41 +0000
@@ -87,7 +87,7 @@
out, err = self.run_bzr('push')
path = branch_a.get_push_location()
self.assertEquals(out,
- 'Using saved location: %s\n'
+ 'Using saved push location: %s\n'
'Pushed up to revision 2.\n'
% local_path_from_url(path))
self.assertEqual(err,
=== modified file 'bzrlib/tests/blackbox/test_send.py'
--- a/bzrlib/tests/blackbox/test_send.py 2008-03-06 05:28:23 +0000
+++ b/bzrlib/tests/blackbox/test_send.py 2008-08-02 17:10:50 +0000
@@ -56,7 +56,7 @@
self.assertContainsRe(errmsg, 'No submit branch known or specified')
os.chdir('../branch')
stdout, stderr = self.run_bzr('send -o-')
- self.assertEqual(stderr.count('Using saved location'), 1)
+ self.assertEqual(stderr.count('Using saved parent location'), 1)
br = read_bundle(StringIO(stdout))
self.assertRevisions(br, ['revision3'])
@@ -68,7 +68,7 @@
self.assertContainsRe(errmsg, 'No submit branch known or specified')
os.chdir('../branch')
stdout, stderr = self.run_bzr('bundle')
- self.assertEqual(stderr.count('Using saved location'), 1)
+ self.assertEqual(stderr.count('Using saved parent location'), 1)
br = read_bundle(StringIO(stdout))
self.assertRevisions(br, ['revision3'])
=== modified file 'doc/en/mini-tutorial/index.txt'
--- a/doc/en/mini-tutorial/index.txt 2008-03-13 17:23:40 +0000
+++ b/doc/en/mini-tutorial/index.txt 2008-08-02 17:10:50 +0000
@@ -225,7 +225,7 @@
the parent into your personal branch::
$ bzr merge
- Using saved location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
+ Merging from saved parent location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
All changes applied successfully.
Check what has changed::
@@ -254,7 +254,7 @@
Replacing ``mycode.patch``, create your merge directive::
$ bzr send -o mycode.patch
- Using saved location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
+ Using saved parent location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
You can now email the merge directive to the bzr-gtk project who, if
they choose, can use it merge your work back into the parent branch.
=== modified file 'doc/es/mini-tutorial/index.txt'
--- a/doc/es/mini-tutorial/index.txt 2008-05-04 18:21:39 +0000
+++ b/doc/es/mini-tutorial/index.txt 2008-08-02 17:10:50 +0000
@@ -228,7 +228,7 @@
desde el principal dentro de su branch personal::
$ bzr merge
- Using saved location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
+ Merging from saved parent location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
All changes applied successfully.
Compruebe qué ha cambiado::
@@ -256,7 +256,7 @@
Sustituyendo ``mycode.patch``, cree su instrucción merge::
$ bzr send -o mycode.patch
- Using saved location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
+ Using saved parent location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
Ahora puede enviar por email la instruccion merge al proyecto bzr-gtk
quien, si asà lo quieren, pueden utilizarla para integrar su trabajo
More information about the bazaar-commits
mailing list