Show More
@@ -367,6 +367,11 b' def getremotechanges(ui, repo, other, on' | |||||
367 | localrepo = bundlerepo = bundlerepository(ui, repo.root, fname) |
|
367 | localrepo = bundlerepo = bundlerepository(ui, repo.root, fname) | |
368 | # this repo contains local and other now, so filter out local again |
|
368 | # this repo contains local and other now, so filter out local again | |
369 | common = repo.heads() |
|
369 | common = repo.heads() | |
|
370 | if localrepo: | |||
|
371 | # Part of common may be remotely filtered | |||
|
372 | # So use an unfiltered version | |||
|
373 | # The discovery process probably need cleanup to avoid that | |||
|
374 | localrepo = localrepo.unfiltered() | |||
370 |
|
375 | |||
371 | csets = localrepo.changelog.findmissing(common, rheads) |
|
376 | csets = localrepo.changelog.findmissing(common, rheads) | |
372 |
|
377 |
@@ -776,4 +776,92 b' Checking _enable=False warning if obsole' | |||||
776 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
776 | date: Thu Jan 01 00:00:00 1970 +0000 | |
777 | summary: add celestine |
|
777 | summary: add celestine | |
778 |
|
778 | |||
|
779 | ||||
|
780 | reenable for later test | |||
|
781 | ||||
|
782 | $ echo '[extensions]' >> $HGRCPATH | |||
|
783 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH | |||
|
784 | ||||
779 | #endif |
|
785 | #endif | |
|
786 | ||||
|
787 | Test incoming/outcoming with changesets obsoleted remotely, known locally | |||
|
788 | =============================================================================== | |||
|
789 | ||||
|
790 | This test issue 3805 | |||
|
791 | ||||
|
792 | $ hg init repo-issue3805 | |||
|
793 | $ cd repo-issue3805 | |||
|
794 | $ echo "foo" > foo | |||
|
795 | $ hg ci -Am "A" | |||
|
796 | adding foo | |||
|
797 | $ hg clone . ../other-issue3805 | |||
|
798 | updating to branch default | |||
|
799 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
800 | $ echo "bar" >> foo | |||
|
801 | $ hg ci --amend | |||
|
802 | $ cd ../other-issue3805 | |||
|
803 | $ hg log -G | |||
|
804 | @ changeset: 0:193e9254ce7e | |||
|
805 | tag: tip | |||
|
806 | user: test | |||
|
807 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
808 | summary: A | |||
|
809 | ||||
|
810 | $ hg log -G -R ../repo-issue3805 | |||
|
811 | @ changeset: 2:3816541e5485 | |||
|
812 | tag: tip | |||
|
813 | parent: -1:000000000000 | |||
|
814 | user: test | |||
|
815 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
816 | summary: A | |||
|
817 | ||||
|
818 | $ hg incoming | |||
|
819 | comparing with $TESTTMP/tmpe/repo-issue3805 | |||
|
820 | searching for changes | |||
|
821 | changeset: 2:3816541e5485 | |||
|
822 | tag: tip | |||
|
823 | parent: -1:000000000000 | |||
|
824 | user: test | |||
|
825 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
826 | summary: A | |||
|
827 | ||||
|
828 | $ hg incoming --bundle ../issue3805.hg | |||
|
829 | comparing with $TESTTMP/tmpe/repo-issue3805 | |||
|
830 | searching for changes | |||
|
831 | changeset: 2:3816541e5485 | |||
|
832 | tag: tip | |||
|
833 | parent: -1:000000000000 | |||
|
834 | user: test | |||
|
835 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
836 | summary: A | |||
|
837 | ||||
|
838 | $ hg outgoing | |||
|
839 | comparing with $TESTTMP/tmpe/repo-issue3805 | |||
|
840 | searching for changes | |||
|
841 | no changes found | |||
|
842 | [1] | |||
|
843 | ||||
|
844 | #if serve | |||
|
845 | ||||
|
846 | $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |||
|
847 | $ cat hg.pid >> $DAEMON_PIDS | |||
|
848 | ||||
|
849 | $ hg incoming http://localhost:$HGPORT | |||
|
850 | comparing with http://localhost:$HGPORT/ | |||
|
851 | searching for changes | |||
|
852 | changeset: 1:3816541e5485 | |||
|
853 | tag: tip | |||
|
854 | parent: -1:000000000000 | |||
|
855 | user: test | |||
|
856 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
857 | summary: A | |||
|
858 | ||||
|
859 | $ hg outgoing http://localhost:$HGPORT | |||
|
860 | comparing with http://localhost:$HGPORT/ | |||
|
861 | searching for changes | |||
|
862 | no changes found | |||
|
863 | [1] | |||
|
864 | ||||
|
865 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS | |||
|
866 | ||||
|
867 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now