##// 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:

r18894:ed46c2b9 default
r22284:72b37865 default
Show More
test-dicthelpers.py
59 lines | 2.3 KiB | text/x-python | PythonLexer
from mercurial.dicthelpers import diff, join
import unittest
import silenttestrunner
class testdicthelpers(unittest.TestCase):
def test_dicthelpers(self):
# empty dicts
self.assertEqual(diff({}, {}), {})
self.assertEqual(join({}, {}), {})
d1 = {}
d1['a'] = 'foo'
d1['b'] = 'bar'
d1['c'] = 'baz'
# same identity
self.assertEqual(diff(d1, d1), {})
self.assertEqual(join(d1, d1), {'a': ('foo', 'foo'),
'b': ('bar', 'bar'),
'c': ('baz', 'baz')})
# vs empty
self.assertEqual(diff(d1, {}), {'a': ('foo', None),
'b': ('bar', None),
'c': ('baz', None)})
self.assertEqual(diff(d1, {}), {'a': ('foo', None),
'b': ('bar', None),
'c': ('baz', None)})
d2 = {}
d2['a'] = 'foo2'
d2['b'] = 'bar'
d2['d'] = 'quux'
self.assertEqual(diff(d1, d2), {'a': ('foo', 'foo2'),
'c': ('baz', None),
'd': (None, 'quux')})
self.assertEqual(join(d1, d2), {'a': ('foo', 'foo2'),
'b': ('bar', 'bar'),
'c': ('baz', None),
'd': (None, 'quux')})
# with default argument
self.assertEqual(diff(d1, d2, 123), {'a': ('foo', 'foo2'),
'c': ('baz', 123),
'd': (123, 'quux')})
self.assertEqual(join(d1, d2, 456), {'a': ('foo', 'foo2'),
'b': ('bar', 'bar'),
'c': ('baz', 456),
'd': (456, 'quux')})
# check that we compare against default
self.assertEqual(diff(d1, d2, 'baz'), {'a': ('foo', 'foo2'),
'd': ('baz', 'quux')})
self.assertEqual(diff(d1, d2, 'quux'), {'a': ('foo', 'foo2'),
'c': ('baz', 'quux')})
if __name__ == '__main__':
silenttestrunner.main(__name__)