Rev 4082: (Kent Gibson) Downgrade message that transport cannot update working in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Mar 5 21:24:36 GMT 2009


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4082
revision-id: pqm at pqm.ubuntu.com-20090305212433-54adz2sk2taghu7d
parent: pqm at pqm.ubuntu.com-20090305091217-h813qd8f83wghtpr
parent: jelmer at samba.org-20090305204429-tl03ecs7gw8y0err
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-03-05 21:24:33 +0000
message:
  (Kent Gibson) Downgrade message that transport cannot update working
  	tree from warning to note.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
    ------------------------------------------------------------
    revno: 4070.6.3
    revision-id: jelmer at samba.org-20090305204429-tl03ecs7gw8y0err
    parent: jelmer at samba.org-20090305200557-zp2x3ihb4n40u7zf
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: quiet-push
    timestamp: Thu 2009-03-05 21:44:29 +0100
    message:
      Fix syntax in NEWS.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 4070.6.2
    revision-id: jelmer at samba.org-20090305200557-zp2x3ihb4n40u7zf
    parent: warthog618 at gmail.com-20090303082142-3ehzbm9adg2dnwp7
    parent: pqm at pqm.ubuntu.com-20090305091217-h813qd8f83wghtpr
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: quiet-push
    timestamp: Thu 2009-03-05 21:05:57 +0100
    message:
      Merge bzr.dev.
    added:
      doc/developers/ec2-windows.txt ec2windows.txt-20090219062112-2ga0nqpcm7n02njf-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/branchbuilder.py        branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
      bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
      bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
      bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
      bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
      bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
      bzrlib/tests/branch_implementations/test_last_revision_info.py test_last_revision_i-20070201133317-51mzi40m8hv1i0i9-1
      bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
      bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
      bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
      bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
      bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
      bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
      bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
      bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
      bzrlib/transport/trace.py      trace.py-20070828055009-7kt0bbc4t4b92apz-1
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
      doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
      doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
      doc/developers/revision-properties.txt revisionproperties.t-20070807133526-w57m8zv5o7t5kugm-1
      doc/developers/testing.txt     testing.txt-20080812140359-i70zzh6v2z7grqex-1
      doc/en/user-guide/recording_changes.txt recording_changes.tx-20071121073725-0corxykv5irjal00-4
    ------------------------------------------------------------
    revno: 4070.6.1
    revision-id: warthog618 at gmail.com-20090303082142-3ehzbm9adg2dnwp7
    parent: pqm at pqm.ubuntu.com-20090302155409-89pygn9tisbc0lir
    committer: Kent Gibson <warthog618 at gmail.com>
    branch nick: lp221461
    timestamp: Tue 2009-03-03 17:21:42 +0900
    message:
      Downgrade message that transport cannot update working tree from warning to note.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
=== modified file 'NEWS'
--- a/NEWS	2009-03-05 09:12:17 +0000
+++ b/NEWS	2009-03-05 20:44:29 +0000
@@ -110,6 +110,9 @@
       when needed.
       (Vincent Ladeuil)
 
+    * Make ``bzr push --quiet <non-local location>`` less chatty.
+      (Kent Gibson, #221461)
+
   DOCUMENTATION:
 
     * The documentation for ``shelve`` and ``unshelve`` has been clarified.

=== modified file 'bzrlib/push.py'
--- a/bzrlib/push.py	2009-02-25 15:36:48 +0000
+++ b/bzrlib/push.py	2009-03-03 08:21:42 +0000
@@ -149,9 +149,9 @@
             try:
                 tree_to = dir_to.open_workingtree()
             except errors.NotLocalUrl:
-                warning("This transport does not update the working "
-                        "tree of: %s. See 'bzr help working-trees' for "
-                        "more information." % br_to.base)
+                note("This transport does not update the working "
+                     "tree of: %s. See 'bzr help working-trees' for "
+                     "more information." % br_to.base)
                 push_result = br_from.push(br_to, overwrite,
                                            stop_revision=revision_id)
             except errors.NoWorkingTree:




More information about the bazaar-commits mailing list