equal
deleted
inserted
replaced
101 raise util.Abort(_('outstanding uncommitted merge')) |
101 raise util.Abort(_('outstanding uncommitted merge')) |
102 wlock = lock = None |
102 wlock = lock = None |
103 try: |
103 try: |
104 wlock = repo.wlock() |
104 wlock = repo.wlock() |
105 lock = repo.lock() |
105 lock = repo.lock() |
106 mod, add, rem = repo.status()[:3] |
106 mod, add, rem, del_ = repo.status()[:4] |
107 if mod or add or rem: |
107 if mod or add or rem: |
108 raise util.Abort(_('outstanding uncommitted changes')) |
108 raise util.Abort(_('outstanding uncommitted changes')) |
|
109 if del_: |
|
110 raise util.Abort(_('working directory is missing some files')) |
109 if len(repo.heads()) > 1: |
111 if len(repo.heads()) > 1: |
110 raise util.Abort(_('multiple heads in this repository ' |
112 raise util.Abort(_('multiple heads in this repository ' |
111 '(use "hg heads" and "hg merge" to merge)')) |
113 '(use "hg heads" and "hg merge" to merge)')) |
112 return pull() |
114 return pull() |
113 finally: |
115 finally: |