1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356
|
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
# Copyright (C) 2007, 2008, 2009 Guillermo Gonzalez
#
# The code taken from bzrlib is under: Copyright (C) 2005-2007 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#
# Contributors:
# Martin Albisetti
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
import os, sys, time
from bzrlib import (
diff,
errors,
osutils,
revision as _mod_revision,
status,
trace,
)
from bzrlib.plugins.xmloutput import logxml
""")
from writer import _escape_cdata
def show_tree_status_xml(wt, show_unchanged=None,
specific_files=None,
show_ids=False,
to_file=None,
show_pending=True,
revision=None,
versioned=False):
"""Display summary of changes as XML.
Almost equal to status.show_tree_status, except the --short option and the
output is in xml format.
This reports on versioned and unknown files, reporting them
grouped by state. Possible states are:
<added/>
<removed/>
<renamed/>
<modified/>
<kind changed/>
<unknown/>
Each group can have multiple child's of this element's:
<file [oldpath] [oldkind, newkind] [fid]>
<directory [oldpath] [oldkind, newkind] [suffix]>
A simple example:
<status workingtree_root="/home/guillo/Unison-root/sandbox/bazaar/bzr/0.15/">
<renamed>
<file oldpath="INSTALL" >INSTALL.txt</file>
</renamed>
<kind-changed>
<directory oldkind="file" newkind="directory">NEWS</directory>
</kind-changed>
<modified>
<file>bzrlib/symbol_versioning.py</file>
</modified>
<unknown>
<file>.project</file>
<directory>bzrlib/dir/</directory>
</unknown>
</status>
By default this compares the working tree to a previous revision.
If the revision argument is given, summarizes changes between the
working tree and another, or between two revisions.
The result is written out as Unicode and to_file should be able
to encode that.
If showing the status of a working tree, extra information is included
about unknown files, conflicts, and pending merges.
:param show_unchanged: Deprecated parameter. If set, includes unchanged
files.
:param specific_files: If set, a list of filenames whose status should be
shown. It is an error to give a filename that is not in the working
tree, or in the working inventory or in the basis inventory.
:param show_ids: If set, includes each file's id.
:param to_file: If set, write to this file (default stdout.)
:param show_pending: If set, write pending merges.
:param revision: If None the compare latest revision with working tree
If not None it must be a RevisionSpec list.
If one revision show compared it with working tree.
If two revisions show status between first and second.
:param versioned: If True, only shows versioned files.
"""
if show_unchanged is not None:
warn("show_status_trees with show_unchanged has been deprecated "
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
if to_file is None:
to_file = sys.stdout
wt.lock_read()
try:
new_is_working_tree = True
if revision is None:
if wt.last_revision() != wt.branch.last_revision():
trace.warning("working tree is out of date, run 'bzr update'")
new = wt
old = new.basis_tree()
elif len(revision) > 0:
try:
rev_id = revision[0].in_history(wt.branch).rev_id
old = wt.branch.repository.revision_tree(rev_id)
except errors.NoSuchRevision, e:
raise errors.BzrCommandError(str(e))
if (len(revision) > 1) and (revision[1].spec is not None):
try:
rev_id = revision[1].in_history(wt.branch).rev_id
new = wt.branch.repository.revision_tree(rev_id)
new_is_working_tree = False
except errors.NoSuchRevision, e:
raise errors.BzrCommandError(str(e))
else:
new = wt
old.lock_read()
new.lock_read()
try:
nonexistents = None
try:
specific_files, nonexistents \
= status._filter_nonexistent(specific_files, old, new)
except AttributeError:
try:
diff._raise_if_nonexistent(specific_files, old, new)
except AttributeError:
status._raise_if_nonexistent(specific_files, old, new)
want_unversioned = not versioned
to_file.write('<?xml version="1.0" encoding="%s"?>' % \
osutils.get_user_encoding())
to_file.write('<status workingtree_root="%s">' % \
wt.id2abspath(wt.get_root_id()))
delta = new.changes_from(old, want_unchanged=show_unchanged,
specific_files=specific_files,
want_unversioned=want_unversioned)
# filter out unknown files. We may want a tree method for
# this
delta.unversioned = [unversioned for unversioned in
delta.unversioned if not new.is_ignored(unversioned[0])]
show_tree_xml(delta, to_file,
show_ids=show_ids,
show_unchanged=show_unchanged,
show_unversioned=want_unversioned)
# show the new conflicts only for now. XXX: get them from the
# delta.
conflicts = new.conflicts()
if specific_files is not None:
conflicts = conflicts.select_conflicts(new, specific_files,
ignore_misses=True, recurse=True)[1]
if len(conflicts) > 0:
to_file.write("<conflicts>")
for conflict in conflicts:
to_file.write('<conflict type="%s">%s</conflict>' %
(conflict.typestring,
_escape_cdata(conflict.path)))
to_file.write("</conflicts>")
if nonexistents:
to_file.write('<nonexistents>')
tag = 'nonexistent'
for nonexistent in nonexistents:
to_file.write('<%s>%s</%s>' % (tag, nonexistent, tag))
to_file.write('</nonexistents>')
if new_is_working_tree and show_pending:
show_pending_merges(new, to_file)
to_file.write('</status>')
finally:
old.unlock()
new.unlock()
finally:
wt.unlock()
def show_pending_merges(new, to_file):
"""Write out a display of pending merges in a working tree."""
parents = new.get_parent_ids()
if len(parents) < 2:
return
pending = parents[1:]
branch = new.branch
last_revision = parents[0]
to_file.write('<pending_merges>')
# TODO: this could be improved using merge_sorted - we'd get the same
# output rather than one level of indent.
graph = branch.repository.get_graph()
other_revisions = [last_revision]
for merge in pending:
try:
rev = branch.repository.get_revisions([merge])[0]
except errors.NoSuchRevision:
# If we are missing a revision, just print out the revision id
show_ghost(to_file, merge)
other_revisions.append(merge)
continue
# Log the merge, as it gets a slightly different formatting
to_file.write(logxml.line_log(rev))
# Find all of the revisions in the merge source, which are not in the
# last committed revision.
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
other_revisions.append(merge)
merge_extra.discard(_mod_revision.NULL_REVISION)
# Get a handle to all of the revisions we will need
try:
revisions = dict((rev.revision_id, rev) for rev in
branch.repository.get_revisions(merge_extra))
except errors.NoSuchRevision:
# One of the sub nodes is a ghost, check each one
revisions = {}
for revision_id in merge_extra:
try:
rev = branch.repository.get_revisions([revision_id])[0]
except errors.NoSuchRevision:
revisions[revision_id] = None
else:
revisions[revision_id] = rev
# Display the revisions brought in by this merge.
rev_id_iterator = status._get_sorted_revisions(merge, merge_extra,
branch.repository.get_parent_map(merge_extra))
# Skip the first node
num, first, depth, eom = rev_id_iterator.next()
if first != merge:
raise AssertionError('Somehow we misunderstood how'
' iter_topo_order works %s != %s' % (first, merge))
for num, sub_merge, depth, eom in rev_id_iterator:
rev = revisions[sub_merge]
if rev is None:
show_ghost(to_file, sub_merge)
continue
to_file.write(logxml.line_log(revisions[sub_merge]))
to_file.write('</pending_merges>')
def show_ghost(to_file, merge):
to_file.write('<pending_merge kind="ghost"><log><revisionid>'
'%s</revisionid></log></pending_merge>' \
% merge)
def show_tree_xml(delta, to_file, show_ids=False, show_unchanged=False,
short_status=False, show_unversioned=False):
"""output this delta in a (xml) status-like form to to_file."""
def show_list(files):
for item in files:
path, fid, kind = item[:3]
if kind == 'directory':
path += '/'
elif kind == 'symlink':
path += '@'
if len(item) == 5 and item[4]:
path += '*'
if show_ids:
kind_id = ''
if fid:
kind_id = get_kind_id_element(kind, fid)
to_file.write('<%s %s>%s</%s>' % (kind, kind_id,
_escape_cdata(path), kind))
else:
to_file.write('<%s>%s</%s>' % (kind, _escape_cdata(path), kind))
if delta.removed:
to_file.write('<removed>')
show_list(delta.removed)
to_file.write('</removed>')
if delta.added:
to_file.write('<added>')
show_list(delta.added)
to_file.write('</added>')
extra_modified = []
if delta.renamed:
to_file.write('<renamed>')
for (oldpath, newpath, fid, kind,
text_modified, meta_modified) in delta.renamed:
if text_modified or meta_modified:
extra_modified.append((newpath, fid, kind,
text_modified, meta_modified))
metamodified = ''
if meta_modified:
metamodified = 'meta_modified="true"'
if show_ids:
kind_id = ''
if fid:
kind_id = get_kind_id_element(kind, fid)
to_file.write('<%s oldpath="%s" %s %s>%s</%s>' % \
(kind, _escape_cdata(oldpath), metamodified,
kind_id, _escape_cdata(newpath), kind))
else:
to_file.write('<%s oldpath="%s" %s >%s</%s>' % \
(kind, _escape_cdata(oldpath), metamodified,
_escape_cdata(newpath), kind))
to_file.write('</renamed>')
if delta.kind_changed:
to_file.write('<kind_changed>')
for (path, fid, old_kind, new_kind) in delta.kind_changed:
if show_ids:
suffix = 'suffix="%s"' % fid
else:
suffix = ''
to_file.write('<%s oldkind="%s" %s>%s</%s>' % \
(new_kind, old_kind, suffix,
_escape_cdata(path), new_kind))
to_file.write('</kind_changed>')
if delta.modified or extra_modified:
to_file.write('<modified>')
show_list(delta.modified)
show_list(extra_modified)
to_file.write('</modified>')
if show_unchanged and delta.unchanged:
to_file.write('<unchanged>')
show_list(delta.unchanged)
to_file.write('</unchanged>')
if show_unversioned and delta.unversioned:
to_file.write('<unknown>')
show_list(delta.unversioned)
to_file.write('</unknown>')
def get_kind_id_element(kind, fid):
kind_id = ''
if kind == 'directory':
kind_id = 'suffix="%s"' % fid
elif kind == 'symlink':
kind_id = ''
else:
kind_id = 'fid="%s"' % fid
return kind_id
|