Commit graph

69 commits

Author SHA1 Message Date
Toshio Kuratomi
7e79c59d38 to_text, to_bytes, and to_native now have surrogate_or_strict error handler (#4630)
On python3, we want to use the surrogateescape error handler if
available for filesystem paths and the like.  On python2, have to use
strict in these circumstances.  Use the new error strategy for to_text,
to_bytes, and to_native that allows this.
2016-09-01 04:19:15 -07:00
Anton Onufriev
2ca16dfaad Remove colors from git-branch output for correct local search (#4545)
We got an error while switching on existent local branch
because git module can not find branch in function get_branches
if we have color.branch=always in git config.
2016-08-30 11:53:42 +02:00
Michael Scherer
5310bab12f Port the module to run on python 3 (#4496)
One of the usual issue is that run_command return bytes,
so we have to adapt the string to either be bytes too,
or convert to string.

This result into that kind of traceback:

    Traceback (most recent call last):
      File \"/tmp/ansible_ej32yu2w/ansible_module_git.py\", line 1009, in <module>
        main()
      File \"/tmp/ansible_ej32yu2w/ansible_module_git.py\", line 873, in main
        git_version_used = git_version(git_path, module)
      File \"/tmp/ansible_ej32yu2w/ansible_module_git.py\", line 788, in git_version
        rematch = re.search('git version (.*)$', out)
      File \"/usr/lib64/python3.5/re.py\", line 173, in search
        return _compile(pattern, flags).search(string)
    TypeError: cannot use a string pattern on a bytes-like object

Another issue is filter being a object instead of a list.
2016-08-29 09:00:53 -07:00
Robin Roth
9da4c42679 Clarify that refspec is needed to checkout a git hash (#4564)
fixes #1531
2016-08-27 16:51:18 +02:00
jctanner
713863a37e git: add a umask parameter (#4473)
Sources #10504
Fixes #10279
2016-08-19 14:59:10 -04:00
jctanner
45c1ae0ac1 git: set the file:// protocol if needed and refactor HEAD parser (#4434)
* make HEAD parsing more robust
* Fail the module for any splitter errors
* fix combining depth and version on filepath urls by prepending file://

Addresses #907
2016-08-15 19:54:44 -04:00
Timmo Verlaan
2942b383c4 [git] Determine branch name more reliable (#907)
* Made some changes to determine branch name more reliable (it may contain slashes now).

* Determination of branch name more reliable, as per comment on PR #907
2016-08-15 14:54:11 -04:00
jctanner
a0f4c9ee45 git: Use a local copy of unfrackpath to avoid using ansible.lib (#4426)
Fixes #4425
2016-08-15 12:22:55 -04:00
jctanner
0445697a8b git: If force=yes, apply --force to submodule updates to overwrite local changes (#4415)
Fixes #238
2016-08-12 18:06:02 -04:00
Rob Cutmore
0acbbdf0c4 Git: Determine if remote URL is being changed (#4243)
* Git: Determine if remote URL is being changed

Ansible reported there were no changes when only the remote URL for a
repo was changed. This properly tracks and reports when the remote URL
for a repo changes.

Fixes #4006

* Fix handling of local repo paths

* Git: Use newer method for fetching remote URL

* Git: use ls-remote to fetch remote URL

Using ls-remote to fetch remote URL is supported in earlier versions
of Git compared to using remote command.

* Maintain previous behavior for older Git versions

Previously whether or not the remote URL changed was not factored
into command's changed status. Git versions prior to 1.7.5 lack the
functionality used for fetching a repo's remote URL so these versions
will update the remote URL without affecting the changed status.
2016-08-12 09:53:06 -04:00
jctanner
37ea0b0b1f git: save changed submodules in check and non-check mode (#4392) 2016-08-11 14:14:20 -04:00
Dag Wieers
f5f1ec65e4 Add diff mode support to git module (#3364)
* Add diffmode support to git module

This patch adds missing diffmode support to the git module.

* Remodel get_diff() and calls to it

As proposed by @abadger

* Ensure we fetch the required object before performing a diff

Also we handle the return code ourselves, so don't leave this up to run_command().
2016-08-11 13:27:32 -04:00
Robin Roth
f6fae82ec2 Fix git shallow update (#3912)
* remove unused variables

* fetch branch name instead of HEAD

fix #3782, which was introduced by f1bacc1d3f

* disable git depth option for old git versions

fixes #3782
git support for `--depth` did not fully work in old git versions (before 1.8.2)
fall back to full clones/fetches on those versions

* raise required git version to 1.9.1 for depth option

* use correct depth argument in switch_version
2016-07-05 14:57:38 -04:00
Toshio Kuratomi
2ecf9987bf Add comment 2016-06-21 09:25:55 -07:00
Marius Gedminas
0cd9497748 git: fix change testing when version is HEAD (#3025)
When `version` is not specified, it defaults to "HEAD".  "HEAD" is not a
remote tag, and it's not listed in the output of get_branches(), so we'd
keep repo_updated at the default value (None) and then return early with
changed=True in --check mode, even when before == after.

Fixes #3024.
2016-06-21 09:22:53 -07:00
Toshio Kuratomi
138430f116 Revert "Fix git shallow update (#3794)" -- Broke integration tests:
https://app.shippable.com/runs/57599a7897ae890c00c2898d

This reverts commit c26eb1217f.
2016-06-09 14:48:51 -07:00
Robin Roth
c26eb1217f Fix git shallow update (#3794)
* remove unused variables

* fetch branch name instead of HEAD

fix #3782, which was introduced by f1bacc1d3f

* disable git depth option for old git versions

fixes #3782
git support for `--depth` did not fully work in old git versions (before 1.8.2)
fall back to full clones/fetches on those versions
2016-06-09 08:51:02 -07:00
Michael Scherer
a64d72d7bc Improve error reporting when git binary fail (#3266)
Showing stderr or stdout is a great help to understand
when something go south.
2016-05-20 09:45:53 -07:00
Michael Scherer
94ec38cda8 Add a better solution for the ssh_known_hosts issue
Fix https://github.com/ansible/ansible/issues/10172 too
2016-04-28 20:27:18 +02:00
Toshio Kuratomi
3cbca32e73 Merge pull request #3507 from resmo/fix/git-porcelain-status
git: fix status to use porcelain, ignore user configuration
2016-04-21 08:51:37 -07:00
Robin Roth
2256ae0793 fix git switch branches in combination with depth on old git versions (#3492)
* fix git switch branches in combination with depth

* the old implementation is correct, but relies on git working correctly
  (as only newer versions do)
* with some older git version (e.g. 1.8.3), git fetch remote branch does
  not work, if the branch does not yet exist locally
* this patch works around that without explicitly checking the git version
* future refactoring is needed to reduce the number of fetches to a
  minimum; but this patch makes the code "correct"

* add git version requirements to doc

* replace set-branches with git 1.7.1 compatible version
2016-04-21 07:40:54 -07:00
Rene Moser
1f92e77650 git: fix status to use porcelain, ignore user configuration
From the git status doc:

    --porcelain

        Give the output in an easy-to-parse format for scripts. This is similar to the short output, but will remain stable across Git versions and regardless of user configuration. See below for details.

User configuration can break the git module from working as expected.
2016-04-21 10:41:03 +02:00
Toshio Kuratomi
98322a777f Merge pull request #3466 from robinro/git-full-clone-with-hash
git: fall back to full clone if version is hash
2016-04-19 07:42:06 -07:00
Robin Roth
b67d15f385 fall back to full clone if version is hash
if version is not a branch or tag (i.e. a hash), we need a full checkout to be able to switch to it
2016-04-19 13:45:43 +02:00
Robin Roth
c398eb5399 with depth only fetch actual version
* don't use refs/heads/branchname for branches
* for tags it's needed thou
* fixes #3456
2016-04-19 12:47:36 +02:00
Kyle Dyroff
2b003a2773 Log git error stdout/stderr to fail_json (#3022) 2016-04-19 08:56:48 +02:00
Robin Roth
f1bacc1d3f make git updates respect depth (#3254)
* make git updates respect depth

until now `fetch` gets all tags and heads at full depth, this change
* uses `depth` argument for `fetch`
* only get the specified `version` in `fetch`

* fixes #14954

* treat combination of refspec and depth correctly

* be more conservative for non-depth fetch
2016-04-14 09:40:23 -07:00
Toshio Kuratomi
ee90762388 git still needs to have abspath applied to dest 2016-04-06 14:03:17 -07:00
Michael Scherer
870311748f Use type='path' for path arguments for git module 2016-03-29 08:50:09 +02:00
Brian Coca
7461feb737 Merge pull request #934 from jbgo/git-depth-switch-version
git: set remote branch before switching versions when using depth arg
2016-03-11 10:37:12 -05:00
Toshio Kuratomi
2e46c086ae Since we screenscrape output from git to tell us information we need to use the C locale when running commands.
Using another locale would mean that we get information that may have
the strings that we are looking for.

Fixes #2449
Fixes #2462
2016-02-07 12:48:41 -08:00
Jan Duzinkiewicz
b77bf7a9aa forcing git fetch if sha1 are equal between repos but branch exists only at remote
Add an explanatory comment to the code
2016-01-11 17:09:51 -08:00
Dmitry Labutin
0f21a9316d Github uses both HTTP and HTTPS protocols 2015-12-29 09:58:38 +03:00
Chris Streeter
13343a8888 Fix name of ssh_opts arg 2015-11-19 14:00:35 -08:00
Andrew Widdersheim
e36e1339e8 Fix detached head detection in is_not_a_branch()
Detached head detection seems to have broken somewhere a long the way
because git decided to change how that situation looks when doing a 'git
branch -a' which is performed by get_branches().

This is how git 1.7.1 displays this situation (which works):

shell> git branch -a
* (no branch)
  master

This is the output from git 1.8.3.1 (which does not work):

shell> git branch -a
* (detached from e132711)
  master

It looks like this same wording is used in the most recent version of
git (2.6.1 as of writing this).
2015-10-06 15:37:45 -04:00
Brian Coca
57c0b86db4 Merge pull request #721 from jinowolski/devel
update git remote url before ls-remote
2015-09-04 12:46:51 -04:00
Brian Coca
2d3e93e558 added doc to note that git the command line tool is required for this moduel to function
fixes http://github.com/ansible/ansible/issues/11358
2015-06-27 00:36:55 -04:00
Greg DeKoenigsberg
2a5f0bde87 Proper author info for all remaining modules 2015-06-15 15:53:30 -04:00
Brian Coca
74e40b5fe1 fixed doc issue with git 2015-06-10 12:42:15 -04:00
Dionysis Grigoropoulos
a9e68692b7
git: Add option to verify GPG signature of commit 2015-06-09 01:51:40 +03:00
Jordan Bach
e4193da47e git: set remote branch before switching versions when using depth argument 2015-03-12 17:06:44 -05:00
Jan Inowolski
d7efb2635c update git remote url before ls-remote
related to #8177
2015-01-29 12:40:24 +01:00
Toshio Kuratomi
256ce9dd4d Change the git force parameter to default to no as a safety change.
Fixes #306
2015-01-28 16:26:44 -08:00
Toshio Kuratomi
8f6ae92cf8 git fetch --tags overwrites normal fetching with git < 1.8.x so do a normal fetch followed by using the refspec format for fetching tags 2014-12-22 15:08:25 -08:00
Toshio Kuratomi
8a03af6608 Fix typo in git refspec code. Change lists to tuples 2014-12-22 12:11:49 -08:00
Toshio Kuratomi
2cbe13a21d Merge pull request #371 from rohanpm/git_refspec
git: add 'refspec' argument
2014-12-22 11:31:12 -08:00
Toshio Kuratomi
ee324fc3ad Make documentation clear about update=no vs clone=no 2014-12-19 08:55:41 -08:00
Rohan McGovern
cf85047284 git: add 'refspec' argument
This argument may be used to fetch additional refs beyond the default
refs/heads/* and refs/tags/*.  Checking out GitHub pull requests or Gerrit
patch sets are two examples where this is useful.

Without this, specifying version=<sha1> with a SHA1 unreachable from any
tag or branch can't work.
2014-12-19 13:13:08 +10:00
Rohan McGovern
c242de1a39 git: clean up "fetch" method
De-duplicate repetitive code checking the exit code.

Include the stdout/stderr of the failed process in all cases.

Remove the returned values because no caller uses them.

Combine git commands where possible.  There is no need to fetch branches
and tags as two separate operations.
2014-12-19 13:13:08 +10:00
Toshio Kuratomi
dfe7f6c6d6 Probably would make clone a 1.9 feature rather than 1.8.3 2014-12-17 13:45:49 -08:00