bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 1
by mbp at sourcefrog import from baz patch-364 | 1 | #! /usr/bin/env python
 | 
| 2 | # -*- coding: UTF-8 -*-
 | |
| 3 | ||
| 4 | # This program is free software; you can redistribute it and/or modify
 | |
| 5 | # it under the terms of the GNU General Public License as published by
 | |
| 6 | # the Free Software Foundation; either version 2 of the License, or
 | |
| 7 | # (at your option) any later version.
 | |
| 8 | ||
| 9 | # This program is distributed in the hope that it will be useful,
 | |
| 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
| 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
| 12 | # GNU General Public License for more details.
 | |
| 13 | ||
| 14 | # You should have received a copy of the GNU General Public License
 | |
| 15 | # along with this program; if not, write to the Free Software
 | |
| 16 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | |
| 17 | ||
| 18 | from trace import mutter | |
| 356
by Martin Pool - pychecker fixes in bzrlib.diff | 19 | from errors import BzrError | 
| 1
by mbp at sourcefrog import from baz patch-364 | 20 | |
| 21 | ||
| 329
by Martin Pool - refactor command functions into command classes | 22 | |
| 475
by Martin Pool - rewrite diff using compare_trees() | 23 | def _diff_one(oldlines, newlines, to_file, **kw): | 
| 24 | import difflib | |
| 25 | ||
| 26 |     # FIXME: difflib is wrong if there is no trailing newline.
 | |
| 27 |     # The syntax used by patch seems to be "\ No newline at
 | |
| 28 |     # end of file" following the last diff line from that
 | |
| 29 |     # file.  This is not trivial to insert into the
 | |
| 30 |     # unified_diff output and it might be better to just fix
 | |
| 31 |     # or replace that function.
 | |
| 32 | ||
| 33 |     # In the meantime we at least make sure the patch isn't
 | |
| 34 |     # mangled.
 | |
| 35 | ||
| 36 | ||
| 37 |     # Special workaround for Python2.3, where difflib fails if
 | |
| 38 |     # both sequences are empty.
 | |
| 39 | if not oldlines and not newlines: | |
| 40 |         return
 | |
| 41 | ||
| 42 | nonl = False | |
| 43 | ||
| 44 | if oldlines and (oldlines[-1][-1] != '\n'): | |
| 45 | oldlines[-1] += '\n' | |
| 46 | nonl = True | |
| 47 | if newlines and (newlines[-1][-1] != '\n'): | |
| 48 | newlines[-1] += '\n' | |
| 49 | nonl = True | |
| 50 | ||
| 51 | ud = difflib.unified_diff(oldlines, newlines, **kw) | |
| 52 | ||
| 53 |     # work-around for difflib being too smart for its own good
 | |
| 54 |     # if /dev/null is "1,0", patch won't recognize it as /dev/null
 | |
| 55 | if not oldlines: | |
| 56 | ud = list(ud) | |
| 57 | ud[2] = ud[2].replace('-1,0', '-0,0') | |
| 58 | elif not newlines: | |
| 59 | ud = list(ud) | |
| 60 | ud[2] = ud[2].replace('+1,0', '+0,0') | |
| 61 | ||
| 62 | to_file.writelines(ud) | |
| 63 | if nonl: | |
| 64 | print >>to_file, "\\ No newline at end of file" | |
| 65 | print >>to_file | |
| 66 | ||
| 67 | ||
| 550
by Martin Pool - Refactor diff code into one that works purely on | 68 | |
| 483
by Martin Pool - change 'file_list' to more explanatory 'specific_files' | 69 | def show_diff(b, revision, specific_files): | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 70 | import sys | 
| 71 | ||
| 329
by Martin Pool - refactor command functions into command classes | 72 | if revision == None: | 
| 73 | old_tree = b.basis_tree() | |
| 74 | else: | |
| 75 | old_tree = b.revision_tree(b.lookup_revision(revision)) | |
| 76 | ||
| 77 | new_tree = b.working_tree() | |
| 78 | ||
| 550
by Martin Pool - Refactor diff code into one that works purely on | 79 | show_diff_trees(old_tree, new_tree, sys.stdout, specific_files) | 
| 80 | ||
| 81 | ||
| 82 | ||
| 83 | def show_diff_trees(old_tree, new_tree, to_file, specific_files=None): | |
| 84 | """Show in text form the changes from one tree to another. | |
| 85 | ||
| 86 |     to_files
 | |
| 87 |         If set, include only changes to these files.
 | |
| 88 |     """
 | |
