facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity

utility_commands: fix hg svn genignore for single-directory mode

Browse Source
This commit is contained in:
Augie Fackler 2010-02-06 11:13:55 -06:00
parent ebcd96fd15
commit 555e763e54
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hgsubversion/utility_commands.py
View File

@ -17,12 +17,16 @@ def genignore(ui, repo, force=False, **opts):
hashes = meta.revmap.hashes()
parent = util.parentrev(ui, repo, meta, hashes)
r, br = hashes[parent.node()]
branchpath = br and ('branches/%s' % br) or 'trunk'
if meta.layout == 'single':
branchpath = ''
else:
branchpath = br and ('branches/%s/' % br) or 'trunk/'
ignorelines = ['.hgignore', 'syntax:glob']
dirs = [''] + [d[0] for d in svn.list_files(branchpath, r)
if d[1] == 'd']
for dir in dirs:
props = svn.list_props('%s/%s/' % (branchpath, dir), r)
path = '%s%s' % (branchpath, dir)
props = svn.list_props(path, r)
if 'svn:ignore' not in props:
continue
lines = props['svn:ignore'].strip().split('\n')

9
tests/test_utility_commands.py
View File

@ -212,6 +212,15 @@ class UtilityTests(test_util.TestBase):
self.assertEqual(open(os.path.join(self.wc_path, '.hgignore')).read(),
'.hgignore\nsyntax:glob\nblah\notherblah\nbaz/magic\n')
def test_genignore_single(self):
self._load_fixture_and_fetch('ignores.svndump', subdir='trunk')
hg.update(self.repo, 'tip')
u = ui.ui()
u.pushbuffer()
utility_commands.genignore(u, self.repo, self.wc_path)
self.assertStringEqual(open(os.path.join(self.wc_path, '.hgignore')).read(),
'.hgignore\nsyntax:glob\nblah\notherblah\nbaz/magic\n')
def test_list_authors(self):
test_util.load_svndump_fixture(self.repo_path,
'replace_trunk_with_branch.svndump')