Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

Merge with stable

Changeset 3372580e0163…

Parents 0d30a9d62bbb…

Parents 01cfbbba74b0…

by Steve Borho

Changes to 4 files · Browse files at 3372580e0163 Showing diff from parent 0d30a9d62bbb 01cfbbba74b0 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgemail.py Stacked
 
179
180
181
182
 
183
184
185
 
179
180
181
 
182
183
184
185
@@ -179,7 +179,7 @@
  hbox.pack_start(gtk.Label(_('Subject:')), False, False, 4)   hbox.pack_start(self._subjbox, True, True, 4)   - extensions.load(ui.ui(), 'patchbomb', None) + hglib.loadextension(ui.ui(), 'patchbomb')     # --flags was added after hg 1.3   hasflags = False
Change 1 of 5 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
139
140
141
142
143
144
145
146
147
 
1247
1248
1249
1250
 
1251
1252
1253
 
1255
1256
1257
1258
 
1259
1260
1261
 
1419
1420
1421
1422
 
1423
1424
1425
 
1427
1428
1429
1430
 
1431
1432
1433
 
139
140
141
 
 
 
142
143
144
 
1244
1245
1246
 
1247
1248
1249
1250
 
1252
1253
1254
 
1255
1256
1257
1258
 
1416
1417
1418
 
1419
1420
1421
1422
 
1424
1425
1426
 
1427
1428
1429
1430
@@ -139,9 +139,6 @@
  self.bundle_autoreject = False   self.runner = hgcmd.CmdRunner()   os.chdir(self.repo.root) - - # Load extension support for commands which need it - extensions.loadall(self.ui)   self.exs = [ name for name, module in extensions.extensions() ]     def get_help_url(self): @@ -1247,7 +1244,7 @@
  if ppull == 'fetch':   cmd = ['fetch', '--message', 'merge']   # load the fetch extension explicitly - extensions.load(self.ui, 'fetch', None) + hglib.loadextension(self.ui, 'fetch')   else:   cmd = ['pull']   if ppull == 'update': @@ -1255,7 +1252,7 @@
  elif ppull == 'rebase':   cmd.append('--rebase')   # load the rebase extension explicitly - extensions.load(self.ui, 'rebase', None) + hglib.loadextension(self.ui, 'rebase')     cmdline = ['hg'] + cmd + [self.bfile]   dlg = hgcmd.CmdDialog(cmdline) @@ -1419,7 +1416,7 @@
  if ppull == 'fetch':   cmd = ['fetch', '--message', 'merge']   # load the fetch extension explicitly - extensions.load(self.ui, 'fetch', None) + hglib.loadextension(self.ui, 'fetch')   else:   cmd = ['pull']   if ppull == 'update': @@ -1427,7 +1424,7 @@
  elif ppull == 'rebase':   cmd.append('--rebase')   # load the rebase extension explicitly - extensions.load(self.ui, 'rebase', None) + hglib.loadextension(self.ui, 'rebase')     path = hglib.fromutf(self.pathentry.get_text()).strip()   remote_path = hglib.validate_synch_path(path, self.repo)
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​synch.py Stacked
 
147
148
149
150
151
152
153
 
445
446
447
448
 
449
450
451
 
455
456
457
458
 
459
460
461
 
147
148
149
 
150
151
152
 
444
445
446
 
447
448
449
450
 
454
455
456
 
457
458
459
460
@@ -147,7 +147,6 @@
  elif defrow is not None:   self.pathbox.set_active(defrow)   - extensions.loadall(self.ui)   exs = [ name for name, module in extensions.extensions() ]     # Post Pull Operation @@ -445,7 +444,7 @@
  if ppull == 'fetch':   cmd = ['fetch', '--message', 'merge']   # load the fetch extension explicitly - extensions.load(self.ui, 'fetch', None) + hglib.loadextension(self.ui, 'fetch')   else:   cmd = ['pull']   cmd += aopts.get('force', []) @@ -455,7 +454,7 @@
  elif ppull == 'rebase':   cmd.append('--rebase')   # load the rebase extension explicitly - extensions.load(self.ui, 'rebase', None) + hglib.loadextension(self.ui, 'rebase')   cmd += aopts.get('rev', [])   self.exec_cmd(cmd)  
Change 1 of 1 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
125
126
127
 
 
 
 
 
 
 
 
 
 
128
129
130
 
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
@@ -125,6 +125,16 @@
  if 'mq' in repo.__dict__: #do not create if it does not exist   repo.mq.invalidate()   +def loadextension(ui, name): + # Between Mercurial revisions 1.2 and 1.3, extensions.load() stopped + # calling uisetup() after loading an extension. This could do + # unexpected things if you use an hg version < 1.3 + extensions.load(ui, name, None) + mod = extensions.find(name) + uisetup = getattr(mod, 'uisetup', None) + if uisetup: + uisetup(ui) +  def canonpaths(list):   'Get canonical paths (relative to root) for list of files'   # This is a horrible hack. Please remove this when HG acquires a