##// END OF EJS Templates
largefiles: restore standins from non branch-tip parent at rollback correctly...
largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

File last commit:

r16686:67964cda default
r22284:72b37865 default
Show More
test-walkrepo.py
55 lines | 1.8 KiB | text/x-python | PythonLexer
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 import os
from mercurial import hg, ui
Adrian Buehlmann
move walkrepos from util to scmutil
r13975 from mercurial.scmutil import walkrepos
Matt Mackall
tests: make test-walkrepo use hg's symlink test
r16321 from mercurial.util import checklink
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 from os import mkdir, chdir
from os.path import join as pjoin
u = ui.ui()
Matt Mackall
tests: make test-walkrepo use hg's symlink test
r16321 sym = checklink('.')
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341
hg.repository(u, 'top1', create=1)
mkdir('subdir')
chdir('subdir')
hg.repository(u, 'sub1', create=1)
mkdir('subsubdir')
chdir('subsubdir')
hg.repository(u, 'subsub1', create=1)
chdir(os.path.pardir)
if sym:
os.symlink(os.path.pardir, 'circle')
os.symlink(pjoin('subsubdir', 'subsub1'), 'subsub1')
def runtest():
reposet = frozenset(walkrepos('.', followsym=True))
Patrick Mezard
util: disable walkrepo() recursive behaviour...
r7494 if sym and (len(reposet) != 3):
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 print "reposet = %r" % (reposet,)
Brodie Rao
cleanup: eradicate long lines
r16683 print ("Found %d repositories when I should have found 3"
% (len(reposet),))
Patrick Mezard
util: disable walkrepo() recursive behaviour...
r7494 if (not sym) and (len(reposet) != 2):
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 print "reposet = %r" % (reposet,)
Brodie Rao
cleanup: eradicate long lines
r16683 print ("Found %d repositories when I should have found 2"
% (len(reposet),))
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub1set = frozenset((pjoin('.', 'sub1'),
pjoin('.', 'circle', 'subdir', 'sub1')))
if len(sub1set & reposet) != 1:
print "sub1set = %r" % (sub1set,)
print "reposet = %r" % (reposet,)
Benoit Allard
tests: test-walkrepo shouldn't throw SystemExit...
r7492 print "sub1set and reposet should have exactly one path in common."
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub2set = frozenset((pjoin('.', 'subsub1'),
pjoin('.', 'subsubdir', 'subsub1')))
if len(sub2set & reposet) != 1:
print "sub2set = %r" % (sub2set,)
print "reposet = %r" % (reposet,)
Benoit Allard
tests: test-walkrepo shouldn't throw SystemExit...
r7492 print "sub1set and reposet should have exactly one path in common."
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub3 = pjoin('.', 'circle', 'top1')
Brodie Rao
cleanup: "not x in y" -> "x not in y"
r16686 if sym and sub3 not in reposet:
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 print "reposet = %r" % (reposet,)
Benoit Allard
tests: test-walkrepo shouldn't throw SystemExit...
r7492 print "Symbolic links are supported and %s is not in reposet" % (sub3,)
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341
runtest()
if sym:
# Simulate not having symlinks.
del os.path.samestat
sym = False
runtest()