[Pkg-bazaar-commits] ./bzr-gtk/unstable r616: Merge symlinks patch from Gediminas.
Jelmer Vernooij
jelmer at samba.org
Fri Apr 10 07:50:57 UTC 2009
------------------------------------------------------------
revno: 616
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-10-28 16:11:19 +0100
message:
Merge symlinks patch from Gediminas.
modified:
olive/__init__.py
------------------------------------------------------------
revno: 437.2.1
committer: Gediminas Paulauskas <menesis at pov.lt>
branch nick: bzr-gtk
timestamp: Wed 2008-07-09 21:25:06 +0300
message:
Use os.path.join
modified:
olive/__init__.py
------------------------------------------------------------
revno: 437.2.2
committer: Gediminas Paulauskas <menesis at pov.lt>
branch nick: bzr-gtk
timestamp: Wed 2008-07-09 21:32:14 +0300
message:
Use os.lstat rather than os.stat to report the right info about links.
modified:
olive/__init__.py
------------------------------------------------------------
revno: 437.2.3
committer: Gediminas Paulauskas <menesis at pov.lt>
branch nick: bugfix-229044
timestamp: Fri 2008-07-11 20:23:27 +0300
message:
Remove workaround for infinite loops, doesn't happen with lstat
modified:
olive/__init__.py
------------------------------------------------------------
revno: 437.2.4
committer: Gediminas Paulauskas <menesis at pov.lt>
branch nick: bugfix-229044
timestamp: Thu 2008-07-31 12:12:17 +0300
message:
Merge trunk -r543 to replace the alternative bugfix.
removed:
tests/test_tortoise_bzr.py
tortoise-bzr.py
added:
bzr-gtk.applications
bzr-handle-patch.desktop
bzr-notify
create-credits.py
icons/bug.png
icons/commit.svg
icons/commit16.svg
icons/diff16.svg
icons/emblem-bzr-added.svg
icons/emblem-bzr-conflict.svg
icons/emblem-bzr-controlled.svg
icons/emblem-bzr-modified.svg
icons/emblem-bzr-removed.svg
icons/sign-bad.png
icons/sign-ok.png
icons/sign-unknown.png
icons/sign.png
icons/tag-16.png
olive-gtk.1
po/ca.po
po/cs.po
po/de.po
po/en_GB.po
po/es.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ku.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sr.po
po/sv.po
preferences/
preferences/identity.py
preferences/plugins.py
seahorse.py
search.py
tests/test_linegraph.py
renamed:
bzr-icon-64.png => icons/bzr-icon-64.png
handle-patch => bzr-handle-patch
preferences.py => preferences/__init__.py
modified:
.bzrignore
AUTHORS
HACKING
NEWS
README
__init__.py
about.py
annotate/gannotate.py
branch.py
branchbox.py
branchview/graphcell.py
branchview/linegraph.py
branchview/treemodel.py
branchview/treeview.py
bzr-notify.desktop
checkout.py
commit.py
conflicts.py
diff.py
errors.py
genpot.sh
icons/commit.png
icons/commit16.png
icons/diff.png
icons/diff16.png
icons/log.png
icons/log16.png
icons/pull.png
icons/pull16.png
icons/push.png
icons/push16.png
icons/refresh.png
initialize.py
merge.py
mergedirective.py
nautilus-bzr.py
olive-gtk.desktop
olive.glade
olive/__init__.py
olive/add.py
olive/bookmark.py
olive/guifiles.py
olive/info.py
olive/menu.py
olive/mkdir.py
olive/move.py
olive/remove.py
olive/rename.py
po/olive-gtk.pot
push.py
revbrowser.py
revisionmenu.py
revisionview.py
setup.py
status.py
tags.py
tests/__init__.py
tests/test_commit.py
tests/test_diff.py
ui.py
viz/branchwin.py
bzr-handle-patch
preferences/__init__.py
------------------------------------------------------------
revno: 580.3.1
committer: Gediminas Paulauskas <menesis at pov.lt>
branch nick: menesis-dev
timestamp: Thu 2008-07-31 12:13:58 +0300
message:
Merge symlinks fix.
modified:
olive/__init__.py
------------------------------------------------------------
revno: 580.3.2
committer: Gediminas Paulauskas <menesis at pov.lt>
branch nick: menesis-dev
timestamp: Fri 2008-08-08 13:59:49 +0300
message:
Merge trunk.
added:
loom.py
modified:
NEWS
__init__.py
branchview/treeview.py
commit.py
olive-gtk
olive-gtk.desktop
olive/__init__.py
olive/info.py
olive/window.py
setup.py
viz/branchwin.py
-------------- next part --------------
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py 2008-08-17 14:06:12 +0000
+++ b/olive/__init__.py 2008-10-28 15:11:19 +0000
@@ -133,9 +133,6 @@
self.combobox_drive.show()
self.gen_hard_selector()
- # Acceptable errors when loading files/folders in the treeviews
- self.acceptable_errors = (errno.ENOENT, errno.ELOOP)
-
self.refresh_left()
# Apply menu state
@@ -876,7 +873,7 @@
self.pref.write()
self.window.destroy()
-
+
def get_selected_fileid(self):
""" Get the file_id of the selected file. """
treeselection = self.window.treeview_right.get_selection()
@@ -967,7 +964,7 @@
for item in os.listdir(path):
if not dotted_files and item[0] == '.':
continue
- if os.path.isdir(path + os.sep + item):
+ if os.path.isdir(os.path.join(path, item)):
dirs.append(item)
else:
files.append(item)
@@ -1003,13 +1000,7 @@
if not ignored_files and status == 'ignored':
continue
- try:
- statinfo = os.stat(self.path + os.sep + item)
- except OSError, e:
- if e.errno in self.acceptable_errors:
- continue
- else:
- raise
+ statinfo = os.lstat(os.path.join(self.path, item))
liststore.append([ gtk.STOCK_DIRECTORY,
True,
item,
@@ -1031,13 +1022,7 @@
if not ignored_files and status == 'ignored':
continue
- try:
- statinfo = os.stat(self.path + os.sep + item)
- except OSError, e:
- if e.errno in self.acceptable_errors:
- continue
- else:
- raise
+ statinfo = os.lstat(os.path.join(self.path, item))
liststore.append([gtk.STOCK_FILE,
False,
item,
More information about the Pkg-bazaar-commits
mailing list