Show More
@@ -681,9 +681,9 b' def overridepull(orig, ui, repo, source=' | |||
|
681 | 681 | def _dummy(*args, **kwargs): |
|
682 | 682 | pass |
|
683 | 683 | commands.postincoming = _dummy |
|
684 | repo.lfpullsource = source | |
|
685 | 684 | if not source: |
|
686 | 685 | source = 'default' |
|
686 | repo.lfpullsource = source | |
|
687 | 687 | try: |
|
688 | 688 | result = commands.pull(ui, repo, source, **opts) |
|
689 | 689 | finally: |
@@ -694,9 +694,9 b' def overridepull(orig, ui, repo, source=' | |||
|
694 | 694 | finally: |
|
695 | 695 | repo._isrebasing = False |
|
696 | 696 | else: |
|
697 | repo.lfpullsource = source | |
|
698 | 697 | if not source: |
|
699 | 698 | source = 'default' |
|
699 | repo.lfpullsource = source | |
|
700 | 700 | oldheads = lfutil.getcurrentheads(repo) |
|
701 | 701 | result = orig(ui, repo, source, **opts) |
|
702 | 702 | # If we do not have the new largefiles for any new heads we pulled, we |
@@ -765,7 +765,9 b' Ensure base clone command argument valid' | |||
|
765 | 765 | abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a |
|
766 | 766 | [255] |
|
767 | 767 | |
|
768 | Test pulling with --all-largefiles flag | |
|
768 | Test pulling with --all-largefiles flag. Also test that the largefiles are | |
|
769 | downloaded from 'default' instead of 'default-push' when no source is specified | |
|
770 | (issue3584) | |
|
769 | 771 | |
|
770 | 772 | $ rm -Rf a-backup |
|
771 | 773 | $ hg clone -r 1 a a-backup |
@@ -779,7 +781,7 b' Test pulling with --all-largefiles flag' | |||
|
779 | 781 | 2 largefiles updated, 0 removed |
|
780 | 782 | $ rm "${USERCACHE}"/* |
|
781 | 783 | $ cd a-backup |
|
782 | $ hg pull --all-largefiles | |
|
784 | $ hg pull --all-largefiles --config paths.default-push=bogus/path | |
|
783 | 785 | pulling from $TESTTMP/a (glob) |
|
784 | 786 | searching for changes |
|
785 | 787 | adding changesets |
@@ -821,8 +823,12 b' revisions (this was a very bad bug that ' | |||
|
821 | 823 | getting changed largefiles |
|
822 | 824 | 3 largefiles updated, 0 removed |
|
823 | 825 | $ cd d |
|
824 | $ hg pull --rebase ../b | |
|
825 | pulling from ../b | |
|
826 | ||
|
827 | More rebase testing, but also test that the largefiles are downloaded from | |
|
828 | 'default' instead of 'default-push' when no source is specified (issue3584). | |
|
829 | The error messages go away if repo 'b' is created with --all-largefiles. | |
|
830 | $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b | |
|
831 | pulling from $TESTTMP/b (glob) | |
|
826 | 832 | searching for changes |
|
827 | 833 | adding changesets |
|
828 | 834 | adding manifests |
@@ -832,6 +838,26 b' revisions (this was a very bad bug that ' | |||
|
832 | 838 | M sub/normal4 |
|
833 | 839 | M sub2/large6 |
|
834 | 840 | saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob) |
|
841 | large3: can't get file locally | |
|
842 | (no default or default-push path set in hgrc) | |
|
843 | sub/large4: can't get file locally | |
|
844 | (no default or default-push path set in hgrc) | |
|
845 | large1: can't get file locally | |
|
846 | (no default or default-push path set in hgrc) | |
|
847 | sub/large2: can't get file locally | |
|
848 | (no default or default-push path set in hgrc) | |
|
849 | sub/large2: can't get file locally | |
|
850 | (no default or default-push path set in hgrc) | |
|
851 | large1: can't get file locally | |
|
852 | (no default or default-push path set in hgrc) | |
|
853 | sub/large2: can't get file locally | |
|
854 | (no default or default-push path set in hgrc) | |
|
855 | large1: can't get file locally | |
|
856 | (no default or default-push path set in hgrc) | |
|
857 | sub/large2: can't get file locally | |
|
858 | (no default or default-push path set in hgrc) | |
|
859 | 0 additional largefiles cached | |
|
860 | 9 largefiles failed to download | |
|
835 | 861 | nothing to rebase |
|
836 | 862 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
|
837 | 863 | 9:598410d3eb9a modify normal file largefile in repo d |
General Comments 0
You need to be logged in to leave comments.
Login now