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

[pushrebase] fix for Mercurial 3.4

Browse Source 
Summary: The `intersectfiles` API changed.

Test Plan: ran the tests

Reviewers: ericsumner, #sourcecontrol

Reviewed By: ericsumner, #sourcecontrol

Differential Revision: https://phabricator.fb.com/D1966309

Tasks: 6619970

Signature: t1:1966309:1428086453:415a185b71af4812de2f5b6690a5337a5950aab6
This commit is contained in:
Siddharth Agarwal 2015-04-03 11:38:55 -07:00
parent 8b3d2878c1
commit 9a3748f730
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pushrebase.py
View File

@ -221,8 +221,8 @@ def _getrevs(bundle, onto):
# Is there a more efficient way to do this check?
files = reduce(operator.or_, [set(rev.files()) for rev in revs], set())
commonmanifest = tail.p1().manifest().intersectfiles(files)
ontomanifest = onto.manifest().intersectfiles(files)
commonmanifest = tail.p1().manifest()._intersectfiles(files)
ontomanifest = onto.manifest()._intersectfiles(files)
conflicts = ontomanifest.diff(commonmanifest).keys()
if conflicts:
raise util.Abort(_('conflicting changes in %r') % conflicts)