Show More
@@ -24,7 +24,6 from mercurial.node import ( | |||||
24 | short, |
|
24 | short, | |
25 | wdirrev, |
|
25 | wdirrev, | |
26 | ) |
|
26 | ) | |
27 | from mercurial.pycompat import open |
|
|||
28 | from mercurial import ( |
|
27 | from mercurial import ( | |
29 | bookmarks, |
|
28 | bookmarks, | |
30 | cmdutil, |
|
29 | cmdutil, | |
@@ -1857,7 +1856,7 def defineparents(repo, rev, destmap, st | |||||
1857 | def isagitpatch(repo, patchname): |
|
1856 | def isagitpatch(repo, patchname): | |
1858 | """Return true if the given patch is in git format""" |
|
1857 | """Return true if the given patch is in git format""" | |
1859 | mqpatch = os.path.join(repo.mq.path, patchname) |
|
1858 | mqpatch = os.path.join(repo.mq.path, patchname) | |
1860 |
for line in patch.linereader(open(mqpatch, |
|
1859 | for line in patch.linereader(open(mqpatch, 'rb')): | |
1861 | if line.startswith(b'diff --git'): |
|
1860 | if line.startswith(b'diff --git'): | |
1862 | return True |
|
1861 | return True | |
1863 | return False |
|
1862 | return False |
General Comments 0
You need to be logged in to leave comments.
Login now