Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

commit: add --user and --date arguments

Also pruned old --message and --logfile arguments. They
were hopelessly broken and really have no place in a GUI

Fixes #132

Changeset 253917764690…

Parent d2eaf789aa94…

by Steve Borho

Changes to 2 files · Browse files at 253917764690 Showing diff from parent d2eaf789aa94 Diff from another changeset...

Change 1 of 7 Show Entire File hggtk/​commit.py Stacked
 
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
 
63
64
65
 
463
464
465
466
467
468
469
470
 
524
525
526
 
 
 
 
527
528
529
 
569
570
571
572
 
573
574
575
 
592
593
594
595
 
 
596
597
598
599
 
600
601
602
 
608
609
610
611
 
612
613
614
 
617
618
619
620
621
622
623
 
45
46
47
 
 
 
 
 
 
 
 
 
 
 
 
48
49
50
51
52
53
54
 
452
453
454
 
 
455
456
457
 
511
512
513
514
515
516
517
518
519
520
 
560
561
562
 
563
564
565
566
 
583
584
585
 
586
587
588
589
590
 
591
592
593
594
 
600
601
602
 
603
604
605
606
 
609
610
611
 
612
613
614
@@ -45,21 +45,10 @@
  if not self.test_opt('rev'):   self.opts['rev'] = ''   - if self.test_opt('message'): - buf = gtk.TextBuffer() - buf.set_text(self.opts['message']) - self.text.set_buffer(buf) - - if self.test_opt('logfile'): - buf = gtk.TextBuffer() - buf.set_text('Comment will be read from file ' + self.opts['logfile']) - self.text.set_buffer(buf) - self.text.set_sensitive(False) - -   def get_title(self):   root = os.path.basename(self.repo.root)   user = self.opts.get('user') + if user: user = 'as ' + user   date = self.opts.get('date')   pats = ' '.join(self.pats)   if self.qnew: @@ -463,8 +452,6 @@
      def _ready_message(self): - if self.test_opt('logfile'): - return   buf = self.text.get_buffer()   if buf.get_char_count() == 0:   Prompt(_('Nothing Commited'), @@ -524,6 +511,10 @@
  cmdline[1] = 'qrefresh'   if self.opts['addremove']:   cmdline += ['--addremove'] + if self.opts['user']: + cmdline.extend(['--user', self.opts['user']]) + if self.opts['date']: + cmdline.extend(['--date', self.opts['date']])   cmdline += ['--message', fromutf(self.opts['message'])]   if self.qnew:   cmdline += [fromutf(self._get_qnew_name())] @@ -569,7 +560,7 @@
  self.reload_status()   self.qnew_name.grab_focus() # set focus back   -def launch(root='', files=[], cwd='', main=True): +def launch(root='', files=[], cwd='', main=True, **opts):   u = ui.ui()   u.updateopts(debug=False, traceback=False)   repo = hg.repository(u, path=root) @@ -592,11 +583,12 @@
  return     cmdoptions = { - 'user':'', 'date':'', + 'user':opts.get('user', ''), 'date':opts.get('date', ''), + 'logfile':'', 'message':'',   'modified':True, 'added':True, 'removed':True, 'deleted':True,   'unknown':True, 'ignored':False,   'exclude':[], 'include':[], - 'check': True, 'git':False, 'logfile':'', 'addremove':False, + 'check': True, 'git':False, 'addremove':False,   }     dialog = GCommit(u, repo, cwd, files, cmdoptions, main) @@ -608,7 +600,7 @@
  # TODO: Not clear if this is best; user may expect repo wide   if not files and cwd:   files = [cwd] - if launch(root, files, cwd, True): + if launch(root, files, cwd, True, **opts):   gtk.gdk.threads_init()   gtk.gdk.threads_enter()   gtk.main() @@ -617,7 +609,6 @@
 if __name__ == "__main__":   import sys   from hglib import rootpath -   opts = {}   opts['cwd'] = len(sys.argv) > 1 and sys.argv[1] or os.getcwd()   opts['root'] = rootpath(opts['cwd'])
Change 1 of 1 Show Entire File hggtk/​hgtk.py Stacked
 
504
505
506
507
 
 
 
 
508
509
510
 
504
505
506
 
507
508
509
510
511
512
513
@@ -504,7 +504,10 @@
  "^about": (about, [], _('hgtk about')),   "^add": (add, [], _('hgtk add [FILE]...')),   "^clone": (clone, [], _('hgtk clone SOURCE [DEST]')), - "^commit|ci": (commit, [], _('hgtk commit [FILE]...')), + "^commit|ci": (commit, + [('u', 'user', '', _('record user as committer')), + ('d', 'date', '', _('record datecode as commit date'))], + _('hgtk commit [OPTIONS] [FILE]...')),   "^datamine|annotate|blame": (datamine, [], _('hgtk datamine')),   "^init": (hginit, [], _('hgtk init [DEST]')),   "^log|history": (log,