##// END OF EJS Templates
shelve: access status fields by name rather than index
Martin von Zweigbergk -
r22922:ebef5fcf default
parent child Browse files
Show More
@@ -230,9 +230,9 b' def createcmd(ui, repo, pats, opts):'
230
230
231 if not node:
231 if not node:
232 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
232 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
233 if stat[3]:
233 if stat.deleted:
234 ui.status(_("nothing changed (%d missing files, see "
234 ui.status(_("nothing changed (%d missing files, see "
235 "'hg status')\n") % len(stat[3]))
235 "'hg status')\n") % len(stat.deleted))
236 else:
236 else:
237 ui.status(_("nothing changed\n"))
237 ui.status(_("nothing changed\n"))
238 return 1
238 return 1
@@ -404,7 +404,7 b' def mergefiles(ui, repo, wctx, shelvectx'
404 files.extend(shelvectx.parents()[0].files())
404 files.extend(shelvectx.parents()[0].files())
405
405
406 # revert will overwrite unknown files, so move them out of the way
406 # revert will overwrite unknown files, so move them out of the way
407 for file in repo.status(unknown=True)[4]:
407 for file in repo.status(unknown=True).unknown:
408 if file in files:
408 if file in files:
409 util.rename(file, file + ".orig")
409 util.rename(file, file + ".orig")
410 ui.pushbuffer(True)
410 ui.pushbuffer(True)
@@ -550,8 +550,8 b' def unshelve(ui, repo, *shelved, **opts)'
550 # to the original pctx.
550 # to the original pctx.
551
551
552 # Store pending changes in a commit
552 # Store pending changes in a commit
553 m, a, r, d = repo.status()[:4]
553 s = repo.status()
554 if m or a or r or d:
554 if s.modified or s.added or s.removed or s.deleted:
555 ui.status(_("temporarily committing pending changes "
555 ui.status(_("temporarily committing pending changes "
556 "(restore with 'hg unshelve --abort')\n"))
556 "(restore with 'hg unshelve --abort')\n"))
557 def commitfunc(ui, repo, message, match, opts):
557 def commitfunc(ui, repo, message, match, opts):
General Comments 0
You need to be logged in to leave comments. Login now