Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 6154
- 11ea3d31937a
- parent 6048
- 82ad8ec9548c
- child 6303
- ec9ebaf206fb
equal
deleted
inserted
replaced
| 6153:0b18c86c03a1 | 6154:11ea3d31937a |
|---|---|
| 2145 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 2145 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 2146 repodir = os.path.dirname(repodir) | 2146 repodir = os.path.dirname(repodir) |
| 2147 if os.path.splitdrive(repodir)[1] == os.sep: | 2147 if os.path.splitdrive(repodir)[1] == os.sep: |
| 2148 return | 2148 return |
| 2149 | 2149 |
| 2150 args = self.initCommand("update") | 2150 if self.version >= (4, 5, 0): |
| 2151 args.append("--clean") | 2151 args = self.initCommand("merge") |
| 2152 args.append("--abort") | |
| 2153 else: | |
| 2154 args = self.initCommand("update") | |
| 2155 args.append("--clean") | |
| 2152 | 2156 |
| 2153 dia = HgDialog( | 2157 dia = HgDialog( |
| 2154 self.tr('Cancelling uncommitted merge'), | 2158 self.tr('Canceling uncommitted merge'), |
| 2155 self) | 2159 self) |
| 2156 res = dia.startProcess(args, repodir, False) | 2160 res = dia.startProcess(args, repodir, False) |
| 2157 if res: | 2161 if res: |
| 2158 dia.exec_() | 2162 dia.exec_() |
| 2159 res = dia.hasAddOrDelete() | 2163 res = dia.hasAddOrDelete() |
