Rev 2670: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository
Robert Collins
robertc at robertcollins.net
Thu Jul 19 08:01:49 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 2670
revision-id: robertc at robertcollins.net-20070719070144-g3q9sdi0ob24excv
parent: robertc at robertcollins.net-20070719012049-xgdzwfpnnmoqeqjp
parent: pqm at pqm.ubuntu.com-20070719011840-ewngzmxi6tct4vs3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Thu 2007-07-19 17:01:44 +1000
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
tools/capture_tree.py capture_tree.py-20051004100938-c7ff053182f5ae51
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
------------------------------------------------------------
revno: 2592.1.25.2.7.1.3
revision-id: pqm at pqm.ubuntu.com-20070719011840-ewngzmxi6tct4vs3
parent: pqm at pqm.ubuntu.com-20070719002624-zgt7cyq39hwp4p36
parent: robertc at robertcollins.net-20070719001750-6h1finyqxcc2rv8y
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 02:18:40 +0100
message:
(robert collins) Reduce the number of all-history lookups done by push and pull.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.1.2.1
revision-id: robertc at robertcollins.net-20070719001750-6h1finyqxcc2rv8y
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-07-19 10:17:50 +1000
message:
* ``bzr pull`` and ``bzr push`` no longer do a complete walk of the
branch revision history for ui display unless -v is supplied.
(Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.2
revision-id: pqm at pqm.ubuntu.com-20070719002624-zgt7cyq39hwp4p36
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
parent: john at arbash-meinel.com-20070718231946-w2cdi5h14cn5chfr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 01:26:24 +0100
message:
(Jelmer Vernooij) Fix bug #125955: Sanitize SSH_AUTH_SOCK environment variable
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2592.1.25.2.7.1.1.1.1
revision-id: john at arbash-meinel.com-20070718231946-w2cdi5h14cn5chfr
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
parent: jelmer at samba.org-20070714194244-l880hn3dtlrb8jum
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-07-18 18:19:46 -0500
message:
(Jelmer Vernooij) Fix bug #125955: Sanitize SSH_AUTH_SOCK environment variable
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2592.1.25.4.1
revision-id: jelmer at samba.org-20070714194244-l880hn3dtlrb8jum
parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: selftest-sanitize
timestamp: Sat 2007-07-14 22:42:44 +0300
message:
Sanitize SSH_AUTH_SOCK environment variable (#125955).
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2592.1.25.2.7.1.1
revision-id: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
parent: pqm at pqm.ubuntu.com-20070717110203-zzmtp28nunhsoz12
parent: dato at net.com.org.es-20070717134745-lex7ggja6p08kzts
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-17 19:03:33 +0100
message:
(Adeodato Simó) Lose python2.4-specific shebangs; Use generic 'python' instead
modified:
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
tools/capture_tree.py capture_tree.py-20051004100938-c7ff053182f5ae51
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
------------------------------------------------------------
revno: 2592.1.25.2.7.2.1
revision-id: dato at net.com.org.es-20070717134745-lex7ggja6p08kzts
parent: pqm at pqm.ubuntu.com-20070717110203-zzmtp28nunhsoz12
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.no_python2.4_shebangs
timestamp: Tue 2007-07-17 15:47:45 +0200
message:
Loose python2.4-specific shebangs; use generic python instead.
modified:
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
tools/capture_tree.py capture_tree.py-20051004100938-c7ff053182f5ae51
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
=== modified file 'NEWS'
--- a/NEWS 2007-07-18 06:07:39 +0000
+++ b/NEWS 2007-07-19 07:01:44 +0000
@@ -30,6 +30,10 @@
succeed even if pyrex is not available.
(John Arbash Meinel)
+ * ``bzr pull`` and ``bzr push`` no longer do a complete walk of the
+ branch revision history for ui display unless -v is supplied.
+ (Robert Collins)
+
LIBRARY API BREAKS:
* Deprecated dictionary ``bzrlib.option.SHORT_OPTIONS`` removed.
@@ -75,6 +79,9 @@
``--keep-output`` options, which are obsolete now that tests
are done within directories in $TMPDIR. (Martin Pool)
+ * The SSH_AUTH_SOCK environment variable is now reset to avoid
+ interaction with any running ssh agents. (Jelmer Vernooij, #125955)
+
bzr 0.18 2007-07-17
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-07-13 05:09:43 +0000
+++ b/bzrlib/builtins.py 2007-07-19 00:17:50 +0000
@@ -633,7 +633,8 @@
raise errors.BzrCommandError(
'bzr pull --revision takes one value.')
- old_rh = branch_to.revision_history()
+ if verbose:
+ old_rh = branch_to.revision_history()
if tree_to is not None:
result = tree_to.pull(branch_from, overwrite, revision_id,
delta._ChangeReporter(unversioned_filter=tree_to.is_ignored))
@@ -735,7 +736,8 @@
# Found a branch, so we must have found a repository
repository_to = br_to.repository
push_result = None
- old_rh = []
+ if verbose:
+ old_rh = []
if dir_to is None:
# The destination doesn't exist; create it.
# XXX: Refactor the create_prefix/no_create_prefix code into a
@@ -791,7 +793,8 @@
# we don't need to successfully push because of possible divergence.
if br_from.get_push_location() is None or remember:
br_from.set_push_location(br_to.base)
- old_rh = br_to.revision_history()
+ if verbose:
+ old_rh = br_to.revision_history()
try:
try:
tree_to = dir_to.open_workingtree()
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2007-07-18 06:07:39 +0000
+++ b/bzrlib/tests/__init__.py 2007-07-19 07:01:44 +0000
@@ -1081,6 +1081,8 @@
'BZREMAIL': None, # may still be present in the environment
'EMAIL': None,
'BZR_PROGRESS_BAR': None,
+ # SSH Agent
+ 'SSH_AUTH_SOCK': None,
# Proxies
'http_proxy': None,
'HTTP_PROXY': None,
=== modified file 'bzrlib/tests/test_weave.py'
--- a/bzrlib/tests/test_weave.py 2006-10-11 23:08:27 +0000
+++ b/bzrlib/tests/test_weave.py 2007-07-17 13:47:45 +0000
@@ -1,5 +1,3 @@
-#! /usr/bin/python2.4
-
# Copyright (C) 2005 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
=== modified file 'tools/capture_tree.py'
--- a/tools/capture_tree.py 2005-10-04 11:13:33 +0000
+++ b/tools/capture_tree.py 2007-07-17 13:47:45 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2.4
+#! /usr/bin/env python
# Copyright (C) 2005 Canonical Ltd
=== modified file 'tools/rst2prettyhtml.py'
--- a/tools/rst2prettyhtml.py 2006-11-10 02:34:00 +0000
+++ b/tools/rst2prettyhtml.py 2007-07-17 13:47:45 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python
import errno
import os
=== modified file 'tools/trace-revisions'
--- a/tools/trace-revisions 2005-11-07 16:21:12 +0000
+++ b/tools/trace-revisions 2007-07-17 13:47:45 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2.4
+#! /usr/bin/env python
import sys
More information about the bazaar-commits
mailing list