← Back to branch summary

~maxb/bzr-svn/fetch-svn-rev-info-progress-bar

~maxb/bzr-svn/fetch-svn-rev-info-progress-bar

« back to all changes in this revision

Viewing changes to annotate.py

Committer: Max Bowsher
Date: 2010-07-30 22:50:54 UTC
mfrom: (3324.1.37 trunk)
Revision ID: maxb@f2s.com-20100730225054-un1llcngdofg585w

Merge trunk.

files added:
.testr.conf

explorer

explorer/logos

explorer/logos/subversion.png

explorer/tools.xml

files removed:
tests/test_upgrade.py

files modified:
.bzrignore

AUTHORS

Makefile

NEWS

annotate.py

branch.py

cache/__init__.py

cache/sqlitecache.py

cache/tdbcache.py

changes.py

commit.py

config.py

convert.py

errors.py

fetch.py

fileids.py

info.py

layout/custom.py

layout/guess.py

logwalker.py

mapping.py

mapping3/commands.py

mapping3/scheme.py

push.py

pycompat.py

repository.py

revids.py

revmeta.py

send.py

server.py

setup.py

svk.py

tags.py

tests/__init__.py

tests/mapping_implementations/test_repository.py

tests/test_blackbox.py

tests/test_branch.py

tests/test_cache.py

tests/test_changes.py

tests/test_checkout.py

tests/test_commit.py

tests/test_config.py

tests/test_convert.py

tests/test_errors.py

tests/test_fetch.py

tests/test_fileids.py

tests/test_keywords.py

tests/test_logwalker.py

tests/test_mapping.py

tests/test_parents.py

tests/test_push.py

tests/test_radir.py

tests/test_repository.py

tests/test_revmeta.py

tests/test_revspec.py

tests/test_svk.py

tests/test_transport.py

tests/test_tree.py

tests/test_versionedfiles.py

tests/test_workingtree.py

transport.py

tree.py

versionedfiles.py

workingtree.py

Show diffs side-by-side

added added

removed removed

67

67

idmap = self._repository.get_fileid_map(revmeta, mapping)

68

68

return idmap.lookup(mapping, ip)

69

69

70

def _handler(self, path, rev, revprops):

70

def _handler(self, path, rev, revprops, result_of_merge=None):

71

71

try:

72

72

fileid, revid, _ = self._get_ids(path, rev, revprops)

73

73

assert revid is not None

Older »