Show More
@@ -14,6 +14,19 b' Setup' | |||||
14 |
|
14 | |||
15 | use git diff to see rename |
|
15 | use git diff to see rename | |
16 |
|
16 | |||
|
17 | $ cat << EOF >> ./no-linkrev | |||
|
18 | > #!$PYTHON | |||
|
19 | > # filter out linkrev part of the debugindex command | |||
|
20 | > import sys | |||
|
21 | > for line in sys.stdin: | |||
|
22 | > if " linkrev " in line: | |||
|
23 | > print(line.rstrip()) | |||
|
24 | > else: | |||
|
25 | > l = "%s *%s" % (line[:6], line[14:].rstrip()) | |||
|
26 | > print(l) | |||
|
27 | > EOF | |||
|
28 | $ chmod +x no-linkrev | |||
|
29 | ||||
17 | $ cat << EOF >> $HGRCPATH |
|
30 | $ cat << EOF >> $HGRCPATH | |
18 | > [diff] |
|
31 | > [diff] | |
19 | > git=yes |
|
32 | > git=yes | |
@@ -372,12 +385,12 b' Merge:' | |||||
372 | created new head |
|
385 | created new head | |
373 | $ hg mv --force i d |
|
386 | $ hg mv --force i d | |
374 | $ hg commit -m "f-2: rename i -> d" |
|
387 | $ hg commit -m "f-2: rename i -> d" | |
375 | $ hg debugindex d |
|
388 | $ hg debugindex d | ../no-linkrev | |
376 | rev linkrev nodeid p1 p2 |
|
389 | rev linkrev nodeid p1 p2 | |
377 |
0 |
|
390 | 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) | |
378 |
0 |
|
391 | 0 * ae258f702dfe 000000000000 000000000000 (changeset !) | |
379 |
1 |
|
392 | 1 * b004912a8510 000000000000 000000000000 | |
380 |
2 |
|
393 | 2 * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !) | |
381 | $ hg up 'desc("b-1")' |
|
394 | $ hg up 'desc("b-1")' | |
382 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
|
395 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) | |
383 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) |
|
396 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) | |
@@ -1543,13 +1556,13 b' The bugs makes recorded copy is differen' | |||||
1543 | $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' |
|
1556 | $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' | |
1544 | d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644 d (no-changeset !) |
|
1557 | d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644 d (no-changeset !) | |
1545 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 d (changeset !) |
|
1558 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 d (changeset !) | |
1546 | $ hg debugindex d | head -n 4 |
|
1559 | $ hg debugindex d | head -n 4 | ../no-linkrev | |
1547 | rev linkrev nodeid p1 p2 |
|
1560 | rev linkrev nodeid p1 p2 | |
1548 |
0 |
|
1561 | 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) | |
1549 |
0 |
|
1562 | 0 * ae258f702dfe 000000000000 000000000000 (changeset !) | |
1550 |
1 |
|
1563 | 1 * b004912a8510 000000000000 000000000000 | |
1551 |
2 |
|
1564 | 2 * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !) | |
1552 |
2 |
|
1565 | 2 * 5cce88bf349f ae258f702dfe 000000000000 (changeset !) | |
1553 |
|
1566 | |||
1554 | Log output should not include a merge commit as it did not happen |
|
1567 | Log output should not include a merge commit as it did not happen | |
1555 |
|
1568 | |||
@@ -1610,11 +1623,11 b' Subcase: new copy information on both si' | |||||
1610 | b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f |
|
1623 | b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f | |
1611 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
|
1624 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' | |
1612 | e8825b386367b29fec957283a80bb47b47483fe1 644 f |
|
1625 | e8825b386367b29fec957283a80bb47b47483fe1 644 f | |
1613 | $ hg debugindex f |
|
1626 | $ hg debugindex f | ../no-linkrev | |
1614 | rev linkrev nodeid p1 p2 |
|
1627 | rev linkrev nodeid p1 p2 | |
1615 |
0 |
|
1628 | 0 * b76eb76580df 000000000000 000000000000 | |
1616 |
1 |
|
1629 | 1 * e8825b386367 000000000000 000000000000 | |
1617 |
2 |
|
1630 | 2 * 2ff93c643948 b76eb76580df e8825b386367 | |
1618 | #else |
|
1631 | #else | |
1619 | $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' |
|
1632 | $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' | |
1620 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
|
1633 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f | |
@@ -1624,9 +1637,9 b' Subcase: new copy information on both si' | |||||
1624 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
|
1637 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f | |
1625 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
|
1638 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' | |
1626 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
|
1639 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f | |
1627 | $ hg debugindex f |
|
1640 | $ hg debugindex f | ../no-linkrev | |
1628 | rev linkrev nodeid p1 p2 |
|
1641 | rev linkrev nodeid p1 p2 | |
1629 |
0 |
|
1642 | 0 * ae258f702dfe 000000000000 000000000000 | |
1630 | #endif |
|
1643 | #endif | |
1631 |
|
1644 | |||
1632 | # Here the filelog based implementation is not looking at the rename |
|
1645 | # Here the filelog based implementation is not looking at the rename |
General Comments 0
You need to be logged in to leave comments.
Login now