mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
Fixed usage of removed variable 'wp'.
This commit is contained in:
parent
091e79d4cd
commit
ed63b972a6
@ -1000,7 +1000,7 @@ class localrepository:
|
|||||||
try:
|
try:
|
||||||
self.wfile(f, "w").write(t)
|
self.wfile(f, "w").write(t)
|
||||||
except IOError:
|
except IOError:
|
||||||
os.makedirs(os.path.dirname(wp))
|
os.makedirs(os.path.dirname(self.wjoin(f)))
|
||||||
self.wfile(f, "w").write(t)
|
self.wfile(f, "w").write(t)
|
||||||
set_exec(self.wjoin(f), mf2[f])
|
set_exec(self.wjoin(f), mf2[f])
|
||||||
self.dirstate.update([f], mode)
|
self.dirstate.update([f], mode)
|
||||||
@ -1012,7 +1012,7 @@ class localrepository:
|
|||||||
self.ui.status("merging %s\n" % f)
|
self.ui.status("merging %s\n" % f)
|
||||||
m, o, flag = merge[f]
|
m, o, flag = merge[f]
|
||||||
self.merge3(f, m, o)
|
self.merge3(f, m, o)
|
||||||
set_exec(wp, flag)
|
set_exec(self.wjoin(f), flag)
|
||||||
self.dirstate.update([f], 'm')
|
self.dirstate.update([f], 'm')
|
||||||
|
|
||||||
for f in remove:
|
for f in remove:
|
||||||
|
Loading…
Reference in New Issue
Block a user