Mercurial > hgsubversion
comparison hgsubversion/stupid.py @ 1558:ae572c9be4e6
cleanup: remove lots of dead imports and code found by pyflakes
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Sat, 24 Mar 2018 17:04:19 -0400 |
parents | cff81f35b31e |
children | 8a66277136ab |
comparison
equal
deleted
inserted
replaced
1557:dd409375c261 | 1558:ae572c9be4e6 |
---|---|
5 from mercurial import context | 5 from mercurial import context |
6 from mercurial import error as hgerror | 6 from mercurial import error as hgerror |
7 from mercurial import node | 7 from mercurial import node |
8 from mercurial import patch | 8 from mercurial import patch |
9 from mercurial import revlog | 9 from mercurial import revlog |
10 from mercurial import util as hgutil | |
11 | 10 |
12 import compathacks | 11 import compathacks |
13 import svnwrap | 12 import svnwrap |
14 import svnexternals | 13 import svnexternals |
15 import util | 14 import util |
643 if meta.filemap: | 642 if meta.filemap: |
644 raise hgerror.Abort('filemaps currently unsupported with stupid replay.') | 643 raise hgerror.Abort('filemaps currently unsupported with stupid replay.') |
645 | 644 |
646 branches = branches_in_paths(meta, tbdelta, r.paths, r.revnum, | 645 branches = branches_in_paths(meta, tbdelta, r.paths, r.revnum, |
647 svn.checkpath, svn.list_files, firstrun) | 646 svn.checkpath, svn.list_files, firstrun) |
648 brpaths = branches.values() | |
649 bad_branch_paths = {} | 647 bad_branch_paths = {} |
650 for br, bp in branches.iteritems(): | 648 for br, bp in branches.iteritems(): |
651 bad_branch_paths[br] = [] | 649 bad_branch_paths[br] = [] |
652 | 650 |
653 # This next block might be needed, but for now I'm omitting it until it | 651 # This next block might be needed, but for now I'm omitting it until it |
654 # can be proven necessary. | 652 # can be proven necessary. |
655 # for bad in brpaths: | 653 # for bad in branches.values(): |
656 # if bad.startswith(bp) and len(bad) > len(bp): | 654 # if bad.startswith(bp) and len(bad) > len(bp): |
657 # bad_branch_paths[br].append(bad[len(bp)+1:]) | 655 # bad_branch_paths[br].append(bad[len(bp)+1:]) |
658 | 656 |
659 # We've go a branch that contains other branches. We have to be careful | 657 # We've go a branch that contains other branches. We have to be careful |
660 # to get results similar to real replay in this case. | 658 # to get results similar to real replay in this case. |