Show More
@@ -60,8 +60,8 b' def _getstorehashcachename(remotepath):' | |||
|
60 | 60 | class SubrepoAbort(error.Abort): |
|
61 | 61 | """Exception class used to avoid handling a subrepo error more than once""" |
|
62 | 62 | def __init__(self, *args, **kw): |
|
63 | self.subrepo = kw.pop('subrepo', None) | |
|
64 | self.cause = kw.pop('cause', None) | |
|
63 | self.subrepo = kw.pop(r'subrepo', None) | |
|
64 | self.cause = kw.pop(r'cause', None) | |
|
65 | 65 | error.Abort.__init__(self, *args, **kw) |
|
66 | 66 | |
|
67 | 67 | def annotatesubrepoerror(func): |
@@ -1244,7 +1244,7 b' class svnsubrepo(abstractsubrepo):' | |||
|
1244 | 1244 | if not self.ui.interactive(): |
|
1245 | 1245 | # Making stdin be a pipe should prevent svn from behaving |
|
1246 | 1246 | # interactively even if we can't pass --non-interactive. |
|
1247 | extrakw['stdin'] = subprocess.PIPE | |
|
1247 | extrakw[r'stdin'] = subprocess.PIPE | |
|
1248 | 1248 | # Starting in svn 1.5 --non-interactive is a global flag |
|
1249 | 1249 | # instead of being per-command, but we need to support 1.4 so |
|
1250 | 1250 | # we have to be intelligent about what commands take |
General Comments 0
You need to be logged in to leave comments.
Login now