/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/commands.py

  • Committer: Jelmer Vernooij
  • Date: 2019-01-02 18:49:15 UTC
  • mto: This revision was merged to the branch mainline in revision 7235.
  • Revision ID: jelmer@jelmer.uk-20190102184915-0da9k4jk49kql994
Fix import for git-objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commands.py
194
194
        from .object_store import (
195
195
            get_object_store,
196
196
            )
197
 
        from . import gettext
 
197
        from ..i18n import gettext
198
198
        controldir, _ = ControlDir.open_containing(directory)
199
199
        repo = controldir.find_repository()
200
200
        object_store = get_object_store(repo)
265
265
        :param f: Patch file to read.
266
266
        :param signoff: Add Signed-Off-By flag.
267
267
        """
268
 
        from . import gettext
 
268
        from ..i18n import gettext
269
269
        from ..errors import BzrCommandError
270
270
        from dulwich.patch import git_am_patch_split
271
271
        import subprocess