Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
- changeset 1924
- 97b2fcc8a855
- parent 1886
- 732f94385668
- child 2302
- f29e9405c851
equal
deleted
inserted
replaced
| 1920:b62a576ca380 | 1924:97b2fcc8a855 |
|---|---|
| 24 from .SvnDiffDialog import SvnDiffDialog | 24 from .SvnDiffDialog import SvnDiffDialog |
| 25 | 25 |
| 26 from .Ui_SvnStatusDialog import Ui_SvnStatusDialog | 26 from .Ui_SvnStatusDialog import Ui_SvnStatusDialog |
| 27 | 27 |
| 28 import Preferences | 28 import Preferences |
| 29 import Utilities | |
| 29 | 30 |
| 30 | 31 |
| 31 class SvnStatusDialog(QWidget, SvnDialogMixin, Ui_SvnStatusDialog): | 32 class SvnStatusDialog(QWidget, SvnDialogMixin, Ui_SvnStatusDialog): |
| 32 """ | 33 """ |
| 33 Class implementing a dialog to show the output of the svn status command | 34 Class implementing a dialog to show the output of the svn status command |
| 308 if recurse: | 309 if recurse: |
| 309 depth = pysvn.depth.infinity | 310 depth = pysvn.depth.infinity |
| 310 else: | 311 else: |
| 311 depth = pysvn.depth.immediate | 312 depth = pysvn.depth.immediate |
| 312 changelists = self.client.get_changelist(name, depth=depth) | 313 changelists = self.client.get_changelist(name, depth=depth) |
| 313 for entry in changelists: | 314 for fpath, changelist in changelists: |
| 314 changelistsDict[entry[0]] = entry[1] | 315 fpath = Utilities.normcasepath(fpath) |
| 316 changelistsDict[fpath] = changelist | |
| 315 hideChangelistColumn = hideChangelistColumn and \ | 317 hideChangelistColumn = hideChangelistColumn and \ |
| 316 len(changelistsDict) == 0 | 318 len(changelistsDict) == 0 |
| 317 | 319 |
| 318 # step 2: determine status of files | 320 # step 2: determine status of files |
| 319 allFiles = self.client.status(name, recurse=recurse, | 321 allFiles = self.client.status(name, recurse=recurse, |
| 342 elif lockState == "L" and \ | 344 elif lockState == "L" and \ |
| 343 file.repos_lock is not None and \ | 345 file.repos_lock is not None and \ |
| 344 file.entry.lock_token != file.repos_lock["token"]: | 346 file.entry.lock_token != file.repos_lock["token"]: |
| 345 lockState = "S" | 347 lockState = "S" |
| 346 | 348 |
| 347 fpath = os.path.join(self.dname, file.path) | 349 fpath = Utilities.normcasepath(os.path.join(self.dname, file.path)) |
| 348 if fpath in changelistsDict: | 350 if fpath in changelistsDict: |
| 349 changelist = changelistsDict[fpath] | 351 changelist = changelistsDict[fpath] |
| 350 else: | 352 else: |
| 351 changelist = "" | 353 changelist = "" |
| 352 | 354 |
