Mercurial > hg-stable
comparison hgext/rebase.py @ 19951:d51c4d85ec23 stable
spelling: random spell checker fixes
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 24 Oct 2013 01:49:56 +0800 |
| parents | 0f99747202f9 |
| children | 2160c2e0d7d1 |
comparison
equal
deleted
inserted
replaced
| 19950:cce7ab960312 | 19951:d51c4d85ec23 |
|---|---|
| 634 if err.errno != errno.ENOENT: | 634 if err.errno != errno.ENOENT: |
| 635 raise | 635 raise |
| 636 raise util.Abort(_('no rebase in progress')) | 636 raise util.Abort(_('no rebase in progress')) |
| 637 | 637 |
| 638 def inrebase(repo, originalwd, state): | 638 def inrebase(repo, originalwd, state): |
| 639 '''check whether the workdir is in an interrupted rebase''' | 639 '''check whether the working dir is in an interrupted rebase''' |
| 640 parents = [p.rev() for p in repo.parents()] | 640 parents = [p.rev() for p in repo.parents()] |
| 641 if originalwd in parents: | 641 if originalwd in parents: |
| 642 return True | 642 return True |
| 643 | 643 |
| 644 for newrev in state.itervalues(): | 644 for newrev in state.itervalues(): |