Mercurial > hgsubversion
annotate tests/test_fetch_dir_removal.py @ 1515:106716ed2ed0
subrepo: add missing arg to dirty()
Upstream Mercurial has added a new 'missing' argument to the dirty function. We
need to add it as well. The default argument should mean this is backwards
compatible with older Mercurials.
I don't understand the subrepo or hgsubverison code 100%, so this patch is my
best attempt at a fix.
author | Durham Goode <durham@fb.com> |
---|---|
date | Tue, 11 Jul 2017 16:37:57 -0700 |
parents | 8c7dae2e0f54 |
children |
rev | line source |
---|---|
1509
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
1 import test_util |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
2 |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
3 import sys |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
4 import unittest |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
5 |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
6 class TestFetchDirectoryRemoval(test_util.TestBase): |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
7 stupid_mode_tests = True |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
8 |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
9 def test_removal(self): |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
10 repo = self._load_fixture_and_fetch('dir_removal.svndump', |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
11 layout='single', |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
12 subdir='dir1') |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
13 self.assertEqual(sorted(repo['tip'].manifest().keys()), |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
14 ['1.txt', 'dir2/2.txt']) |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
15 extra = repo['tip'].extra().copy() |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
16 extra.pop('convert_revision', None) |
8c7dae2e0f54
svnwrap: don't add paths to revision outside of subdir
Ivan Lezhankin <ilezhankin@yandex-team.ru>
parents:
diff
changeset
|
17 self.assertEqual(extra, {'branch': 'default'}) |