From bd64641400b7eb6af07ea7a5375f7530e9298220 Mon Sep 17 00:00:00 2001
From: Stephen Fromm <sfromm@gmail.com>
Date: Wed, 6 Mar 2013 10:23:35 -0800
Subject: [PATCH] Update subversion module to work better with check mode
Adds needs_update() method which will inspect the checkout for the
current revision and then the HEAD. If the local check out is behind
HEAD, this will report changed=True and supply the revision numbers.
---
library/subversion | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/library/subversion b/library/subversion
index e83341c8c08..201c4d31e77 100644
--- a/library/subversion
+++ b/library/subversion
@@ -120,6 +120,17 @@ class Subversion(object):
# Has local mods if more than 0 modifed revisioned files.
return len(filter(regex.match, lines)) > 0
+ def needs_update(self):
+ curr, url = self.get_revision()
+ out2 = '\n'.join(self._exec("info -r HEAD '%s'" % self.dest))
+ head = re.search(r'^Revision:.*$', out2, re.MULTILINE).group(0)
+ rev1 = int(curr.split(':')[1].strip())
+ rev2 = int(head.split(':')[1].strip())
+ change = False
+ if rev1 < rev2:
+ change = True
+ return change, curr, head
+
# ===========================================
@@ -156,7 +167,8 @@ def main():
# positives. Need to switch before revert to ensure we are reverting to
# correct repo.
if module.check_mode:
- module.exit_json(changed=True)
+ check, before, after = svn.needs_update()
+ module.exit_json(changed=check, before=before, after=after)
before = svn.get_revision()
local_mods = svn.has_local_mods()
svn.switch()