It appears the attached patch also does the trick, but leaves the
symlink visible to the user.
Downside: Invoking WorkingTree always goes through os.path.realpath()
Cheers!
Jasper
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: file:///home/jasper/Programming/bzr-gtk/trunk/
# testament_sha1: 6148ea1be6e3c1973df1aba55b479a64296a1c74
# timestamp: 2008-07-04 22:05:33 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'olive/__init__.py'
--- olive/__init__.py 2008-07-01 21:56:25 +0000
+++ olive/__init__.py 2008-07-04 20:05:24 +0000
@@ -308,7 +308,7 @@
# We're local
try:
- self.wt, self.wtpath = WorkingTree.open_containing(path)
+ self.wt, self.wtpath = WorkingTree.open_containing(os.path.realpath(path))
except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
self.notbranch = True
@@ -1291,7 +1291,7 @@
# Try to open the working tree
notbranch = False
try:
- tree1 = WorkingTree.open_containing(path)[0]
+ tree1 = WorkingTree.open_containing(os.path.realpath(path))[0]
except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
notbranch = True
@@ -1324,6 +1324,8 @@
status = 'unknown'
fileid = ''
if not notbranch:
+ if os.path.islink(path):
+ path = os.path.realpath(path)
filename = tree1.relpath(path + os.sep + item)
try:
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXZZP14AAap/gAAURABRZ///
cpREir////BQA96RoUKUABqeo1IHpGmg0BpoAABoBoGgSk0lNM2JqPTVG1MmnqfqgNANNAADQ5gE
0wCZDAAEwTAAADmATTAJkMAATBMAAAEkgmgAKbTUwVPYU2pkZTQyeppo2p5TVdt61jvTx7G2Se22
ZOGVLbKNb4CIShtg/bGnEAiHo2sNjSokJGB5SYYi1xYRK7rCi+RNWTGHYx1py81vlnSdPSaVJi9M
EpDYntF3TCt4heCAwVFKWx9igJIh4FFTh57nJ2l5WQxvKAqFvFHfgF8IRSnMA1h91FbDIjvtn80c
cJAX3O0BHQIYGJCCUwokXLWIocIgWjyJT98xcR5cc+grrxRZoviSlaOPQ43hSTulWopUeB3FRIlg
Qxc7dx2qRprwKys9wiJCMpPqFhrE9ChBixDC0rBjqEcxoECYWWU6xgewrgcGbFzu06QKjRJxJigT
ZHNagzOaUAxxKRZV5Xwr7C0T08KzXAecS41ChWT4vUiczDtLHFi6BpOFTJYlSmXOwqPza9pxGZqe
PCBVdEpvUszuN4cZC3dGkDDYPGl9sDEX3EzDzOcMfkYjCKVOLAjvK/mUMLyYvWkCYvJNm3Vwbfqf
Hk+ZxMznyDmlXCxkx6M+a4/s5EDTP5LFT4NeWMoRTwffzji3RHwBtCIcTabT37Ut1tg8KzpOlFRC
4jNxnF+PW1h4lKjrcfAO4kEQtLuqWnTiLcKgwS+JSdDae2Nkma+EsRnFQdAjEHIqMrQgYyGU68YU
J7GMsFmLTtF4jjEsL+e06lHA52QDjzT8y07S2Kc2XQ9gp0NJtaZD9eU9+QOdEJbBgipwNUyfHVkc
jyOgxoTGu+g9iTNTSIZQUoJHoPi0Q06FCa3A18UF2FxdM1veiY/G81p5q/kK5xx2FCvP90lPaBcg
+1S4WU2yd8+xZBqoZrweOSmSkthyS397GG8/TCeWsD5TA5cPWy5QE4PLZaV/tXsFPmWSiDhgwK5o
hCLkebJbUnwGT2QyqFs2+AUm1Lc0gPBxCoYJA4PcoXjBXnEufbAzz7FH1joqAsCgpNzBXussGiEl
aZ6MaMLglUDTL3MeU4q+eVrJ9IVStB6H0e8cAgRYZMwflJ0wzSPcPCrs7VUcEDTp2FIf4DKZE/KJ
14+fCBSvDEYxdbNUNISdlyHD2kE63We71JlX9BPPLuDjTVInVcg+hHMD9xfaQpjIX1FoL+CfuB53
lvFKKyoknObDCRM//xdyRThQkHZZP14=
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
