equal
deleted
inserted
replaced
794 # the line below is O(size of the repo) during a rebase, while the rest |
794 # the line below is O(size of the repo) during a rebase, while the rest |
795 # of the function is much faster (and is required for carrying copy |
795 # of the function is much faster (and is required for carrying copy |
796 # metadata across the rebase anyway). |
796 # metadata across the rebase anyway). |
797 exclude = pathcopies(repo[fromrev], repo[skiprev]) |
797 exclude = pathcopies(repo[fromrev], repo[skiprev]) |
798 for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems(): |
798 for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems(): |
799 # copies.pathcopies returns backward renames, so dst might not |
|
800 # actually be in the dirstate |
|
801 if dst in exclude: |
799 if dst in exclude: |
802 continue |
800 continue |
803 wctx[dst].markcopied(src) |
801 wctx[dst].markcopied(src) |