We are currently indexing your data, so search results may be incomplete until we finish.
merge with stable
by
Changes to 7 files · Browse files at e3f56b00872f Showing diff from parent b69ac99d4533 381a6b5bb814 Diff from another changeset...
|
@@ -632,12 +632,12 @@ if newbranch not in [p.branch() for p in self.repo.parents()]:
response = gdialog.Confirm(_('Confirm Override Branch'),
[], self, _('A branch named "%s" already exists,\n'
- 'override?') % newbranch).run()
+ 'override?') % self.nextbranch).run()
else:
response = gtk.RESPONSE_YES
else:
response = gdialog.Confirm(_('Confirm New Branch'), [], self,
- _('Create new named branch "%s"?') % newbranch).run()
+ _('Create new named branch "%s"?') % self.nextbranch).run()
if response == gtk.RESPONSE_YES:
self.repo.dirstate.setbranch(newbranch)
elif response != gtk.RESPONSE_NO:
|
||
|
@@ -65,6 +65,8 @@ fork = ui.configbool('tortoisehg', 'hgtkfork', True)
if not fork or 'THG_HGTK_SPAWN' in os.environ or '--nofork' in sys.argv:
return
+ if '--repository' in sys.argv or '-R' in sys.argv:
+ return
# Spawn background process and exit
if hasattr(sys, "frozen"):
args = sys.argv
@@ -121,11 +123,16 @@ raise hglib.ParseError(None, inst)
if args:
- cmd, args = args[0], args[1:]
- aliases, i = cmdutil.findcmd(cmd, table, ui.config("ui", "strict"))
+ alias, args = args[0], args[1:]
+ aliases, i = cmdutil.findcmd(alias, table, ui.config("ui", "strict"))
+ for a in aliases:
+ if a.startswith(alias):
+ alias = a
+ break
cmd = aliases[0]
c = list(i[1])
else:
+ alias = None
cmd = None
c = []
@@ -149,7 +156,7 @@ del options['listfile']
args += get_list_from_file(listfile)
- return (cmd, cmd and i[0] or None, args, options, cmdoptions)
+ return (cmd, cmd and i[0] or None, args, options, cmdoptions, alias)
def _runcatch(ui, args):
try:
@@ -182,7 +189,8 @@
def runcommand(ui, args):
fullargs = args
- cmd, func, args, options, cmdoptions = _parse(ui, args)
+ cmd, func, args, options, cmdoptions, alias = _parse(ui, args)
+ cmdoptions['alias'] = alias
ui.setconfig("ui", "verbose", str(bool(options["verbose"])))
if options['help']:
@@ -384,8 +392,8 @@ """repository synchronization tool"""
portable_fork(ui)
from hggtk.synch import run
- cmd = sys.argv[1]
- if 'push'.startswith(cmd) or 'outgoing'.startswith(cmd):
+ cmd = opts['alias']
+ if cmd in ('push', 'outgoing', 'email'):
opts['pushmode'] = True
else:
opts['pushmode'] = False
|
||
|
@@ -531,6 +531,8 @@ dlg.hide()
self.repo.invalidate()
self.reload_log()
+ self.changeview._buffer.set_text('')
+ self.changeview._filelist.clear()
def backout_rev(self, menuitem):
rev = self.currow[treemodel.REVID]
|
||
|
@@ -109,7 +109,10 @@ return []
if revid not in self.revisions:
- ctx = self.repo[revid]
+ try:
+ ctx = self.repo[revid]
+ except IndexError:
+ return None
summary = ctx.description().replace('\0', '')
if self.repo.ui.configbool('tortoisehg', 'longsummary'):
|
||
|
@@ -315,6 +315,7 @@ self.pbar.begin()
gobject.idle_add(self.populate, self.get_revision())
else:
+ self.treeview.set_model(None)
self.pbar.set_status_text('Repository is empty')
def set_author_color(self):
|
||
|
|
|
|
|
|
|
|
Add a tag
Loading...