← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf.py

  • Committer: Michael Ellerman
  • Date: 2006-05-08 13:41:39 UTC
  • mto: (0.3.1 shelf-dev)
  • mto: This revision was merged to the branch mainline in revision 367.
  • Revision ID: michael@ellerman.id.au-20060508134139-186439dff5f7e3bf
Assume -p0 format diffs by default, fall back to -p1 on failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shelf.py
159
159
            self._run_patch(to_unshelve)
160
160
        except PatchFailed:
161
161
            try:
162
 
                self._run_patch(to_unshelve, strip=0, dry_run=True)
163
 
                self._run_patch(to_unshelve, strip=0)
 
162
                self._run_patch(to_unshelve, strip=1, dry_run=True)
 
163
                self._run_patch(to_unshelve, strip=1)
164
164
            except PatchFailed:
165
165
                if force:
166
166
                    self.log('Warning: Unshelving failed, forcing as ' \
220
220
            self._run_patch(to_shelve, reverse=True)
221
221
        except PatchFailed:
222
222
            try:
223
 
                self._run_patch(to_shelve, reverse=True, strip=0, dry_run=True)
224
 
                self._run_patch(to_shelve, reverse=True, strip=0)
 
223
                self._run_patch(to_shelve, reverse=True, strip=1, dry_run=True)
 
224
                self._run_patch(to_shelve, reverse=True, strip=1)
225
225
            except PatchFailed:
226
226
                raise CommandError("Failed removing shelved changes from the"
227
227
                    "working tree!")
228
228
 
229
 
    def _run_patch(self, patches, strip=1, reverse=False, dry_run=False):
 
229
    def _run_patch(self, patches, strip=0, reverse=False, dry_run=False):
230
230
        args = ['patch', '-d', self.base, '-s', '-p%d' % strip, '-f']
231
231
        if reverse:
232
232
            args.append('-R')