Rfaulk has submitted this change and it was merged.
Change subject: add - method _dulwich_reset_to_tag.
......................................................................
add - method _dulwich_reset_to_tag.
Change-Id: Iac7240e72ce46fa5cbed9b001170b28e0c95ccfc
---
M sartoris/config.py
M sartoris/sartoris.py
2 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/sartoris/config.py b/sartoris/config.py
index c99580f..410277c 100644
--- a/sartoris/config.py
+++ b/sartoris/config.py
@@ -37,6 +37,7 @@
11: 'Could not find any deploys. Exiting',
12: 'Tagging failed. Exiting',
13: 'Revert tag not found. Exiting',
+ 14: 'Commit failed, does not match HEAD. Exiting.',
19: 'Missing system configuration item "deploy.client-path". Exiting.',
20: 'Cannot find top level directory for the git repository. Exiting.',
21: 'Missing system configuration item "hook-dir". Exiting.',
diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index 02f4ed1..405aefe 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -207,6 +207,17 @@
_repo.object_store.add_object(tag_obj)
_repo['refs/tags/' + tag] = tag_obj.id
+ def _dulwich_reset_to_tag(self, tag):
+ """
+ Resets the HEAD to the commit
+ """
+ _repo = Repo(self.config['top_dir'])
+
+ try:
+ _repo.refs['HEAD'] = _repo['refs/tags/' + tag].id
+ except AttributeError:
+ raise SartorisError(message=exit_codes[7], exit_code=7)
+
def _dulwich_stage(self, file):
"""
Stage modified files in the repo
--
To view, visit https://gerrit.wikimedia.org/r/86370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac7240e72ce46fa5cbed9b001170b28e0c95ccfc
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <[email protected]>
Gerrit-Reviewer: Rfaulk <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
