equal
deleted
inserted
replaced
873 # copytrace='off' skips this line, but not the entire function because |
873 # copytrace='off' skips this line, but not the entire function because |
874 # the line below is O(size of the repo) during a rebase, while the rest |
874 # the line below is O(size of the repo) during a rebase, while the rest |
875 # of the function is much faster (and is required for carrying copy |
875 # of the function is much faster (and is required for carrying copy |
876 # metadata across the rebase anyway). |
876 # metadata across the rebase anyway). |
877 exclude = pathcopies(base, skip) |
877 exclude = pathcopies(base, skip) |
878 for dst, src in pycompat.iteritems(pathcopies(base, ctx)): |
878 new_copies = pathcopies(base, ctx) |
|
879 _filter(wctx.p1(), wctx, new_copies) |
|
880 for dst, src in pycompat.iteritems(new_copies): |
879 if dst in exclude: |
881 if dst in exclude: |
880 continue |
882 continue |
881 if dst in wctx: |
883 wctx[dst].markcopied(src) |
882 wctx[dst].markcopied(src) |
|
883 |
884 |
884 |
885 |
885 def computechangesetfilesadded(ctx): |
886 def computechangesetfilesadded(ctx): |
886 """return the list of files added in a changeset |
887 """return the list of files added in a changeset |
887 """ |
888 """ |