Mercurial > hg
comparison tests/test-largefiles.t @ 34661:eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Upon pull or unbundle, we display a message with the range of new revisions
fetched. This revision range could readily be used after a pull to look out
what's new with 'hg log'. The algorithm takes care of filtering "obsolete"
revisions that might be present in transaction's "changes" but should not be
displayed to the end user.
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Thu, 12 Oct 2017 09:39:50 +0200 |
parents | 3b7cb3d17137 |
children | 4441705b7111 |
comparison
equal
deleted
inserted
replaced
34660:d00ec62d156f | 34661:eb586ed5d8ce |
---|---|
959 $ hg clone a -r 3 c | 959 $ hg clone a -r 3 c |
960 adding changesets | 960 adding changesets |
961 adding manifests | 961 adding manifests |
962 adding file changes | 962 adding file changes |
963 added 4 changesets with 10 changes to 4 files | 963 added 4 changesets with 10 changes to 4 files |
964 new changesets 30d30fe6a5be:9e8fbc4bce62 | |
964 updating to branch default | 965 updating to branch default |
965 getting changed largefiles | 966 getting changed largefiles |
966 2 largefiles updated, 0 removed | 967 2 largefiles updated, 0 removed |
967 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | 968 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
968 $ cd c | 969 $ cd c |
1087 $ hg clone -r 1 a a-backup | 1088 $ hg clone -r 1 a a-backup |
1088 adding changesets | 1089 adding changesets |
1089 adding manifests | 1090 adding manifests |
1090 adding file changes | 1091 adding file changes |
1091 added 2 changesets with 8 changes to 4 files | 1092 added 2 changesets with 8 changes to 4 files |
1093 new changesets 30d30fe6a5be:ce8896473775 | |
1092 updating to branch default | 1094 updating to branch default |
1093 getting changed largefiles | 1095 getting changed largefiles |
1094 2 largefiles updated, 0 removed | 1096 2 largefiles updated, 0 removed |
1095 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1097 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1096 $ rm "${USERCACHE}"/* | 1098 $ rm "${USERCACHE}"/* |
1100 searching for changes | 1102 searching for changes |
1101 adding changesets | 1103 adding changesets |
1102 adding manifests | 1104 adding manifests |
1103 adding file changes | 1105 adding file changes |
1104 added 6 changesets with 16 changes to 8 files | 1106 added 6 changesets with 16 changes to 8 files |
1107 new changesets 51a0ae4d5864:daea875e9014 | |
1105 (run 'hg update' to get a working copy) | 1108 (run 'hg update' to get a working copy) |
1106 6 largefiles cached | 1109 6 largefiles cached |
1107 | 1110 |
1108 redo pull with --lfrev and check it pulls largefiles for the right revs | 1111 redo pull with --lfrev and check it pulls largefiles for the right revs |
1109 | 1112 |
1127 465 sub/normal4 | 1130 465 sub/normal4 |
1128 adding changesets | 1131 adding changesets |
1129 adding manifests | 1132 adding manifests |
1130 adding file changes | 1133 adding file changes |
1131 added 6 changesets with 16 changes to 8 files | 1134 added 6 changesets with 16 changes to 8 files |
1135 new changesets 51a0ae4d5864:daea875e9014 | |
1132 calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles | 1136 calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles |
1133 (run 'hg update' to get a working copy) | 1137 (run 'hg update' to get a working copy) |
1134 pulling largefiles for revision 7 | 1138 pulling largefiles for revision 7 |
1135 found 971fb41e78fea4f8e0ba5244784239371cb00591 in store | 1139 found 971fb41e78fea4f8e0ba5244784239371cb00591 in store |
1136 found 0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 in store | 1140 found 0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 in store |
1199 searching for changes | 1203 searching for changes |
1200 adding changesets | 1204 adding changesets |
1201 adding manifests | 1205 adding manifests |
1202 adding file changes | 1206 adding file changes |
1203 added 1 changesets with 2 changes to 2 files (+1 heads) | 1207 added 1 changesets with 2 changes to 2 files (+1 heads) |
1208 new changesets a381d2c8c80e | |
1204 rebasing 8:f574fb32bb45 "modify normal file largefile in repo d" | 1209 rebasing 8:f574fb32bb45 "modify normal file largefile in repo d" |
1205 Invoking status precommit hook | 1210 Invoking status precommit hook |
1206 M sub/normal4 | 1211 M sub/normal4 |
1207 M sub2/large6 | 1212 M sub2/large6 |
1208 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg (glob) | 1213 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg (glob) |
1256 searching for changes | 1261 searching for changes |
1257 adding changesets | 1262 adding changesets |
1258 adding manifests | 1263 adding manifests |
1259 adding file changes | 1264 adding file changes |
1260 added 1 changesets with 2 changes to 2 files (+1 heads) | 1265 added 1 changesets with 2 changes to 2 files (+1 heads) |
1266 new changesets a381d2c8c80e | |
1261 (run 'hg heads' to see heads, 'hg merge' to merge) | 1267 (run 'hg heads' to see heads, 'hg merge' to merge) |
1262 $ hg rebase | 1268 $ hg rebase |
1263 rebasing 8:f574fb32bb45 "modify normal file largefile in repo d" | 1269 rebasing 8:f574fb32bb45 "modify normal file largefile in repo d" |
1264 Invoking status precommit hook | 1270 Invoking status precommit hook |
1265 M sub/normal4 | 1271 M sub/normal4 |
1661 $ hg clone -r 7 e temp | 1667 $ hg clone -r 7 e temp |
1662 adding changesets | 1668 adding changesets |
1663 adding manifests | 1669 adding manifests |
1664 adding file changes | 1670 adding file changes |
1665 added 8 changesets with 24 changes to 10 files | 1671 added 8 changesets with 24 changes to 10 files |
1672 new changesets 30d30fe6a5be:daea875e9014 | |
1666 updating to branch default | 1673 updating to branch default |
1667 getting changed largefiles | 1674 getting changed largefiles |
1668 3 largefiles updated, 0 removed | 1675 3 largefiles updated, 0 removed |
1669 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1676 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1670 $ hg clone temp f | 1677 $ hg clone temp f |
1686 searching for changes | 1693 searching for changes |
1687 adding changesets | 1694 adding changesets |
1688 adding manifests | 1695 adding manifests |
1689 adding file changes | 1696 adding file changes |
1690 added 2 changesets with 4 changes to 4 files (+1 heads) | 1697 added 2 changesets with 4 changes to 4 files (+1 heads) |
1698 new changesets a381d2c8c80e:598410d3eb9a | |
1691 (run 'hg heads' to see heads, 'hg merge' to merge) | 1699 (run 'hg heads' to see heads, 'hg merge' to merge) |
1692 2 largefiles cached | 1700 2 largefiles cached |
1693 $ hg merge | 1701 $ hg merge |
1694 largefile sub/large4 has a merge conflict | 1702 largefile sub/large4 has a merge conflict |
1695 ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591 | 1703 ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591 |
1761 $ hg clone -r 8 d g | 1769 $ hg clone -r 8 d g |
1762 adding changesets | 1770 adding changesets |
1763 adding manifests | 1771 adding manifests |
1764 adding file changes | 1772 adding file changes |
1765 added 9 changesets with 26 changes to 10 files | 1773 added 9 changesets with 26 changes to 10 files |
1774 new changesets 30d30fe6a5be:a381d2c8c80e | |
1766 updating to branch default | 1775 updating to branch default |
1767 getting changed largefiles | 1776 getting changed largefiles |
1768 3 largefiles updated, 0 removed | 1777 3 largefiles updated, 0 removed |
1769 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1778 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1770 $ cd g | 1779 $ cd g |
1773 searching for changes | 1782 searching for changes |
1774 adding changesets | 1783 adding changesets |
1775 adding manifests | 1784 adding manifests |
1776 adding file changes | 1785 adding file changes |
1777 added 1 changesets with 2 changes to 2 files | 1786 added 1 changesets with 2 changes to 2 files |
1787 new changesets 598410d3eb9a | |
1778 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' | 1788 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
1779 9:598410d3eb9a modify normal file largefile in repo d | 1789 9:598410d3eb9a modify normal file largefile in repo d |
1780 8:a381d2c8c80e modify normal file and largefile in repo b | 1790 8:a381d2c8c80e modify normal file and largefile in repo b |
1781 7:daea875e9014 add/edit more largefiles | 1791 7:daea875e9014 add/edit more largefiles |
1782 6:4355d653f84f edit files yet again | 1792 6:4355d653f84f edit files yet again |