# HG changeset patch # User Dan Villiom Podlaski Christiansen <danchr@gmail.com> # Date 1625816875 -7200 # Fri Jul 09 09:47:55 2021 +0200 # Node ID a55860808756e254bef1923ec9cb6f03ca6d7213 # Parent c8c091667e0cab45c08dd31e224408e5eaf63a1d export: use correct nomenclature Generally speaking, Mercurial refers to commits as “changesetsâ€. And mention how many we're processing while at it. diff --git a/hggit/git_handler.py b/hggit/git_handler.py --- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -527,7 +527,7 @@ # CHANGESET CONVERSION METHODS def export_git_objects(self): - self.ui.note(_(b"finding hg commits to export\n")) + self.ui.note(_(b"finding unexported changesets\n")) repo = self.repo clnode = repo.changelog.node @@ -536,7 +536,7 @@ self._map_hg) todo_total = len(repo) - len(self._map_hg) - topic = b'find commits to export' + topic = b'searching' unit = b'commits' with repo.ui.makeprogress(topic, unit, todo_total) as progress: @@ -551,7 +551,7 @@ if not total: return - self.ui.note(_(b"exporting hg objects to git\n")) + self.ui.note(_(b"exporting %d changesets\n") % total) # By only exporting deltas, the assertion is that all previous objects # for all other changesets are already present in the Git repository. diff --git a/tests/test-git-tags.t b/tests/test-git-tags.t --- a/tests/test-git-tags.t +++ b/tests/test-git-tags.t @@ -81,7 +81,7 @@ $ hg tag --git alpha --debug -r 0 adding git tag alpha - finding hg commits to export + finding unexported changesets saving git map to $TESTTMP/hgrepo/.hg/git-mapfile $ hg log --graph @ changeset: 1:7fe02317c63d @@ -196,8 +196,8 @@ $ hg tag --git gamma --debug -r tip adding git tag gamma - finding hg commits to export - exporting hg objects to git + finding unexported changesets + exporting 1 changesets converting revision dfeaa5393d25ea2c143fff73f448bfeab0b90ed6 saving git map to $TESTTMP/hgrepo/.hg/git-mapfile $ hg push diff --git a/tests/test-push-detached.t b/tests/test-push-detached.t --- a/tests/test-push-detached.t +++ b/tests/test-push-detached.t @@ -57,8 +57,8 @@ $ hg push -v --config hggit.usephases=yes pushing to $TESTTMP/gitrepo - finding hg commits to export - exporting hg objects to git + finding unexported changesets + exporting 1 changesets converting revision 47580592d3d6492421a1e6cebc5c2d701a2e858b searching for changes 1 commits found diff --git a/tests/test-serve-dulwich.t b/tests/test-serve-dulwich.t --- a/tests/test-serve-dulwich.t +++ b/tests/test-serve-dulwich.t @@ -64,7 +64,7 @@ $ fn_hg_commit -A -m baz $ hg push \r (no-eol) (esc) - find commits to export commits 1/1 152c456b0da423597ed2 [>]\r (no-eol) (esc) + searching commits 1/1 152c456b0da423597ed2 [=============>]\r (no-eol) (esc) \r (no-eol) (esc) \r (no-eol) (esc) exporting 1/1 [==========================================>]\r (no-eol) (esc)