Commits

TK Soh committed 09cce37 Merge

merge

  • Participants
  • Parent commits 91a9772, 94d2cbf

Comments (0)

Files changed (1)

         return
         
     try:
-        fp = cStringIO.StringIO()
-        fp.write(repo.opener(shelfpath).read())
+        patch_diff = repo.opener(shelfpath).read()
+        fp = cStringIO.StringIO(patch_diff)
         if opts['inspect']:
             ui.status(fp.getvalue())
         else:
             files = []
-            for chunk in parsepatch(fp):
+            ac = parsepatch(fp)
+            for chunk in ac:
                 if isinstance(chunk, header):
                     files += chunk.files()
             backupdir = repo.join('shelve-backups')