| 89 | ||
| 329
by Martin Pool - refactor command functions into command classes | 90 |     # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
 | 
| 91 | old_label = '' | |
| 92 | new_label = '' | |
| 93 | ||
| 94 | DEVNULL = '/dev/null' | |
| 95 |     # Windows users, don't panic about this filename -- it is a
 | |
| 96 |     # special signal to GNU patch that the file should be created or
 | |
| 97 |     # deleted respectively.
 | |
| 98 | ||
| 99 |     # TODO: Generation of pseudo-diffs for added/deleted files could
 | |
| 100 |     # be usefully made into a much faster special case.
 | |
| 101 | ||
| 478
by Martin Pool - put back support for running diff or status on | 102 | delta = compare_trees(old_tree, new_tree, want_unchanged=False, | 
| 483
by Martin Pool - change 'file_list' to more explanatory 'specific_files' | 103 | specific_files=specific_files) | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 104 | |
| 105 | for path, file_id, kind in delta.removed: | |
| 106 | print '*** removed %s %r' % (kind, path) | |
| 107 | if kind == 'file': | |
| 108 | _diff_one(old_tree.get_file(file_id).readlines(), | |
| 109 |                    [],
 | |
| 550
by Martin Pool - Refactor diff code into one that works purely on | 110 | to_file, | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 111 | fromfile=old_label + path, | 
| 112 | tofile=DEVNULL) | |
| 113 | ||
| 114 | for path, file_id, kind in delta.added: | |
| 115 | print '*** added %s %r' % (kind, path) | |
| 116 | if kind == 'file': | |
| 117 | _diff_one([], | |
| 118 | new_tree.get_file(file_id).readlines(), | |
| 550
by Martin Pool - Refactor diff code into one that works purely on | 119 | to_file, | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 120 | fromfile=DEVNULL, | 
| 121 | tofile=new_label + path) | |
| 122 | ||
| 123 | for old_path, new_path, file_id, kind, text_modified in delta.renamed: | |
| 124 | print '*** renamed %s %r => %r' % (kind, old_path, new_path) | |
| 125 | if text_modified: | |
| 126 | _diff_one(old_tree.get_file(file_id).readlines(), | |
| 127 | new_tree.get_file(file_id).readlines(), | |
| 550
by Martin Pool - Refactor diff code into one that works purely on | 128 | to_file, | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 129 | fromfile=old_label + old_path, | 
| 130 | tofile=new_label + new_path) | |
| 131 | ||
| 132 | for path, file_id, kind in delta.modified: | |
| 133 | print '*** modified %s %r' % (kind, path) | |
| 134 | if kind == 'file': | |
| 135 | _diff_one(old_tree.get_file(file_id).readlines(), | |
| 136 | new_tree.get_file(file_id).readlines(), | |
| 550
by Martin Pool - Refactor diff code into one that works purely on | 137 | to_file, | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 138 | fromfile=old_label + path, | 
| 139 | tofile=new_label + path) | |
| 329
by Martin Pool - refactor command functions into command classes | 140 | |
| 141 | ||
| 379
by Martin Pool - Simpler compare_inventories() to possibly replace diff_trees | 142 | |
| 143 | class TreeDelta: | |
| 144 | """Describes changes from one tree to another. | |
| 145 | ||
| 146 |     Contains four lists:
 | |
| 147 | ||
| 148 |     added
 | |
| 475
by Martin Pool - rewrite diff using compare_trees() | 149 |         (path, id, kind)
 | 
| 379
by Martin Pool - Simpler compare_inventories() to possibly replace diff_trees | 150 |     removed
 | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 151 |         (path, id, kind)
 | 
| 379
by Martin Pool - Simpler compare_inventories() to possibly replace diff_trees | 152 |     renamed
 | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 153 |         (oldpath, newpath, id, kind, text_modified)
 | 
| 379
by Martin Pool - Simpler compare_inventories() to possibly replace diff_trees | 154 |     modified
 | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 155 |         (path, id, kind)
 | 
| 463
by Martin Pool - compare_trees() also reports unchanged files | 156 |     unchanged
 | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 157 |         (path, id, kind)
 | 
| 379
by Martin Pool - Simpler compare_inventories() to possibly replace diff_trees | 158 | |
| 460
by Martin Pool - new testing command compare-trees | 159 |     Each id is listed only once.
 | 
| 379
by Martin Pool - Simpler compare_inventories() to possibly replace diff_trees | 160 | |
| 460
by Martin Pool - new testing command compare-trees | 161 |     Files that are both modified and renamed are listed only in
 | 
| 162 |     renamed, with the text_modified flag true.
 | |
| 463
by Martin Pool - compare_trees() also reports unchanged files | 163 | |
| 164 |     The lists are normally sorted when the delta is created.
 | |
| 379
by Martin Pool - Simpler compare_inventories() to possibly replace diff_trees | 165 |     """
 | 
