Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
- branch
- 5_2_x
- changeset 1887
- fc774fba0426
- parent 1774
- fda2bb18c3ae
- child 1924
- 97b2fcc8a855
equal
deleted
inserted
replaced
| 1868:513bcc6de50d | 1887:fc774fba0426 |
|---|---|
| 342 elif lockState == "L" and \ | 342 elif lockState == "L" and \ |
| 343 file.repos_lock is not None and \ | 343 file.repos_lock is not None and \ |
| 344 file.entry.lock_token != file.repos_lock["token"]: | 344 file.entry.lock_token != file.repos_lock["token"]: |
| 345 lockState = "S" | 345 lockState = "S" |
| 346 | 346 |
| 347 if file.path in changelistsDict: | 347 fpath = os.path.join(self.dname, file.path) |
| 348 changelist = changelistsDict[file.path] | 348 if fpath in changelistsDict: |
| 349 changelist = changelistsDict[fpath] | |
| 349 else: | 350 else: |
| 350 changelist = "" | 351 changelist = "" |
| 351 | 352 |
| 352 hidePropertyStatusColumn = hidePropertyStatusColumn and \ | 353 hidePropertyStatusColumn = hidePropertyStatusColumn and \ |
| 353 file.prop_status in [ | 354 file.prop_status in [ |
