Rev 645: Merge trunk after parent location update in lp:~vila/bzr/bzrtools/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri May 23 18:27:06 BST 2008
At lp:~vila/bzr/bzrtools/
------------------------------------------------------------
revno: 645
revision-id: v.ladeuil+lp at free.fr-20080523172705-7hqy20i4uqn95myv
parent: v.ladeuil+lp at free.fr-20080523134903-l5a7vtw7nsg7awi5
parent: aaron at aaronbentley.com-20080523034230-q1maqg4twapv0r58
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzrtools
timestamp: Fri 2008-05-23 19:27:05 +0200
message:
Merge trunk after parent location update
modified:
NEWS NEWS-20050607185005-1d99ddda6117a97e
bzrtools.py scriptlib.py-20050501073634-776a13caa8838cf4
graph.py graph.py-20050830163250-0e1e9231f278d221
------------------------------------------------------------
revno: 642.1.6
revision-id: aaron at aaronbentley.com-20080523034230-q1maqg4twapv0r58
parent: aaron at aaronbentley.com-20080523034217-culoxoicmtmrf1zk
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzrtools
timestamp: Thu 2008-05-22 23:42:30 -0400
message:
Fix deprecations
modified:
bzrtools.py scriptlib.py-20050501073634-776a13caa8838cf4
------------------------------------------------------------
revno: 642.1.5
revision-id: aaron at aaronbentley.com-20080523034217-culoxoicmtmrf1zk
parent: aaron at aaronbentley.com-20080522181520-kh4qk72dr40m4u7x
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzrtools
timestamp: Thu 2008-05-22 23:42:17 -0400
message:
More import tweaks
modified:
graph.py graph.py-20050830163250-0e1e9231f278d221
------------------------------------------------------------
revno: 642.1.4
revision-id: aaron at aaronbentley.com-20080522181520-kh4qk72dr40m4u7x
parent: aaron at aaronbentley.com-20080522180956-b13k49k1iwtrqpa1
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzrtools
timestamp: Thu 2008-05-22 14:15:20 -0400
message:
More import fixes
modified:
graph.py graph.py-20050830163250-0e1e9231f278d221
------------------------------------------------------------
revno: 642.1.3
revision-id: aaron at aaronbentley.com-20080522180956-b13k49k1iwtrqpa1
parent: aaron at aaronbentley.com-20080512181449-g2md5ycl6rpswcyr
parent: v.ladeuil+lp at free.fr-20080522163623-lxkp5imjifx6ldi8
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzrtools
timestamp: Thu 2008-05-22 14:09:56 -0400
message:
Fix unneeded imports (vila)
modified:
graph.py graph.py-20050830163250-0e1e9231f278d221
------------------------------------------------------------
revno: 642.1.2
tags: release-1.5.0
revision-id: aaron at aaronbentley.com-20080512181449-g2md5ycl6rpswcyr
parent: aaron at aaronbentley.com-20080512181405-pmfb096fgrqjq5ma
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzrtools
timestamp: Mon 2008-05-12 14:14:49 -0400
message:
Update NEWS
modified:
NEWS NEWS-20050607185005-1d99ddda6117a97e
------------------------------------------------------------
revno: 642.1.1
revision-id: aaron at aaronbentley.com-20080512181405-pmfb096fgrqjq5ma
parent: aaron at aaronbentley.com-20080512180607-dn6a55if3pk4zdju
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzrtools
timestamp: Mon 2008-05-12 14:14:05 -0400
message:
Update NEWS
modified:
NEWS NEWS-20050607185005-1d99ddda6117a97e
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2008-05-12 04:16:04 +0000
+++ b/NEWS 2008-05-12 18:14:49 +0000
@@ -1,3 +1,8 @@
+May 12 2008
+* Mark show-paths as obsolete
+* Update to avoid deprecated APIs
+* RELEASE: bzrtools 1.5.0
+
May 11 2008
* Test fixes from Alexander Belchenko
* Merge heads plugin
=== modified file 'bzrtools.py'
--- a/bzrtools.py 2008-05-12 18:06:07 +0000
+++ b/bzrtools.py 2008-05-23 03:42:30 +0000
@@ -65,7 +65,7 @@
return not delta.has_changed(), non_source
def set_push_data(tree, location):
- tree.branch.control_files.put_utf8("x-push-data", "%s\n" % location)
+ tree.branch._transport.put_bytes("x-push-data", "%s\n" % location)
def get_push_data(tree):
"""
@@ -78,10 +78,10 @@
>>> rm_tree(tree)
"""
try:
- location = tree.branch.control_files.get('x-push-data').read()
- location = location.decode('utf-8')
+ location = tree.branch._transport.get('x-push-data').read()
except NoSuchFile:
return None
+ location = location.decode('utf-8')
return location.rstrip('\n')
"""
=== modified file 'graph.py'
--- a/graph.py 2008-05-23 13:49:03 +0000
+++ b/graph.py 2008-05-23 17:27:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Aaron Bentley
+# Copyright (C) 2005, 2008 Aaron Bentley
# <aaron at aaronbentley.com>
#
# This program is free software; you can redistribute it and/or modify
@@ -14,17 +14,29 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-from bzrtools import short_committer
-from dotgraph import Node, dot_output, invoke_dot, invoke_dot_aa, NoDot, NoRsvg
-from dotgraph import RSVG_OUTPUT_TYPES, DOT_OUTPUT_TYPES, Edge, invoke_dot_html
+
+
+import time
+
from bzrlib.branch import Branch
-from bzrlib.errors import BzrCommandError, NoCommonRoot, NoSuchRevision
+from bzrlib.errors import BzrCommandError, NoSuchRevision
from bzrlib.graph import node_distances, select_farthest
from bzrlib.revision import NULL_REVISION
-import bzrlib.errors
-import re
-import os.path
-import time
+
+from bzrtools import short_committer
+from dotgraph import (
+ dot_output,
+ DOT_OUTPUT_TYPES,
+ Edge,
+ invoke_dot,
+ invoke_dot_aa,
+ invoke_dot_html,
+ Node,
+ NoDot,
+ NoRsvg,
+ RSVG_OUTPUT_TYPES,
+ )
+
mail_map = {'aaron.bentley at utoronto.ca' : 'Aaron Bentley',
'abentley at panoramicfeedback.com': 'Aaron Bentley',
More information about the bazaar-commits
mailing list