| 166 | def __init__(self): | |
| 167 | self.added = [] | |
| 168 | self.removed = [] | |
| 169 | self.renamed = [] | |
| 170 | self.modified = [] | |
| 463
by Martin Pool - compare_trees() also reports unchanged files | 171 | self.unchanged = [] | 
| 379
by Martin Pool - Simpler compare_inventories() to possibly replace diff_trees | 172 | |
| 531
by Martin Pool - new utility TreeDelta.touches_file_id | 173 | |
| 174 | def touches_file_id(self, file_id): | |
| 175 | """Return True if file_id is modified by this delta.""" | |
| 176 | for l in self.added, self.removed, self.modified: | |
| 177 | for v in l: | |
| 178 | if v[1] == file_id: | |
| 179 | return True | |
| 180 | for v in self.renamed: | |
| 181 | if v[2] == file_id: | |
| 182 | return True | |
| 183 | return False | |
| 184 | ||
| 185 | ||
| 465
by Martin Pool - Move show_status() out of Branch into a new function in | 186 | def show(self, to_file, show_ids=False, show_unchanged=False): | 
| 187 | def show_list(files): | |
| 475
by Martin Pool - rewrite diff using compare_trees() | 188 | for path, fid, kind in files: | 
| 189 | if kind == 'directory': | |
| 190 | path += '/' | |
| 191 | elif kind == 'symlink': | |
| 192 | path += '@' | |
| 193 | ||
| 465
by Martin Pool - Move show_status() out of Branch into a new function in | 194 | if show_ids: | 
| 195 | print >>to_file, ' %-30s %s' % (path, fid) | |
| 196 | else: | |
| 197 | print >>to_file, ' ', path | |
| 198 | ||
| 460
by Martin Pool - new testing command compare-trees | 199 | if self.removed: | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 200 | print >>to_file, 'removed:' | 
| 465
by Martin Pool - Move show_status() out of Branch into a new function in | 201 | show_list(self.removed) | 
| 202 | ||
| 460
by Martin Pool - new testing command compare-trees | 203 | if self.added: | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 204 | print >>to_file, 'added:' | 
| 465
by Martin Pool - Move show_status() out of Branch into a new function in | 205 | show_list(self.added) | 
| 206 | ||
| 460
by Martin Pool - new testing command compare-trees | 207 | if self.renamed: | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 208 | print >>to_file, 'renamed:' | 
| 209 | for oldpath, newpath, fid, kind, text_modified in self.renamed: | |
| 460
by Martin Pool - new testing command compare-trees | 210 | if show_ids: | 
| 211 | print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid) | |
| 212 | else: | |
| 213 | print >>to_file, ' %s => %s' % (oldpath, newpath) | |
| 465
by Martin Pool - Move show_status() out of Branch into a new function in | 214 | |
| 460
by Martin Pool - new testing command compare-trees | 215 | if self.modified: | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 216 | print >>to_file, 'modified:' | 
| 465
by Martin Pool - Move show_status() out of Branch into a new function in | 217 | show_list(self.modified) | 
| 218 | ||
| 219 | if show_unchanged and self.unchanged: | |
| 475
by Martin Pool - rewrite diff using compare_trees() | 220 | print >>to_file, 'unchanged:' | 
| 465
by Martin Pool - Move show_status() out of Branch into a new function in | 221 | show_list(self.unchanged) | 
| 460
by Martin Pool - new testing command compare-trees | 222 | |
| 223 | ||
| 224 | ||
| 483
by Martin Pool - change 'file_list' to more explanatory 'specific_files' | 225 | def compare_trees(old_tree, new_tree, want_unchanged, specific_files=None): | 
| 478
by Martin Pool - put back support for running diff or status on | 226 | """Describe changes from one tree to another. | 
| 227 | ||
| 228 |     Returns a TreeDelta with details of added, modified, renamed, and
 | |
| 229 |     deleted entries.
 | |
| 230 | ||
| 231 |     The root entry is specifically exempt.
 | |
| 232 | ||
| 233 |     This only considers versioned files.
 | |
| 234 | ||
| 235 |     want_unchanged
 | |
| 485
by Martin Pool - move commit code into its own module | 236 |         If true, also list files unchanged from one version to
 | 
| 237 |         the next.
 | |
| 478
by Martin Pool - put back support for running diff or status on | 238 | |
| 483
by Martin Pool - change 'file_list' to more explanatory 'specific_files' | 239 |     specific_files
 | 
| 485
by Martin Pool - move commit code into its own module | 240 |         If true, only check for changes to specified names or
 | 
| 241 |         files within them.
 | |
| 478
by Martin Pool - put back support for running diff or status on | 242 |     """
 | 
