~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf.py

  • Committer: Aaron Bentley
  • Date: 2008-06-03 14:46:55 UTC
  • Revision ID: aaron@aaronbentley.com-20080603144655-8v3zq81xmlwefg2d
Fix behavior when TERM is set to nothing

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
import os
2
2
import sys
 
3
import subprocess
3
4
from datetime import datetime
4
 
from errors import CommandError, PatchFailed
 
5
from errors import CommandError, PatchFailed, PatchInvokeError
5
6
from hunk_selector import ShelveHunkSelector, UnshelveHunkSelector
6
7
from patch import run_patch
7
 
from patchsource import FilePatchSource
 
8
from patchsource import PatchSource, FilePatchSource
8
9
from bzrlib.osutils import rename
9
10
 
10
11
class Shelf(object):