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

shelve: remove unused status variables

Browse Source
This commit is contained in:
Martin von Zweigbergk 2014-09-24 17:18:57 -07:00
parent 84f08d1ab8
commit 56e566f347
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hgext/shelve.py
View File

@ -401,8 +401,7 @@ def mergefiles(ui, repo, wctx, shelvectx):
files.extend(shelvectx.parents()[0].files())
# revert will overwrite unknown files, so move them out of the way
m, a, r, d, u = repo.status(unknown=True)[:5]
for file in u:
for file in repo.status(unknown=True)[4]:
if file in files:
util.rename(file, file + ".orig")
ui.pushbuffer(True)