| 485
by Martin Pool - move commit code into its own module | 243 | |
| 244 | from osutils import is_inside_any | |
| 245 | ||
| 460
by Martin Pool - new testing command compare-trees | 246 | old_inv = old_tree.inventory | 
| 247 | new_inv = new_tree.inventory | |
| 248 | delta = TreeDelta() | |
| 475
by Martin Pool - rewrite diff using compare_trees() | 249 | mutter('start compare_trees') | 
| 478
by Martin Pool - put back support for running diff or status on | 250 | |
| 485
by Martin Pool - move commit code into its own module | 251 |     # TODO: match for specific files can be rather smarter by finding
 | 
| 252 |     # the IDs of those files up front and then considering only that.
 | |
| 478
by Martin Pool - put back support for running diff or status on | 253 | |
| 462
by Martin Pool - New form 'file_id in tree' to check if the file is present | 254 | for file_id in old_tree: | 
| 255 | if file_id in new_tree: | |
| 460
by Martin Pool - new testing command compare-trees | 256 | kind = old_inv.get_file_kind(file_id) | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 257 | assert kind == new_inv.get_file_kind(file_id) | 
| 258 | ||
| 460
by Martin Pool - new testing command compare-trees | 259 | assert kind in ('file', 'directory', 'symlink', 'root_directory'), \ | 
| 260 | 'invalid file kind %r' % kind | |
| 477
by Martin Pool - fix header for listing of unknown files | 261 | |
| 262 | if kind == 'root_directory': | |
| 263 |                 continue
 | |
