Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/git.py
src/eric7/Plugins/VcsPlugins/vcsGit/git.py
- branch
- eric7
- changeset 9576
- be9f8e7e42e0
- parent 9573
- 9960d19d66b5
- child 9616
- 13aa04c979d7
equal
deleted
inserted
replaced
| 9575:635b6c5a36e1 | 9576:be9f8e7e42e0 |
|---|---|
| 682 | 682 |
| 683 if noDialog: | 683 if noDialog: |
| 684 res = self.startSynchronizedProcess(QProcess(), "git", args, repodir) | 684 res = self.startSynchronizedProcess(QProcess(), "git", args, repodir) |
| 685 else: | 685 else: |
| 686 dia = GitDialog( | 686 dia = GitDialog( |
| 687 self.tr("Removing files/directories from the Git" " repository"), self | 687 self.tr("Removing files/directories from the Git repository"), self |
| 688 ) | 688 ) |
| 689 res = dia.startProcess(args, repodir) | 689 res = dia.startProcess(args, repodir) |
| 690 if res: | 690 if res: |
| 691 dia.exec() | 691 dia.exec() |
| 692 res = dia.normalExitWithoutErrors() | 692 res = dia.normalExitWithoutErrors() |
| 2375 | 2375 |
| 2376 branchName = self.gitGetCurrentBranch(repodir) | 2376 branchName = self.gitGetCurrentBranch(repodir) |
| 2377 EricMessageBox.information( | 2377 EricMessageBox.information( |
| 2378 None, | 2378 None, |
| 2379 self.tr("Current Branch"), | 2379 self.tr("Current Branch"), |
| 2380 self.tr("""<p>The current branch is <b>{0}</b>.</p>""").format( | 2380 self.tr("""<p>The current branch is <b>{0}</b>.</p>""").format(branchName), |
| 2381 branchName | |
| 2382 ), | |
| 2383 ) | 2381 ) |
| 2384 | 2382 |
| 2385 ########################################################################### | 2383 ########################################################################### |
| 2386 ## Methods for bundles handling. | 2384 ## Methods for bundles handling. |
| 2387 ########################################################################### | 2385 ########################################################################### |
| 3903 """<tr><td>Number of packed objects: </td>""" | 3901 """<tr><td>Number of packed objects: </td>""" |
| 3904 """<td>{0}</td></tr>""" | 3902 """<td>{0}</td></tr>""" |
| 3905 ).format(statistics["in-pack"]) | 3903 ).format(statistics["in-pack"]) |
| 3906 ) | 3904 ) |
| 3907 info.append( | 3905 info.append( |
| 3908 self.tr( | 3906 self.tr("""<tr><td>Number of packs: </td><td>{0}</td></tr>""").format( |
| 3909 """<tr><td>Number of packs: </td><td>{0}</td></tr>""" | 3907 statistics["packs"] |
| 3910 ).format(statistics["packs"]) | 3908 ) |
| 3911 ) | 3909 ) |
| 3912 info.append( | 3910 info.append( |
| 3913 self.tr( | 3911 self.tr( |
| 3914 """<tr><td>Disk space used by packed objects: </td>""" | 3912 """<tr><td>Disk space used by packed objects: </td>""" |
| 3915 """<td>{0} KiB</td></tr>""" | 3913 """<td>{0} KiB</td></tr>""" |
| 3920 """<tr><td>Packed objects waiting for pruning: </td>""" | 3918 """<tr><td>Packed objects waiting for pruning: </td>""" |
| 3921 """<td>{0}</td></tr>""" | 3919 """<td>{0}</td></tr>""" |
| 3922 ).format(statistics["prune-packable"]) | 3920 ).format(statistics["prune-packable"]) |
| 3923 ) | 3921 ) |
| 3924 info.append( | 3922 info.append( |
| 3925 self.tr( | 3923 self.tr("""<tr><td>Garbage files: </td><td>{0}</td></tr>""").format( |
| 3926 """<tr><td>Garbage files: </td><td>{0}</td></tr>""" | 3924 statistics["garbage"] |
| 3927 ).format(statistics["garbage"]) | 3925 ) |
| 3928 ) | 3926 ) |
| 3929 info.append( | 3927 info.append( |
| 3930 self.tr( | 3928 self.tr( |
| 3931 """<tr><td>Disk space used by garbage files: </td>""" | 3929 """<tr><td>Disk space used by garbage files: </td>""" |
| 3932 """<td>{0} KiB</td></tr>""" | 3930 """<td>{0} KiB</td></tr>""" |
