##// END OF EJS Templates
hgweb: use introrev() for finding parents (issue4506)...
Anton Shestakov -
r24136:46d6cdfc default
parent child Browse files
Show More
@@ -138,9 +138,10 b' def _siblings(siblings=[], hiderev=None)'
138 yield d
138 yield d
139
139
140 def parents(ctx, hide=None):
140 def parents(ctx, hide=None):
141 if (isinstance(ctx, context.basefilectx) and
141 if isinstance(ctx, context.basefilectx):
142 ctx.changectx().rev() != ctx.linkrev()):
142 introrev = ctx.introrev()
143 return _siblings([ctx._repo[ctx.linkrev()]], hide)
143 if ctx.changectx().rev() != introrev:
144 return _siblings([ctx._repo[introrev]], hide)
144 return _siblings(ctx.parents(), hide)
145 return _siblings(ctx.parents(), hide)
145
146
146 def children(ctx, hide=None):
147 def children(ctx, hide=None):
@@ -754,6 +754,45 b' Test that removing a local tag does not '
754 visible 0:193e9254ce7e
754 visible 0:193e9254ce7e
755 tip 0:193e9254ce7e
755 tip 0:193e9254ce7e
756
756
757 #if serve
758
759 Test issue 4506
760
761 $ cd ..
762 $ hg init repo-issue4506
763 $ cd repo-issue4506
764 $ echo "0" > foo
765 $ hg add foo
766 $ hg ci -m "content-0"
767
768 $ hg up null
769 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
770 $ echo "1" > bar
771 $ hg add bar
772 $ hg ci -m "content-1"
773 created new head
774 $ hg up 0
775 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
776 $ hg graft 1
777 grafting 1:1c9eddb02162 "content-1" (tip)
778
779 $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'`
780
781 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
782 $ cat hg.pid >> $DAEMON_PIDS
783
784 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/1'
785 404 Not Found
786 [1]
787 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'file/tip/bar'
788 200 Script output follows
789 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'annotate/tip/bar'
790 200 Script output follows
791
792 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
793
794 #endif
795
757 $ hg init a
796 $ hg init a
758 $ cd a
797 $ cd a
759 $ touch foo
798 $ touch foo
General Comments 0
You need to be logged in to leave comments. Login now