aboutsummaryrefslogtreecommitdiffhomepage
path: root/git-import-dsc
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2008-09-22 19:06:36 +0200
committerGuido Guenther <agx@sigxcpu.org>2008-09-22 19:06:36 +0200
commit624bdc9090c7402963744684a7d6c0ac0af14927 (patch)
tree497505be411ce9eeefa856b965a729ed4764ce31 /git-import-dsc
parent3931f708113532788572e0b2590426e31a3b948c (diff)
move replace_source_tree into GitRepository
Diffstat (limited to 'git-import-dsc')
-rwxr-xr-xgit-import-dsc6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-import-dsc b/git-import-dsc
index a215f5d2..e1865d51 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -26,7 +26,7 @@ import pipes
from email.Utils import parseaddr
import gbp.command_wrappers as gbpc
from gbp.deb_utils import debian_version_chars, parse_changelog, unpack_orig, parse_dsc, DscFile, tar_toplevel
-from gbp.git_utils import build_tag, GitRepository, GitRepositoryError, replace_source_tree, rfc822_date_to_git
+from gbp.git_utils import build_tag, GitRepository, GitRepositoryError, rfc822_date_to_git
from gbp.config import GbpOptionParser
from gbp.errors import GbpError
@@ -203,14 +203,14 @@ def main(argv):
# FIXME: this is what import-orig does - merge
if not src.native:
gbpc.GitCheckoutBranch(options.upstream_branch)()
- replace_source_tree(repo, unpack_dir, options.filters, verbose=True)
+ repo.replace_tree(unpack_dir, options.filters, verbose=True)
gbpc.GitCommitAll()(msg="Imported %s" % msg)
gitTag(tag, msg=msg)
if options.pristine_tar and not src.native:
gbpc.PristineTar().commit(src.tgz, options.upstream_branch)
if not src.native:
gbpc.GitCheckoutBranch(options.debian_branch)()
- replace_source_tree(repo, unpack_dir, options.filters)
+ repo.replace_tree(unpack_dir, options.filters)
apply_debian_patch(src, dirs, options)
except gbpc.CommandExecFailed:
os.chdir(dirs['top'])