Mercurial > hg
comparison mercurial/patch.py @ 33584:ea8c2478c907 stable
patch: update copying of dict keys and values to work on Python 3
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 24 Jul 2017 14:42:55 -0400 |
| parents | d78b7d734b63 |
| children | 5707bfe04deb |
comparison
equal
deleted
inserted
replaced
| 33583:b2c27d84f05c | 33584:ea8c2478c907 |
|---|---|
| 2567 | 2567 |
| 2568 gitmode = {'l': '120000', 'x': '100755', '': '100644'} | 2568 gitmode = {'l': '120000', 'x': '100755', '': '100644'} |
| 2569 | 2569 |
| 2570 if relroot != '' and (repo.ui.configbool('devel', 'all-warnings') | 2570 if relroot != '' and (repo.ui.configbool('devel', 'all-warnings') |
| 2571 or repo.ui.configbool('devel', 'check-relroot')): | 2571 or repo.ui.configbool('devel', 'check-relroot')): |
| 2572 for f in modified + added + removed + copy.keys() + copy.values(): | 2572 for f in modified + added + removed + list(copy) + list(copy.values()): |
| 2573 if f is not None and not f.startswith(relroot): | 2573 if f is not None and not f.startswith(relroot): |
| 2574 raise AssertionError( | 2574 raise AssertionError( |
| 2575 "file %s doesn't start with relroot %s" % (f, relroot)) | 2575 "file %s doesn't start with relroot %s" % (f, relroot)) |
| 2576 | 2576 |
| 2577 for f1, f2, copyop in _filepairs(modified, added, removed, copy, opts): | 2577 for f1, f2, copyop in _filepairs(modified, added, removed, copy, opts): |