On Wed, 29 Mar 2017 06:18:48 -0700, Kostia Balytskyi wrote: > # HG changeset patch > # User Kostia Balytskyi <ikos...@fb.com> > # Date 1490790691 25200 > # Wed Mar 29 05:31:31 2017 -0700 > # Node ID 743fea249a852994c5bd3e47cdfb617719f19a0a > # Parent 63f5731a2dc01b30c9cd1d2c7c60a9a16d6c79c1 > shelve: move ui.quiet manipulations to configoverride
I've queued only this patch which can be applied cleanly. > @@ -911,11 +906,9 @@ def _dounshelve(ui, repo, *shelved, **op > if not shelvedfile(repo, basename, patchextension).exists(): > raise error.Abort(_("shelved change '%s' not found") % basename) > > - oldquiet = ui.quiet > lock = tr = None > try: > lock = repo.lock() > - > tr = repo.transaction('unshelve', report=lambda x: None) > oldtiprev = len(repo) > > @@ -932,7 +925,6 @@ def _dounshelve(ui, repo, *shelved, **op > with ui.configoverride(overrides, 'unshelve'): > tmpwctx, addedbefore = _commitworkingcopychanges(ui, repo, opts, > tmpwctx) > - > repo, shelvectx = _unshelverestorecommit(ui, repo, basename, > oldquiet) Dropped this "oldquiet" in flight. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel