Sorry for again messing up. The symlink issue I fixed before bit again. :/
Jasper
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [EMAIL PROTECTED] # target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # testament_sha1: 6492a8948d9cb3db21ec7f6e24fd815c560d90d7 # timestamp: 2008-07-12 00:12:53 +0200 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # 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-11 22:11:33 +0000 @@ -998,6 +998,55 @@ # Add'em to the ListStore for item in dirs: + status = 'unknown' + fileid = '' + if not self.notbranch: + filename = self.wt.relpath(self.path + os.sep + item) + + try: + self.wt.lock_read() + + for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed: + if rpathnew == filename: + status = 'renamed' + fileid = id + for rpath, id, kind in delta.added: + if rpath == filename: + status = 'added' + fileid = id + for rpath, id, kind in delta.removed: + if rpath == filename: + status = 'removed' + fileid = id + for rpath, id, kind, text_modified, meta_modified in delta.modified: + if rpath == filename: + status = 'modified' + fileid = id + for rpath, id, kind in delta.unchanged: + if rpath == filename: + status = 'unchanged' + fileid = id + for rpath, file_class, kind, id, entry in self.wt.list_files(): + if rpath == filename and file_class == 'I': + status = 'ignored' + finally: + self.wt.unlock() + + if status == 'renamed': + st = _i18n('renamed') + elif status == 'removed': + st = _i18n('removed') + elif status == 'added': + st = _i18n('added') + elif status == 'modified': + st = _i18n('modified') + elif status == 'unchanged': + st = _i18n('unchanged') + elif status == 'ignored': + st = _i18n('ignored') + else: + st = _i18n('unknown') + try: statinfo = os.stat(self.path + os.sep + item) except OSError, e: @@ -1008,8 +1057,8 @@ liststore.append([ gtk.STOCK_DIRECTORY, True, item, - '', - '', + st, + status, "<DIR>", "<DIR>", statinfo.st_mtime, @@ -1303,6 +1352,59 @@ # Add'em to the ListStore for item in dirs: + status = 'unknown' + fileid = '' + if not notbranch: + if os.path.islink(path): + path = os.path.realpath(path) + filename = tree1.relpath(path + os.sep + item) + + try: + self.wt.lock_read() + + for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed: + if rpathnew == filename: + status = 'renamed' + fileid = id + for rpath, id, kind in delta.added: + if rpath == filename: + status = 'added' + fileid = id + for rpath, id, kind in delta.removed: + if rpath == filename: + status = 'removed' + fileid = id + for rpath, id, kind, text_modified, meta_modified in delta.modified: + if rpath == filename: + status = 'modified' + fileid = id + for rpath, id, kind in delta.unchanged: + if rpath == filename: + status = 'unchanged' + fileid = id + for rpath, file_class, kind, id, entry in self.wt.list_files(): + if rpath == filename and file_class == 'I': + status = 'ignored' + finally: + self.wt.unlock() + + if status == 'renamed': + st = _i18n('renamed') + elif status == 'removed': + st = _i18n('removed') + elif status == 'added': + st = _i18n('added') + elif status == 'modified': + st = _i18n('modified') + elif status == 'unchanged': + st = _i18n('unchanged') + elif status == 'ignored': + st = _i18n('ignored') + if not ignored_files: + continue + else: + st = _i18n('unknown') + try: statinfo = os.stat(self.path + os.sep + item) except OSError, e: @@ -1310,20 +1412,22 @@ continue else: raise - liststore.append([gtk.STOCK_DIRECTORY, - True, - item, - '', - '', - "<DIR>", - "<DIR>", - statinfo.st_mtime, - self._format_date(statinfo.st_mtime), - '']) + liststore.append([ gtk.STOCK_DIRECTORY, + True, + item, + st, + status, + "<DIR>", + "<DIR>", + statinfo.st_mtime, + self._format_date(statinfo.st_mtime), + '']) for item in files: 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 IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSAhspgABdz/gABUREzR7/// f7icKr////BgCP3yhswAABtgHtlAAAoBpKepiGnqeoGQPSAAAAAANA0AcZMmjEMTTAQMCaYIwTE0 00AGEIqZvKoAAAAAADIaaAAAACRQmqZqZGgaaZGh6gAAaAAGgADjJk0YhiaYCBgTTBGCYmmmgAwg VJIEyATTUaYJppomEU80JN6RlMjQeTUe1SuCu51u5UTzKcs6rEJmH5K/23UTAuFiN+QEtR2nYtSk yuxl1YfpHDYwRbC18c7IxiiY9F0XJaHFNpSc1Onc11cviL/XpS5VsscK8fXdjxw6ghKukhL1NkD1 YkYvsvNVB4lIxsGxVsKPqRqXbbjoo+unRXK+3dlK5Z3XymbK9Ze7H7pNiSyOD1y9JaPVRVfu5pMG HQ/ikdzNTBiS/LJ/nzs3n/xqRoTdskdeTTNr/0njmT9sbGLJ+xrpsZzTFsphRUi4lNTJwal5MrsD IYa9XY2a1lE8HCQYOHaNMY8UHx2FVgkgWELrrBQWIgPQrhtTuQaRnyMWiQJsF4EibMA0MYMYMYMY MYMoEqSZWHRUpDKveqNNLE4wShCMNicIq1Jp414fH9dTS/Hc0Uoc1kzULlHuPckuZvA8jzhinkzZ PJ6jtx19Xt8W7NxLm1DBYpsP2TFnkxMJ+Cy5kOo9XPv57rWt/VHHa+1XLnrhakqsPZjcuvWp7cGS kSvcXHUa2aXLlYZ4rtSX29RGSy8ix2sV5jmp9myNlTVTFF5fjffSatSGCZ5oo71k96Nm7K7Tz7GZ sZpT/ZVLz+hdgUYlNdbUcFz/K5Ny9ufn0vHpSZcvx5sNxk8zRxRvX2cDnz28OOJgzWRMsMUyDPSy U8zRcjtc2zNNp3mtlcwbKukzYOLNNraYTJng1GCXXX3X4KuWZLk53otG9KaOpZwcF5LlO9Y2b77c bxfXJRvRdfXG9grJXBSKUrF4zz+fNr34TrPBDmZ45mwamnUu7GF903HmamrovMy1mDFZ0uTW2pjp q6K6FSXSZnVr4MjRZu1sFR5Gm9stsxo0a25cF9LnFZyZNS9RnrTxa2bi/Bd0bCLOhtacnZks3uW5 smFL2Dqd5gk9BzZKrWX7muzaw3mtzarmKnexmRvcXJ0/BMLPUuS7t9+qKYKtF+FRVGtsrOV0O2pR vS7ccJMO837/xKU7lI+5R3vuUpSlKUpSlKUFEqSelwZlcTzqdKle2lUvqZImt+h1Ny5qWNT9Vly9 oexDhfwlJU/x+tfAXn7LCQ4HSQHXhnJFx5bTD0MpBPKBIE0GDQBynIjgikXRUFcUUt8Ii5igz9O/ Q2tZhtgxQkBrHCNefSz1oezceZOhb2NxjJXy96HFivLSJsYxzbxp07Sfu+8/JPRfEjRp0JaSTFH3 3MX4OL617Q6W1TqaIdzZPtcvik6u3NFT5NaGT8u91xqoYWfM8TBH5vJwK+cpaVwf3rUjNI1vGlKU pXZRDauvUpFxY2OWL+TJ83J7k5s41JTm1o2IrpuftsbBtHBFvRPE6IOo/MrujB22ur+Hlg6ng6Mr el61rldS5Zg63ubEeh8Fj8zHvOLel8nBo+Fnt7zwuY6+wyQAAgUASSSVLLkEkklSIVgoAAApNSyu s4sgspC9PRtttv8CajGyIyUSAsFZJQAv96zenpWRsmDPq0cSsL5gNf09G06TaaSNgdabEXMEyUJl E6ztKeh4PiuPE9/wzCOw2i4K9e90fKIfBQhbqjG2pYR4JcDbbbbcZKjLuLb2p2Hke2RcOxbmeXOT 92npIdjtWO9aWryFDfcdZK+hySeJy6a5NqORKJij0hmdXX3VZ191FFVyGGFnsI7k16QjRLSSz3yH K9/O7cmc/LDxZM3oC/zB82qc0xP617l7+M1vq7pZOw740bbPsS7WTokxuSMkNE9pqMEeUR5Qjwif cpGTjyd2T6uKUh+Cmo3snG69R9SkcTO0b0whvUkYH83YzwUU3u/RzPBKNzaNjqL32Je01KSdR8El yS5fJNpQzjpFL0uqJg+8uXRePrWhibUKfCTMuV5HoTXoqk1USpPZPSdR6UecOuXXIYTwX3Mg+SrX QrCDWO+Teea9PlgnGTGThuFjhMFzCd7vdqfVtfFwR0xeWJearGZu9beLdnXubimJomXQcVmqpJZ2 KT8ULpKi1vBktJ0rl09SUpKaibHvdDcpLmZpnuLvWik2fRwx6BoiZyZUf8daXM1KU6UmxRPNlLVK XKXyfihflisyKVlH0Ot9ex2KfLustb0TvjkeoKbEs7G4/UsWj69Kqqqqqqqvpuya2LGlyczbbbbe CnIQqZ+xkJWrMJ4C1bEroM2QNs33oYmiVi7XcWUYI8xdINJjgyjcraNTCJGPcfBgXtdbKS9NYvT3 sVpz7LGdJjsZySXnhJ/L4mV989j4p4KKacpJMEaI1ugaJsPkeYP0XG5cqUr5lnvO0zOfAbPchkj7 UdWs6GtLTsqrll3T2o6dc0Xv/xdyRThQkCAhspg=
signature.asc
Description: PGP signature
signature.asc
Description: OpenPGP digital signature
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
