Show More
@@ -5,15 +5,9 b'' | |||||
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | import util |
|
8 | import util, pathutil | |
9 | import heapq |
|
9 | import heapq | |
10 |
|
10 | |||
11 | def _dirname(f): |
|
|||
12 | s = f.rfind("/") |
|
|||
13 | if s == -1: |
|
|||
14 | return "" |
|
|||
15 | return f[:s] |
|
|||
16 |
|
||||
17 | def _findlimit(repo, a, b): |
|
11 | def _findlimit(repo, a, b): | |
18 | """ |
|
12 | """ | |
19 | Find the last revision that needs to be checked to ensure that a full |
|
13 | Find the last revision that needs to be checked to ensure that a full | |
@@ -384,7 +378,7 b' def mergecopies(repo, c1, c2, ca):' | |||||
384 | # examine each file copy for a potential directory move, which is |
|
378 | # examine each file copy for a potential directory move, which is | |
385 | # when all the files in a directory are moved to a new directory |
|
379 | # when all the files in a directory are moved to a new directory | |
386 | for dst, src in fullcopy.iteritems(): |
|
380 | for dst, src in fullcopy.iteritems(): | |
387 |
dsrc, ddst = |
|
381 | dsrc, ddst = pathutil.dirname(src), pathutil.dirname(dst) | |
388 | if dsrc in invalid: |
|
382 | if dsrc in invalid: | |
389 | # already seen to be uninteresting |
|
383 | # already seen to be uninteresting | |
390 | continue |
|
384 | continue |
General Comments 0
You need to be logged in to leave comments.
Login now