Show More
@@ -817,3 +817,8 b' def override_rollback(orig, ui, repo, **' | |||||
817 | lfdirstate.add(file) |
|
817 | lfdirstate.add(file) | |
818 | lfdirstate.write() |
|
818 | lfdirstate.write() | |
819 | return result |
|
819 | return result | |
|
820 | ||||
|
821 | def override_transplant(orig, ui, repo, *revs, **opts): | |||
|
822 | result = orig(ui, repo, *revs, **opts) | |||
|
823 | lfcommands.updatelfiles(repo.ui, repo) | |||
|
824 | return result |
@@ -132,3 +132,6 b' def uisetup(ui):' | |||||
132 | if name == 'rebase': |
|
132 | if name == 'rebase': | |
133 | extensions.wrapcommand(getattr(module, 'cmdtable'), 'rebase', |
|
133 | extensions.wrapcommand(getattr(module, 'cmdtable'), 'rebase', | |
134 | overrides.override_rebase) |
|
134 | overrides.override_rebase) | |
|
135 | if name == 'transplant': | |||
|
136 | extensions.wrapcommand(getattr(module, 'cmdtable'), 'transplant', | |||
|
137 | overrides.override_transplant) |
@@ -3,6 +3,7 b'' | |||||
3 | > largefiles= |
|
3 | > largefiles= | |
4 | > purge= |
|
4 | > purge= | |
5 | > rebase= |
|
5 | > rebase= | |
|
6 | > transplant= | |||
6 | > [largefiles] |
|
7 | > [largefiles] | |
7 | > minsize=2 |
|
8 | > minsize=2 | |
8 | > patterns=glob:**.dat |
|
9 | > patterns=glob:**.dat | |
@@ -740,6 +741,91 b' coexist.' | |||||
740 | $ echo "largeasnormal" > sub2/large7 |
|
741 | $ echo "largeasnormal" > sub2/large7 | |
741 | $ hg add sub2/large7 |
|
742 | $ hg add sub2/large7 | |
742 | sub2/large7 already a largefile |
|
743 | sub2/large7 already a largefile | |
|
744 | ||||
|
745 | Test that transplanting a largefile change works correctly. | |||
|
746 | ||||
|
747 | $ cd .. | |||
|
748 | $ hg clone -r 8 d g | |||
|
749 | adding changesets | |||
|
750 | adding manifests | |||
|
751 | adding file changes | |||
|
752 | added 9 changesets with 26 changes to 10 files | |||
|
753 | updating to branch default | |||
|
754 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
755 | getting changed largefiles | |||
|
756 | 3 largefiles updated, 0 removed | |||
|
757 | $ cd g | |||
|
758 | $ hg transplant -s ../d 598410d3eb9a | |||
|
759 | searching for changes | |||
|
760 | searching for changes | |||
|
761 | adding changesets | |||
|
762 | adding manifests | |||
|
763 | adding file changes | |||
|
764 | added 1 changesets with 2 changes to 2 files | |||
|
765 | getting changed largefiles | |||
|
766 | 1 largefiles updated, 0 removed | |||
|
767 | $ hg log | |||
|
768 | changeset: 9:598410d3eb9a | |||
|
769 | tag: tip | |||
|
770 | user: test | |||
|
771 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
772 | summary: modify normal file largefile in repo d | |||
|
773 | ||||
|
774 | changeset: 8:a381d2c8c80e | |||
|
775 | user: test | |||
|
776 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
777 | summary: modify normal file and largefile in repo b | |||
|
778 | ||||
|
779 | changeset: 7:daea875e9014 | |||
|
780 | user: test | |||
|
781 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
782 | summary: add/edit more largefiles | |||
|
783 | ||||
|
784 | changeset: 6:4355d653f84f | |||
|
785 | user: test | |||
|
786 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
787 | summary: edit files yet again | |||
|
788 | ||||
|
789 | changeset: 5:9d5af5072dbd | |||
|
790 | user: test | |||
|
791 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
792 | summary: edit files again | |||
|
793 | ||||
|
794 | changeset: 4:74c02385b94c | |||
|
795 | user: test | |||
|
796 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
797 | summary: move files | |||
|
798 | ||||
|
799 | changeset: 3:9e8fbc4bce62 | |||
|
800 | user: test | |||
|
801 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
802 | summary: copy files | |||
|
803 | ||||
|
804 | changeset: 2:51a0ae4d5864 | |||
|
805 | user: test | |||
|
806 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
807 | summary: remove files | |||
|
808 | ||||
|
809 | changeset: 1:ce8896473775 | |||
|
810 | user: test | |||
|
811 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
812 | summary: edit files | |||
|
813 | ||||
|
814 | changeset: 0:30d30fe6a5be | |||
|
815 | user: test | |||
|
816 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
817 | summary: add files | |||
|
818 | ||||
|
819 | $ cat normal3 | |||
|
820 | normal3-modified | |||
|
821 | $ cat sub/normal4 | |||
|
822 | normal4-modified | |||
|
823 | $ cat sub/large4 | |||
|
824 | large4-modified | |||
|
825 | $ cat sub2/large6 | |||
|
826 | large6-modified | |||
|
827 | $ cat sub2/large7 | |||
|
828 | large7 | |||
743 | $ cd .. |
|
829 | $ cd .. | |
744 |
|
830 | |||
745 | vanilla clients not locked out from largefiles servers on vanilla repos |
|
831 | vanilla clients not locked out from largefiles servers on vanilla repos |
General Comments 0
You need to be logged in to leave comments.
Login now