mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
d02477d831
Summary: Some scripts are parsing all hg outputs. The remote stderr output could contain random noise that break the scripts. Therefore let's forward remote stderr to local stderr, instead of local stdout. Reviewed By: DurhamG Differential Revision: D8514952 fbshipit-source-id: 2f205fdc948fbeacd20b5af9d6d52eaa8212e90e
79 lines
3.9 KiB
Raku
79 lines
3.9 KiB
Raku
$ . "$TESTDIR/library.sh"
|
|
$ . "$TESTDIR/infinitepush/library.sh"
|
|
$ setupcommon
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ setupserver
|
|
$ cd ..
|
|
$ hg clone ssh://user@dummy/repo client -q
|
|
|
|
$ cat >> $TESTTMP/uilog.py <<EOF
|
|
> from mercurial import extensions
|
|
> from mercurial import ui as uimod
|
|
> def uisetup(ui):
|
|
> extensions.wrapfunction(uimod.ui, 'log', mylog)
|
|
> def mylog(orig, self, service, *msg, **opts):
|
|
> if service in ['infinitepush']:
|
|
> kwstr = ", ".join("%s=%s" % (k, v) for k, v in
|
|
> sorted(opts.iteritems()))
|
|
> msgstr = msg[0] % msg[1:]
|
|
> self.warn('%s: %s (%s)\n' % (service, msgstr, kwstr))
|
|
> return orig(self, service, *msg, **opts)
|
|
> EOF
|
|
$ cat >> repo/.hg/hgrc <<EOF
|
|
> [extensions]
|
|
> uilog=$TESTTMP/uilog.py
|
|
> EOF
|
|
|
|
$ cd client
|
|
$ mkcommit commit
|
|
$ hg push -r . --to scratch/scratchpush --create
|
|
pushing to ssh://user@dummy/repo
|
|
searching for changes
|
|
remote: infinitepush: b2x:infinitepush \(eventtype=start, hostname=.+, requestid=\d+, user=\w+\) (re)
|
|
remote: pushing 1 commit:
|
|
remote: 7e6a6fd9c7c8 commit
|
|
remote: infinitepush: bundlestore \(bundlesize=546, eventtype=start, hostname=.+, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
remote: infinitepush: bundlestore \(bundlesize=546, elapsedms=.+, eventtype=success, hostname=.+, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
remote: infinitepush: index \(eventtype=start, hostname=.+, newheadscount=1, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
remote: infinitepush: index \(elapsedms=.+, eventtype=success, hostname=.+, newheadscount=1, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
remote: infinitepush: b2x:infinitepush \(elapsedms=.+, eventtype=success, hostname=.+, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
$ cd ..
|
|
|
|
Check that logging works for b2x:infinitepushscratchbookmarks part
|
|
$ cd client
|
|
$ hg pushbackup
|
|
starting backup .* (re)
|
|
backing up stack rooted at 7e6a6fd9c7c8
|
|
remote: infinitepush: b2x:infinitepush \(eventtype=start, hostname=.+, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
remote: pushing 1 commit:
|
|
remote: 7e6a6fd9c7c8 commit
|
|
remote: infinitepush: index \(eventtype=start, hostname=.+, newheadscount=0, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
remote: infinitepush: index \(elapsedms=.+, eventtype=success, hostname=.+, newheadscount=0, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
remote: infinitepush: b2x:infinitepush \(elapsedms=.+, eventtype=success, hostname=.+, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
remote: infinitepush: b2x:infinitepushscratchbookmarks \(eventtype=start, hostname=.+, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
remote: infinitepush: b2x:infinitepushscratchbookmarks \(elapsedms=.+, eventtype=success, hostname=.+, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
$ cd ..
|
|
|
|
Make upload to bundlestore fail
|
|
$ cat >> repo/.hg/hgrc <<EOF
|
|
> [scratchbranch]
|
|
> storepath=/dev/null
|
|
> EOF
|
|
$ cd client
|
|
$ mkcommit failpushcommit
|
|
$ hg push -r . --to scratch/scratchpush 2>err
|
|
pushing to ssh://user@dummy/repo
|
|
searching for changes
|
|
[255]
|
|
$ grep '^remote: ' err
|
|
remote: infinitepush: b2x:infinitepush \(eventtype=start, hostname=.+, requestid=\d+, user=\w+\) (re)
|
|
remote: pushing 2 commits:
|
|
remote: 7e6a6fd9c7c8 commit
|
|
remote: bba29d9d577a failpushcommit
|
|
remote: infinitepush: bundlestore \(bundlesize=1067, eventtype=start, hostname=.+, requestid=\d+, user=\w+\) (re)
|
|
remote: infinitepush: bundlestore \(bundlesize=1067, elapsedms=[-+0-9.e]+, errormsg=\[Errno 20\] \$ENOTDIR\$: '/dev/null/\d+', eventtype=failure, hostname=.+, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
remote: infinitepush: b2x:infinitepush \(elapsedms=[-+0-9.e]+, errormsg=\[Errno 20\] \$ENOTDIR\$: '/dev/null/\d+', eventtype=failure, hostname=.+, reponame=babar, requestid=\d+, user=\w+\) (re)
|
|
remote: abort: \$ENOTDIR\$: '/dev/null/\d+' (re)
|