Commits

TK Soh committed 09cce37 Merge

merge

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')
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.