equal
deleted
inserted
replaced
66 if modified or added or removed or deleted: |
66 if modified or added or removed or deleted: |
67 raise util.Abort(_("outstanding uncommitted changes")) |
67 raise util.Abort(_("outstanding uncommitted changes")) |
68 |
68 |
69 def logmessage(opts): |
69 def logmessage(opts): |
70 """ get the log message according to -m and -l option """ |
70 """ get the log message according to -m and -l option """ |
71 message = opts['message'] |
71 message = opts.get('message') |
72 logfile = opts['logfile'] |
72 logfile = opts.get('logfile') |
73 |
73 |
74 if message and logfile: |
74 if message and logfile: |
75 raise util.Abort(_('options --message and --logfile are mutually ' |
75 raise util.Abort(_('options --message and --logfile are mutually ' |
76 'exclusive')) |
76 'exclusive')) |
77 if not message and logfile: |
77 if not message and logfile: |