Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable Merge with Adrian

Changeset 56b14407cc94…

Parents 7a9f04e6b2d1…

Parents 26c4541615db…

by Steve Borho

Changes to 2 files · Browse files at 56b14407cc94 Showing diff from parent 7a9f04e6b2d1 26c4541615db Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
159
160
161
 
 
 
 
162
163
164
 
167
168
169
170
171
172
173
174
175
176
 
159
160
161
162
163
164
165
166
167
168
 
171
172
173
 
 
 
 
174
175
176
@@ -159,6 +159,10 @@
  self.commitTabIndex = idx = tt.addTab(w, geticon('hg-commit'), '')   tt.setTabToolTip(idx, _("Commit"))   + self.syncDemand = w = DemandWidget(self.createSyncWidget) + self.syncTabIndex = idx = tt.addTab(w, geticon('thg-sync'), '') + tt.setTabToolTip(idx, _("Synchronize")) +   self.manifestDemand = w = DemandWidget(self.createManifestWidget)   self.manifestTabIndex = idx = tt.addTab(w, geticon('hg-annotate'), '')   tt.setTabToolTip(idx, _('Manifest')) @@ -167,10 +171,6 @@
  self.grepTabIndex = idx = tt.addTab(w, geticon('hg-grep'), '')   tt.setTabToolTip(idx, _("Search"))   - self.syncDemand = w = DemandWidget(self.createSyncWidget) - self.syncTabIndex = idx = tt.addTab(w, geticon('thg-sync'), '') - tt.setTabToolTip(idx, _("Synchronize")) -   self.mqDemand = w = DemandWidget(self.createMQWidget)   if 'mq' in self.repo.extensions():   self.mqTabIndex = idx = tt.addTab(w, geticon('thg-mq'), '')
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
101
102
103
104
 
105
106
107
 
108
109
110
 
111
112
113
 
114
115
 
116
117
118
 
101
102
103
 
104
105
106
 
107
108
109
 
110
111
112
 
113
114
 
115
116
117
118
@@ -101,18 +101,18 @@
  return a     self.incomingAction = \ - newaction(_('Preview incoming changesets from specified URL'), + newaction(_('Preview incoming changesets from remote repository'),   'hg-incoming', self.inclicked)   self.pullAction = \ - newaction(_('Pull incoming changesets from specified URL'), + newaction(_('Pull incoming changesets from remote repository'),   'hg-pull', self.pullclicked)   self.outgoingAction = \ - newaction(_('Filter outgoing changesets to specified URL'), + newaction(_('Filter outgoing changesets to remote repository'),   'hg-outgoing', self.outclicked)   self.pushAction = \ - newaction(_('Push outgoing changesets to specified URL'), + newaction(_('Push outgoing changesets to remote repository'),   'hg-push', self.pushclicked) - newaction(_('Email outgoing changesets for specified URL'), + newaction(_('Email outgoing changesets for remote repository'),   'mail-forward', self.emailclicked)     if 'perfarce' in self.repo.extensions():