patch, make "diff" detail property changes

[Chad]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bzrdev at chad.org-20080312223832-9l1ouv8xat1f9vqx
# target_branch: file:///home/c/bzr/bzr.dev--pristine/
# testament_sha1: 4ae22664abdbd636478bf1bb6331ecf46f1853a0
# timestamp: 2008-03-12 18:41:18 -0400
# base_revision_id: pqm at pqm.ubuntu.com-20080312213603-mtgxmfy3td5n04yh
#
# Begin patch
=== modified file 'bzrlib/diff.py'
--- bzrlib/diff.py      2008-03-07 14:15:10 +0000
+++ bzrlib/diff.py      2008-03-12 22:38:32 +0000
@@ -540,9 +540,10 @@
         raise errors.PathsDoNotExist(sorted(s))


-def get_prop_change(meta_modified):
-    if meta_modified:
-        return " (properties changed)"
+def get_prop_change(old_prop, new_prop):
+    descr = { True:"+x", False:"-x" }
+    if old_prop != new_prop:
+        return " (properties changed, %s to %s)" % (descr[old_prop],
descr[new_prop],)
     else:
         return  ""

@@ -954,7 +955,7 @@
             old_present = (kind[0] is not None and versioned[0])
             new_present = (kind[1] is not None and versioned[1])
             renamed = (parent[0], name[0]) != (parent[1], name[1])
-            prop_str = get_prop_change(executable[0] != executable[1])
+            prop_str = get_prop_change(executable[0], executable[1])
             if (old_present, new_present) == (True, False):
                 self.to_file.write("=== removed %s '%s'\n" %
                                    (kind[0], oldpath_encoded))

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYd78VMAAbBfgERQc2///1sC
BAq////6UAPapmT2R0NbudDJE0mU8CnphMKDynqHqaA0NBp6nqabUCShCeg00KbSHlBoDQAABoGg
JIgUwKn5U8J6p+pinlAYjQ9IA0Aeoc0xMBGmBGEYAAAAmEYCSUaTGgjap6jT1TzRNR+Q1J6npqDQ
GhoaRDV0b7mb5/szz3c2zyqTjLBqV7YRQXbaEHs3RwBSBu3UWacanWHZaiIXPc5NNrmiaEcraLFU
Ai1/3DfnG38omUsvZ36++k5topQvj9mUGLGLZvu4ts/HJ8725Q6t7O3pa12CquhZAfP2gnREn+ue
W+apGBaZrymH6BADMewF3bp6TXa/Gxx/M3SE2mMzi3Rqr+CGEv4K74SDqFwFlpQgVLjiuWpT0DjB
qkBMamKch9cnPYpK63LJrzwdjUgvHaJ3TL3lvIl0merNKWw7duspGzF+Uzi1C1QKRVVoTNOlOgYF
r9UiZQzoJyBkcSF5MA2OLoNZMqWU7oXgV8FDphUWqIRYqUSyUYEZNbkUgvCY4FhSpsHOiUNV5WZb
pIyDCcmYUFgwmMSwwis1gxlTQg8yDyYvHpg+Wiwe8i2msaNxpV10CWqDxFF4xILNWxjRNMZ4cBR0
kIl1NA0k5oIzQWuJjSK4XbjWWUamFi0qKiaQltO5WsL3sYfRrr730D7IeXJOx0/c4dkJOTZ4Q2pd
a8EgY/M3xwUi4vw2MrTGbsGPUzMzh2jlBxNThITjHph+5i8vfKlnqIB7fOwe6UMuTxMauYmIcaeB
kYhpMA6izIKjd4Ld47xyZsETlhMVDVD6dF6X+NxI6VuYO2KkJEqt53m1VJyZ6OQuBVwUGO4v74bi
Vz0J43DG+OTaFWBruSfAVVU6+sPCm8rrTgp3GJxOEnQeQ+BbqMuiiRW6Gi24WFbGZdajJ4wGA7F3
bb6FVPCi6JlYGIou01kRmS8cas7LnSrEnG8TEh52LpsLgZIjjH5qAc+1mf3onkWVyUF/XFB+Ap1W
xOsA07QKux1mtxYHMUi45LUbBp4du6+XW++nwrDmKpTO3Ks7Fr0T4mxVUkzZJkvENSIPA+sbgl3o
jZEFEu7ron2P1olCRgbiyAlDwSnV0aiewB8FgcaSoQwUUTlgYDQ9LsPloFxpQjhTBBCipJTAXCLG
TDLsyHVi2UzBvzJWvFqjottYnTpUvnctiNJLiAUU2XN0/9GKDN1Dr0Zqo1ANNSUQg1ls3Fy0Oe3Q
eMoWZKcbdJVwT4eZOWtWDqx3UWV7K6CrWtc6XY60+XTeZ0qKxMlUmA5CdvjWQYekR7hOPUmC7Fr1
CGKi/cs+gnqQZH/F3JFOFCQh3vxUwA==
-------------- next part --------------
A non-text attachment was scrubbed...
Name: propdiff.bundle
Type: application/octet-stream
Size: 2872 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080312/b1cd0fa7/attachment.obj