| 264 | ||
| 265 | old_path = old_inv.id2path(file_id) | |
| 266 | new_path = new_inv.id2path(file_id) | |
| 267 | ||
| 483
by Martin Pool - change 'file_list' to more explanatory 'specific_files' | 268 | if specific_files: | 
| 485
by Martin Pool - move commit code into its own module | 269 | if (not is_inside_any(specific_files, old_path) | 
| 270 | and not is_inside_any(specific_files, new_path)): | |
| 478
by Martin Pool - put back support for running diff or status on | 271 |                     continue
 | 
| 272 | ||
| 460
by Martin Pool - new testing command compare-trees | 273 | if kind == 'file': | 
| 274 | old_sha1 = old_tree.get_file_sha1(file_id) | |
| 275 | new_sha1 = new_tree.get_file_sha1(file_id) | |
| 276 | text_modified = (old_sha1 != new_sha1) | |
| 277 | else: | |
| 278 |                 ## mutter("no text to check for %r %r" % (file_id, kind))
 | |
| 279 | text_modified = False | |
| 471
by Martin Pool - actually avoid reporting unchanged files if not required | 280 | |
| 281 |             # TODO: Can possibly avoid calculating path strings if the
 | |
| 282 |             # two files are unchanged and their names and parents are
 | |
| 283 |             # the same and the parents are unchanged all the way up.
 | |
| 284 |             # May not be worthwhile.
 | |
| 460
by Martin Pool - new testing command compare-trees | 285 | |
| 286 | if old_path != new_path: | |
| 475
by Martin Pool - rewrite diff using compare_trees() | 287 | delta.renamed.append((old_path, new_path, file_id, kind, | 
| 288 | text_modified)) | |
| 460
by Martin Pool - new testing command compare-trees | 289 | elif text_modified: | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 290 | delta.modified.append((new_path, file_id, kind)) | 
| 471
by Martin Pool - actually avoid reporting unchanged files if not required | 291 | elif want_unchanged: | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 292 | delta.unchanged.append((new_path, file_id, kind)) | 
| 460
by Martin Pool - new testing command compare-trees | 293 | else: | 
| 485
by Martin Pool - move commit code into its own module | 294 | old_path = old_inv.id2path(file_id) | 
| 295 | if specific_files: | |
| 296 | if not is_inside_any(specific_files, old_path): | |
| 297 |                     continue
 | |
| 298 | delta.removed.append((old_path, file_id, kind)) | |
| 475
by Martin Pool - rewrite diff using compare_trees() | 299 | |
| 300 | mutter('start looking for new files') | |
| 460
by Martin Pool - new testing command compare-trees | 301 | for file_id in new_inv: | 
| 302 | if file_id in old_inv: | |
| 303 |             continue
 | |
| 478
by Martin Pool - put back support for running diff or status on | 304 | new_path = new_inv.id2path(file_id) | 
| 483
by Martin Pool - change 'file_list' to more explanatory 'specific_files' | 305 | if specific_files: | 
| 485
by Martin Pool - move commit code into its own module | 306 | if not is_inside_any(specific_files, new_path): | 
| 478
by Martin Pool - put back support for running diff or status on | 307 |                 continue
 | 
| 475
by Martin Pool - rewrite diff using compare_trees() | 308 | kind = new_inv.get_file_kind(file_id) | 
| 478
by Martin Pool - put back support for running diff or status on | 309 | delta.added.append((new_path, file_id, kind)) | 
| 460
by Martin Pool - new testing command compare-trees | 310 | |
| 311 | delta.removed.sort() | |
| 312 | delta.added.sort() | |
| 313 | delta.renamed.sort() | |
| 314 | delta.modified.sort() | |
| 474
by Martin Pool - sort unchanged files | 315 | delta.unchanged.sort() | 
| 460
by Martin Pool - new testing command compare-trees | 316 | |
| 317 | return delta |