Mercurial > hgsubversion

comparison tests/test_push_dirs.py @ 832:e9af7eba88db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
globally: clean up whitespace around operators and commas to conform with PEP8 Mostly autoformatted by Eclipse. A few manual corrections were performed where Eclipse's autoformatter did something non-idiomatic.
author Yonggang Luo <luoyonggang@gmail.com>
date Wed, 12 Oct 2011 15:35:25 +0800
parents de036c2cb36a
children 312b37bc5e20
comparison
equal deleted inserted replaced
831:be5bbb2f2d68 832:e9af7eba88db
46 ['d2', 'd2/b', 'd31', 'd31/d32', 'd31/d32/a', ]) 46 ['d2', 'd2/b', 'd31', 'd31/d32', 'd31/d32/a', ])
47 47
48 def test_push_new_dir_project_root_not_repo_root(self): 48 def test_push_new_dir_project_root_not_repo_root(self):
49 self._load_fixture_and_fetch('fetch_missing_files_subdir.svndump', 49 self._load_fixture_and_fetch('fetch_missing_files_subdir.svndump',
50 subdir='foo') 50 subdir='foo')
51 changes = [('magic_new/a', 'magic_new/a', 'ohai', ), 51 changes = [('magic_new/a', 'magic_new/a', 'ohai',),
52 ] 52 ]
53 self.commitchanges(changes) 53 self.commitchanges(changes)
54 self.pushrevisions() 54 self.pushrevisions()
55 self.assertEqual(self.svnls('foo/trunk'), ['bar', 55 self.assertEqual(self.svnls('foo/trunk'), ['bar',
56 'bar/alpha', 56 'bar/alpha',
62 'magic_new/a']) 62 'magic_new/a'])
63 63
64 def test_push_new_file_existing_dir_root_not_repo_root(self): 64 def test_push_new_file_existing_dir_root_not_repo_root(self):
65 self._load_fixture_and_fetch('empty_dir_in_trunk_not_repo_root.svndump', 65 self._load_fixture_and_fetch('empty_dir_in_trunk_not_repo_root.svndump',
66 subdir='project') 66 subdir='project')
67 changes = [('narf/a', 'narf/a', 'ohai', ), 67 changes = [('narf/a', 'narf/a', 'ohai',),
68 ] 68 ]
69 self.commitchanges(changes) 69 self.commitchanges(changes)
70 self.assertEqual(self.svnls('project/trunk'), ['a', 70 self.assertEqual(self.svnls('project/trunk'), ['a',
71 'narf',]) 71 'narf',
72 ])
72 self.pushrevisions() 73 self.pushrevisions()
73 self.assertEqual(self.svnls('project/trunk'), ['a', 74 self.assertEqual(self.svnls('project/trunk'), ['a',
74 'narf', 75 'narf',
75 'narf/a']) 76 'narf/a'])
76 changes = [('narf/a', None, None, ), 77 changes = [('narf/a', None, None,),
77 ] 78 ]
78 self.commitchanges(changes) 79 self.commitchanges(changes)
79 self.pushrevisions() 80 self.pushrevisions()
80 self.assertEqual(self.svnls('project/trunk'), ['a' ,]) 81 self.assertEqual(self.svnls('project/trunk'), ['a'])
81 82
82 def test_push_single_dir_change_in_subdir(self): 83 def test_push_single_dir_change_in_subdir(self):
83 # Tests simple pushing from default branch to a single dir repo 84 # Tests simple pushing from default branch to a single dir repo
84 # Changes a file in a subdir (regression). 85 # Changes a file in a subdir (regression).
85 repo = self._load_fixture_and_fetch('branch_from_tag.svndump', 86 repo = self._load_fixture_and_fetch('branch_from_tag.svndump',