[PATCH v3] nmbug: Translate to Python
W. Trevor King
wking at tremily.us
Wed Aug 6 16:28:05 PDT 2014
On Tue, Aug 05, 2014 at 10:16:10PM -0300, David Bremner wrote:
> David Bremner writes:
> > I did notice that merging was noticably noisier than I remembered.
>
> rejected pushes also seem noisier than before; I'm not sure the
> python backtrace adds anything here.
>
> To nmbug at nmbug.tethera.net:nmbug-tags
> ! [rejected] master -> master (fetch first)
> error: failed to push some refs to 'nmbug at nmbug.tethera.net:nmbug-tags'
> hint: Updates were rejected because the remote contains work that you do
> hint: not have locally. This is usually caused by another repository pushing
> hint: to the same ref. You may want to first integrate the remote changes
> hint: (e.g., 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> Traceback (most recent call last):
> File "/home/bremner/config/scripts/nmbug", line 766, in <module>
> args.func(**kwargs)
> File "/home/bremner/config/scripts/nmbug", line 463, in push
> _git(args=args, wait=True)
> File "/home/bremner/config/scripts/nmbug", line 210, in _git
> return _spawn(args=args, **kwargs)
> File "/home/bremner/config/scripts/nmbug", line 193, in _spawn
> args=args, status=status, stdout=stdout, stderr=stderr)
> __main__.SubprocessError: ['git', '--git-dir', '/home/bremner/.nmbug', 'push'] exited with 1
I can drop the backtrace and just print the SubprocessError, and just
show the traceback if the logging is set to ‘debug’. If that sounds
reasonable, I'll to it in v4.
I'm not sure what the current nmbug shows in this case. Do you want
me to prune the ‘hint’ lines too? I usually find those to be pretty
informative, but the're not directly applicable to folks using nmbug
who prefer to ignore the underlying Git layer. Ideally, we'd
translate them to apply to nmbug (“…(e.g. nmbug pull ...) before
pushing…”), but I can't think of a maintainable way to do that.
Cheers,
Trevor
--
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20140806/8c1fc8ee/attachment.pgp>
More information about the notmuch
mailing list