X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/1008fbce6fb0e9cfa0844303be14744d95f31c37..e4f41f5d393b5f1e83a39a42a5f204efb6ef7ea6:/stgit/git.py diff --git a/stgit/git.py b/stgit/git.py index 3a999e4..9d8cdf0 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -94,7 +94,6 @@ def get_conflicts(): def _input(cmd, file_desc): p = popen2.Popen3(cmd) for line in file_desc: - print line p.tochild.write(line) p.tochild.close() if p.wait(): @@ -450,7 +449,7 @@ def switch(tree_id): for fs in to_delete: os.remove(fs[1]) -def fetch(location, head = None, tag = None): +def pull(location, head = None, tag = None): """Fetch changes from the remote repository. At the moment, just use the 'git fetch' scripts """ @@ -460,11 +459,9 @@ def fetch(location, head = None, tag = None): elif tag: args += ['tag', tag] - if __run('git fetch', args) != 0: + if __run('git pull', args) != 0: raise GitException, 'Failed "git fetch %s"' % location - return read_string(os.path.join(base_dir, 'FETCH_HEAD')) - def apply_patch(filename = None): """Apply a patch onto the current index. There must not be any local changes in the tree, otherwise the command fails