Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 5330
- 381665763704
- parent 5329
- ebec303b4e50
- child 5345
- c7c3f9de2d1c
equal
deleted
inserted
replaced
| 5329:ebec303b4e50 | 5330:381665763704 |
|---|---|
| 491 repodir = os.path.dirname(repodir) | 491 repodir = os.path.dirname(repodir) |
| 492 if os.path.splitdrive(repodir)[1] == os.sep: | 492 if os.path.splitdrive(repodir)[1] == os.sep: |
| 493 return | 493 return |
| 494 | 494 |
| 495 if self.__commitDialog is not None: | 495 if self.__commitDialog is not None: |
| 496 msg, amend, commitSubrepositories = \ | 496 msg, amend, commitSubrepositories, author, dateTime = \ |
| 497 self.__commitDialog.getCommitData() | 497 self.__commitDialog.getCommitData() |
| 498 self.__commitDialog.deleteLater() | 498 self.__commitDialog.deleteLater() |
| 499 self.__commitDialog = None | 499 self.__commitDialog = None |
| 500 if amend and not msg: | 500 if amend and not msg: |
| 501 msg = self.__getMostRecentCommitMessage(repodir) | 501 msg = self.__getMostRecentCommitMessage(repodir) |
| 502 else: | 502 else: |
| 503 amend = False | 503 amend = False |
| 504 commitSubrepositories = False | 504 commitSubrepositories = False |
| 505 author = "" | |
| 506 dateTime = "" | |
| 505 | 507 |
| 506 if not msg and not amend: | 508 if not msg and not amend: |
| 507 msg = '***' | 509 msg = '***' |
| 508 | 510 |
| 509 args = self.initCommand("commit") | 511 args = self.initCommand("commit") |
| 515 args.append("--close-branch") | 517 args.append("--close-branch") |
| 516 if amend: | 518 if amend: |
| 517 args.append("--amend") | 519 args.append("--amend") |
| 518 if commitSubrepositories: | 520 if commitSubrepositories: |
| 519 args.append("--subrepos") | 521 args.append("--subrepos") |
| 522 if author: | |
| 523 args.append("--user") | |
| 524 args.append(author) | |
| 525 if dateTime: | |
| 526 args.append("--date") | |
| 527 args.append(dateTime) | |
| 520 if msg: | 528 if msg: |
| 521 args.append("--message") | 529 args.append("--message") |
| 522 args.append(msg) | 530 args.append(msg) |
| 523 if self.__client: | 531 if self.__client: |
| 524 if isinstance(name, list): | 532 if isinstance(name, list): |
