Rev 513: Fix another use of smart_add. in file:///data/jelmer/bzr-gtk/trunk/
Jelmer Vernooij
jelmer at samba.org
Sun Jun 29 19:32:06 BST 2008
At file:///data/jelmer/bzr-gtk/trunk/
------------------------------------------------------------
revno: 513
revision-id: jelmer at samba.org-20080629183205-mmj1fnd8t9l80czj
parent: jelmer at samba.org-20080629183129-syqvz3xm5gqagzsx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-06-29 20:32:05 +0200
message:
Fix another use of smart_add.
modified:
NEWS news-20070325173539-3va57o99cz3o57xe-1
olive/add.py add.py-20060721181724-0mfkrqwpsa09q1t3-1
=== modified file 'NEWS'
--- a/NEWS 2008-06-29 18:31:29 +0000
+++ b/NEWS 2008-06-29 18:32:05 +0000
@@ -10,7 +10,7 @@
* Fixed adding tags. (Javier Derderian, #228709)
- * Avoid use of removed smart_add. (Jelmer Vernooij, #244025)
+ * Avoid use of removed smart_add. (Jelmer Vernooij, #244025, #244027)
INTERNALS
=== modified file 'olive/add.py'
--- a/olive/add.py 2008-05-05 18:16:46 +0000
+++ b/olive/add.py 2008-06-29 18:32:05 +0000
@@ -69,20 +69,16 @@
_i18n('Please select a file from the list,\nor choose the other option.'))
return
- fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
-
try:
- bzrlib.add.smart_add([fullpath])
+ self.wt.add([filename])
except errors.NotBranchError:
error_dialog(_i18n('Directory is not a branch'),
_i18n('You can perform this action only in a branch.'))
return
elif radio_unknown.get_active():
# Add unknown files recursively
- fullpath = self.wt.abspath(self.wtpath)
-
try:
- bzrlib.add.smart_add([fullpath], True)
+ self.wt.add(self.wt.unknowns())
except errors.NotBranchError:
error_dialog(_i18n('Directory is not a branch'),
_i18n('You can perform this action only in a branch.'))
More information about the bazaar-commits
mailing list