This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10886

narrowbundle: use new context manager for silencing the ui
ClosedPublic

Authored by martinvonz on Jun 18 2021, 7:57 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG86418ad637d1: narrowbundle: use new context manager for silencing the ui
Summary

Same reasoning as the previous change. This affects a few tests
because of the hack from d7304434390f (changegroup: move message about
added changes to transaction summary, 2019-09-08).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jun 18 2021, 7:57 PM
pulkit accepted this revision.Jun 21 2021, 3:06 AM
This revision is now accepted and ready to land.Jun 21 2021, 3:06 AM

Revision Contents
Changeset List

Diff 28643

hgext/narrow/narrowbundle2.py

del op._widen_bundle del op._widen_bundle
vfs = repo.vfs vfs = repo.vfs
ui.note(_(b"adding branch\n")) ui.note(_(b"adding branch\n"))
f = vfs.open(chgrpfile, b"rb") f = vfs.open(chgrpfile, b"rb")
try: try:
gen = exchange.readbundle(ui, f, chgrpfile, vfs) gen = exchange.readbundle(ui, f, chgrpfile, vfs)
# silence internal shuffling chatter # silence internal shuffling chatter
override = {(b'ui', b'quiet'): True} maybe_silent = (
if ui.verbose: ui.silent() if not ui.verbose else util.nullcontextmanager()
override = {} )
with ui.configoverride(override): with maybe_silent:
if isinstance(gen, bundle2.unbundle20): if isinstance(gen, bundle2.unbundle20):
with repo.transaction(b'strip') as tr: with repo.transaction(b'strip') as tr:
bundle2.processbundle(repo, gen, lambda: tr) bundle2.processbundle(repo, gen, lambda: tr)
else: else:
gen.apply( gen.apply(
repo, b'strip', b'bundle:' + vfs.join(chgrpfile), True repo, b'strip', b'bundle:' + vfs.join(chgrpfile), True
) )
finally: finally:

tests/test-narrow-patterns.t

$ hg tracked --removeexclude dir1/dirA $ hg tracked --removeexclude dir1/dirA
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 9 changesets with 6 changes to 6 files added 9 changesets with 6 changes to 10 files
$ hg tracked $ hg tracked
I path:dir1 I path:dir1
I path:dir2 I path:dir2
X path:dir1/dirB X path:dir1/dirB
X path:dir2/dirA X path:dir2/dirA
X path:dir2/dirB X path:dir2/dirB
$ find * | sort $ find * | sort
dir1 dir1
deleting data/dir1/dirA/bar.i (reporevlogstore !) deleting data/dir1/dirA/bar.i (reporevlogstore !)
deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !) deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !)
deleting data/dir1/dirA/bar/index (reposimplestore !) deleting data/dir1/dirA/bar/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 11 changesets with 7 changes to 7 files added 11 changesets with 7 changes to 12 files
$ hg tracked $ hg tracked
I path:dir1 I path:dir1
I path:dir2 I path:dir2
X path:dir1/dirA/bar X path:dir1/dirA/bar
X path:dir1/dirB X path:dir1/dirB
X path:dir2/dirA X path:dir2/dirA
$ find * | sort $ find * | sort
dir1 dir1
deleting data/dir1/dirA/foo.i (reporevlogstore !) deleting data/dir1/dirA/foo.i (reporevlogstore !)
deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !) deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !)
deleting data/dir1/dirA/foo/index (reposimplestore !) deleting data/dir1/dirA/foo/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 13 changesets with 8 changes to 8 files added 13 changesets with 8 changes to 14 files
$ hg tracked $ hg tracked
I path:dir1 I path:dir1
I path:dir2 I path:dir2
X path:dir1/dirA X path:dir1/dirA
X path:dir1/dirA/bar X path:dir1/dirA/bar
X path:dir1/dirB X path:dir1/dirB
$ find * | sort $ find * | sort
dir1 dir1
$ hg tracked --removeexclude dir1/dirA $ hg tracked --removeexclude dir1/dirA
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 13 changesets with 9 changes to 9 files added 13 changesets with 9 changes to 17 files
$ hg tracked $ hg tracked
I path:dir1 I path:dir1
I path:dir2 I path:dir2
X path:dir1/dirA/bar X path:dir1/dirA/bar
X path:dir1/dirB X path:dir1/dirB
$ find * | sort $ find * | sort
dir1 dir1
dir1/bar dir1/bar
dir1/dirA/foo dir1/dirA/foo
$ hg tracked --addinclude dir1 $ hg tracked --addinclude dir1
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 10 changesets with 6 changes to 6 files added 10 changesets with 6 changes to 8 files
$ find * | sort $ find * | sort
dir1 dir1
dir1/bar dir1/bar
dir1/dirA dir1/dirA
dir1/dirA/bar dir1/dirA/bar
dir1/dirA/foo dir1/dirA/foo
dir1/dirB dir1/dirB
dir1/dirB/bar dir1/dirB/bar

tests/test-narrow-widen.t

$ hg tracked --addinclude widest/f $ hg tracked --addinclude widest/f
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 2 changes to 2 files added 3 changesets with 2 changes to 3 files
$ hg l $ hg l
@ ...2: add outside @ ...2: add outside
| |
o 1: add widest o 1: add widest
| |
o 0: add inside o 0: add inside
$ hg tracked $ hg tracked
$ hg tracked --addinclude wider $ hg tracked --addinclude wider
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 8 changesets with 7 changes to 3 files added 8 changesets with 7 changes to 5 files
$ hg tracked $ hg tracked
I path:inside I path:inside
I path:wider I path:wider
I path:widest/f I path:widest/f
$ hg update 'desc("add widest")' $ hg update 'desc("add widest")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
widest widest
$ hg tracked --addinclude d1 $ hg tracked --addinclude d1
comparing with ssh://user@dummy/upstream comparing with ssh://user@dummy/upstream
searching for changes searching for changes
saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 9 changesets with 5 changes to 5 files added 9 changesets with 5 changes to 9 files
$ hg tracked $ hg tracked
I path:d0 I path:d0
I path:d1 I path:d1
I path:d3 I path:d3
I path:d6 I path:d6
I path:d9 I path:d9
$ hg l $ hg l
@ ...8: add d10/f @ ...8: add d10/f

tests/test-narrow.t

Can widen the empty clone Can widen the empty clone
$ hg tracked --addinclude d0 $ hg tracked --addinclude d0
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
saved backup bundle to $TESTTMP/narrow-empty/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow-empty/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 1 changes to 1 files added 4 changesets with 1 changes to 1 files (+1 heads)
$ hg tracked $ hg tracked
I path:d0 I path:d0
$ hg files $ hg files
d0/f d0/f
$ find * $ find *
d0 d0
d0/f d0/f
$ cd .. $ cd ..