Rev 2968: start new development cycle; deprecate osutils.backup_file in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Nov 6 07:06:25 GMT 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2968
revision-id: pqm at pqm.ubuntu.com-20071106070621-hu1s7o5fphvhxw8m
parent: pqm at pqm.ubuntu.com-20071105211156-bwx6vf8f88m247cy
parent: bialix at ukr.net-20071106061919-oh3ozp9dtsv6m71o
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-11-06 07:06:21 +0000
message:
start new development cycle; deprecate osutils.backup_file
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
------------------------------------------------------------
revno: 2955.3.4
merged: bialix at ukr.net-20071106061919-oh3ozp9dtsv6m71o
parent: bialix at ukr.net-20071105091526-mij79p3wid1tybd0
parent: pqm at pqm.ubuntu.com-20071105211156-bwx6vf8f88m247cy
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: deprecate.osutils.backup_file
timestamp: Tue 2007-11-06 08:19:19 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2955.3.3
merged: bialix at ukr.net-20071105091526-mij79p3wid1tybd0
parent: bialix at ukr.net-20071104114530-30jl2zjawaxe375f
parent: pqm at pqm.ubuntu.com-20071104235617-jz5b1yxe61q2jjfp
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: deprecate.osutils.backup_file
timestamp: Mon 2007-11-05 11:15:26 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2955.3.2
merged: bialix at ukr.net-20071104114530-30jl2zjawaxe375f
parent: bialix at ukr.net-20071102084510-ngqdd24hjhfdkgw3
parent: pqm at pqm.ubuntu.com-20071104041002-f0vk33xqo463lnt6
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: deprecate.osutils.backup_file
timestamp: Sun 2007-11-04 13:45:30 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2955.3.1
merged: bialix at ukr.net-20071102084510-ngqdd24hjhfdkgw3
parent: pqm at pqm.ubuntu.com-20071031141102-b5664t8izotfnc6h
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: deprecate.osutils.backup_file
timestamp: Fri 2007-11-02 10:45:10 +0200
message:
start 0.93 development cycle; deprecate osutils.backup_file
=== modified file 'NEWS'
--- a/NEWS 2007-11-05 21:11:56 +0000
+++ b/NEWS 2007-11-06 06:19:19 +0000
@@ -10,6 +10,67 @@
NOTES WHEN UPGRADING:
CHANGES:
+
+ FEATURES:
+
+ * New ``authentication.conf`` file holding the password or other credentials
+ for remote servers. This can be used for ssh, sftp, smtp and other
+ supported transports.
+ (Vincent Ladeuil)
+
+ PERFORMANCE:
+
+ * Commit updates the state of the working tree via a delta rather than
+ supplying entirely new basis trees. For commit of a single specified file
+ this reduces the wall clock time for commit by roughly a 30%.
+ (Robert Collins, Martin Pool)
+
+ * Fetch with pack repositories will no longer read the entire history graph.
+ (Robert Collins, #88319)
+
+ * Revert takes out an appropriate lock when reverting to a basis tree, and
+ does not read the basis inventory twice. (Robert Collins)
+
+ IMPROVEMENTS:
+
+ DOCUMENTATION:
+
+ BUG FIXES:
+
+ * A progress bar has been added for knitpack -> knitpack fetching.
+ (Robert Collins, #157789)
+
+ * Do no use timeout in HttpServer anymore.
+ (Vincent Ladeuil, #158972).
+
+ * Don't catch the exceptions related to the http pipeline status before
+ retrying an http request or some programming errors may be masked.
+ (Vincent Ladeuil, #160012)
+
+ * Don't use timeout in HttpServer anymore.
+ (Vincent Ladeuil, #158972).
+
+ * Reconcile now shows progress bars. (Robert Collins, #159351)
+
+ * Wrap medusa ftp test server as an FTPServer feature.
+ (Vincent Ladeuil, #157752)
+
+ API BREAKS:
+
+ * ``osutils.backup_file`` is deprecated. Actually it's not used in bzrlib
+ during very long time. (Alexander Belchenko)
+
+ INTERNALS:
+
+ TESTING:
+
+
+bzr 0.92rc1 2007-10-29
+======================
+
+ NOTES WHEN UPGRADING:
+
+ CHANGES:
* ``bzr`` now returns exit code 4 if an internal error occurred, and
3 if a normal error occurred. (Martin Pool)
@@ -30,11 +91,6 @@
FEATURES:
- * New ``authentication.conf`` file holding the password or other credentials
- for remote servers. This can be used for ssh, sftp, smtp and other
- supported transports.
- (Vincent Ladeuil)
-
* New ``knitpack-experimental`` repository format. This is interoperable with
the ``dirstate-tags`` format but uses a smarter storage design that greatly
speeds up many operations, both local and remote. This new format can be
@@ -68,19 +124,11 @@
* Commit no longer checks for new text keys during insertion when the
revision id was deterministically unique. (Robert Collins)
- * Commit updates the state of the working tree via a delta rather than
- supplying entirely new basis trees. For commit of a single specified file
- this reduces the wall clock time for commit by roughly a 30%.
- (Robert Collins, Martin Pool)
-
* Committing a change which is not a merge and does not change the number of
files in the tree is faster by utilising the data about whether files are
changed to determine if the tree is unchanged rather than recalculating
it at the end of the commit process. (Robert Collins)
- * Fetch with pack repositories will no longer read the entire history graph.
- (Robert Collins, #88319)
-
* Inventory serialisation no longer double-sha's the content.
(Robert Collins)
@@ -95,9 +143,6 @@
* Partial commits are now approximately 40% faster by walking over the
unselected current tree more efficiently. (Robert Collins)
- * Revert takes out an appropriate lock when reverting to a basis tree, and
- does not read the basis inventory twice. (Robert Collins)
-
* XML inventory serialisation takes 20% less time while being stricter about
the contents. (Robert Collins)
@@ -130,20 +175,10 @@
BUG FIXES:
- * A progress bar has been added for knitpack -> knitpack fetching.
- (Robert Collins, #157789)
-
* Connection error reporting for the smart server has been fixed to
display a user friendly message instead of a traceback.
(Ian Clatworthy, #115601)
- * Don't catch the exceptions related to the http pipeline status before
- retrying an http request or some programming errors may be masked.
- (Vincent Ladeuil, #160012)
-
- * Don't use timeout in HttpServer anymore.
- (Vincent Ladeuil, #158972).
-
* Make sure to use ``O_BINARY`` when opening files to check their
sha1sum. (Alexander Belchenko, John Arbash Meinel, #153493)
@@ -205,8 +240,6 @@
directory to detect leaking tests.
(Vincent Ladeuil, #147986)
- * Reconcile now shows progress bars. (Robert Collins, #159351)
-
* The basename, not the full path, is now used when checking whether
the profiling dump file begins with ``callgrind.out`` or not. This
fixes a bug reported by Aaron Bentley on IRC. (Ian Clatworthy)
@@ -217,9 +250,6 @@
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
new path causes bzr to be unable to access the file. (Robert Collins)
- * Wrap medusa ftp test server as an FTPServer feature.
- (Vincent Ladeuil, #157752)
-
* Correctly detect a NoSuchFile when using a filezilla server. (Gary van der
Merwe)
=== modified file 'bzr'
--- a/bzr 2007-10-22 01:23:51 +0000
+++ b/bzr 2007-11-02 08:45:10 +0000
@@ -67,7 +67,7 @@
"\n")
raise
-if bzrlib.version_info[:3] != (0, 92, 0):
+if bzrlib.version_info[:3] != (0, 93, 0):
sys.stderr.write("bzr: WARNING: bzrlib version doesn't match the bzr program.\n"
"This may indicate an installation problem.\n"
"bzrlib from %s is version %r\n"
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2007-10-03 05:25:50 +0000
+++ b/bzrlib/__init__.py 2007-11-02 08:45:10 +0000
@@ -35,7 +35,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
-version_info = (0, 92, 0, 'dev', 0)
+version_info = (0, 93, 0, 'dev', 0)
# API compatibility version: bzrlib is currently API compatible with 0.18.
api_minimum_version = (0, 18, 0)
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py 2007-10-31 10:32:12 +0000
+++ b/bzrlib/osutils.py 2007-11-04 11:45:30 +0000
@@ -57,6 +57,7 @@
from bzrlib import symbol_versioning
from bzrlib.symbol_versioning import (
deprecated_function,
+ zero_ninetythree,
)
from bzrlib.trace import mutter
@@ -460,6 +461,7 @@
return pathjoin(F(p), e)
+ at deprecated_function(zero_ninetythree)
def backup_file(fn):
"""Copy a file to a backup.
=== modified file 'bzrlib/symbol_versioning.py'
--- a/bzrlib/symbol_versioning.py 2007-10-10 00:21:57 +0000
+++ b/bzrlib/symbol_versioning.py 2007-11-02 08:45:10 +0000
@@ -40,6 +40,7 @@
'zero_ninety',
'zero_ninetyone',
'zero_ninetytwo',
+ 'zero_ninetythree',
]
from warnings import warn
@@ -61,6 +62,7 @@
zero_ninety = "%s was deprecated in version 0.90."
zero_ninetyone = "%s was deprecated in version 0.91."
zero_ninetytwo = "%s was deprecated in version 0.92."
+zero_ninetythree = "%s was deprecated in version 0.93."
def set_warning_method(method):
More information about the bazaar-commits
mailing list