This fixes a long standing bug that symbolic links (which are indicated in bazaar by a trailing "@") were not properly handled in the status buffer. Looks like the regexp and much of the code was copied and pasted from somewhere else but it just about worked...
I think it would be good to add to dvc-fileinfo-file an embellishments field where we could store say 'symlink and 'exec which are two of the properties tracked by bzr. What do people think? Best, Bojan ------------------------------------------------------------ revno: 580 committer: Bojan Nikolic <[email protected]> branch nick: quickfix timestamp: Sat 2010-10-16 23:00:40 +0100 message: Correct extraction of information from bzr status: previously "dir" was the full file name and "file" was just the embellishment (e.g., "@" to identify a link). Now make file the full file name and let dir to nil, as is done for the git back-end
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: file:///home/bnikolic/work/dvc/trunk/ # testament_sha1: 28cda683b62579b5fdc7c507e879e97996dfe6e1 # timestamp: 2010-10-16 23:04:36 +0100 # base_revision_id: [email protected] # # Begin patch === modified file 'lisp/bzr.el' --- lisp/bzr.el 2009-08-11 19:47:53 +0000 +++ lisp/bzr.el 2010-10-16 22:00:40 +0000 @@ -551,13 +551,12 @@ (ewoc-enter-last dvc-fileinfo-ewoc (make-dvc-fileinfo-message :text msg)))) - (let ((file (match-string-no-properties 2)) - (dir (match-string-no-properties 1))) + (let ((file (match-string-no-properties 1))) (with-current-buffer changes-buffer (ewoc-enter-last dvc-fileinfo-ewoc (make-dvc-fileinfo-file :mark nil - :dir dir + :dir nil :file file :status current-status :more-status "")))))) # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSIIcZwAAaXfgAAYcWf//1oB AAC////wUAPKO3qrqdMNvc94SSE0mFT02Ep5kTaTTNGqPU9JmUDQSUFTxqeTKeqbU2SDQGgBo0A0 ISE2QDSNMDU0MgwjAAgSKFT2SmaCaaepmowmIABkGgShATJoRHpkj0o09TRoNA0wjNOm8n6+3LSW WmOZOGVDUT3vggvmukhTfHvO1YRGWr/Ur9FfHIfgwYw3bQtfbfoa6jKsTS7XO8pHdY2XA3UNXxVN LBV+0kz+39iZo/u+dz+bKh7jPme9Mxdq98tey2+eGGTYdc8eqUmGzRBJhhzlk3NsebeUeFS/WsIC kVInePG7Q+9UySlYa0rU6ZKo3YQp9kWxFc1GcTmfFXirTB3QUEDBMVCiSqWwaZenKsppO/sNWBKb wKAg2ThaTOuGeh7FRjCIueRjKbbBxHZgRHyFtQu9MUfkJLFIEBakbpDBuGN4nmTVFW5NEsxfcY1M IZyZMmb1vWNsL0FLyihbTYml5N5iWSqM03p47hBj/VTirl1MTKVdSXZsTJHQJmRFyEYeJvCRXVYO boWYcccDMaTzFHKKzlXOMHXp2bPHEfkJ5iP3SJ1SLDjEGMLyMFnWg++m4YmYb4fi5l8IwSqhSQVI N0PdebC+GPvTbEZ3DH6kBlh4Odr5HEWc8ciDVUVV832dwIkbMwLPvpAjxOZA6RT3mYp0GwlLzHVP qqlJzQQDvlYFfQDII2mjOJ3InyBgm5dRWC8rC05FFhIT/CXf0N6ZpWc12vBDnJcdpyPMxcdFtLm3 mSw35VEHZWc5FRTgZStHg6YTqPS/kft63HH3f5PTlU3yHh3OG/odah/bALT6cdByNuRhogFm0ys9 XSh6Kq/8546bk5DqpumCN6zKskDMgZUQ3aaDaVGo8NC85eFU7O1vhyYFVOc3dWQlhI+k9k1DMKsH UlgfpqAuHz9UIxTiLf6yQNAHmUAk1K6aQhjMVExskJuAXntaT9dAK5nTvURtF6/LQLkChsyl6dwj gOFsAFlytgUXaFZz4pRZ3B2/frwOFI+4ezhGkMLwQrZIJDWzalURjoU1YmpNDW4V3IXbEpZvUXal LgBJGgRwxgKmkGD55vVebHZqqLrrlADCC8pYjGAkgtCKmLaOTKYJCgSqAEPOYwCdv2c5BTYKxUMk bR9EIRRVFSo2Lb3TFXMkmaXE+SKA0Um6Yy4S5qeQKGiwpa522Dw7vixKhAczBgoWIrwYcOKg4hFy cXA1ahSk96uYpwca+3wSyV1afGgJLeoIJRFjPhWrFvCYW2Y7G3RcyVCeoIi/xdyRThQkCIIcZwA=
-- Bojan Nikolic || http://www.bnikolic.co.uk
_______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
