Rfaulk has submitted this change and it was merged.
Change subject: mod - use dulwich deps in revert.
......................................................................
mod - use dulwich deps in revert.
Change-Id: I888f4ae33e9894f17f0b144ee9610bd8d8e0faa3
---
M sartoris/sartoris.py
1 file changed, 5 insertions(+), 17 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index 405aefe..0e22d58 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -455,28 +455,16 @@
if tag == '':
raise SartorisError(message=exit_codes[13], exit_code=13)
- # TODO - use dulwich
- reset_cmd = 'git reset {0}'.format(tag)
- add_cmd = 'git add *'
- commit_cmd = 'git commit -m "revert to \'{0}\'"'.format(tag)
-
# Reset the HEAD
- proc = subprocess.Popen(reset_cmd.split(),
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
- proc.communicate()
+ self._dulwich_reset_to_tag(tag)
# Add changes to staging
- proc = subprocess.Popen(add_cmd.split(),
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
- proc.communicate()
+ self._dulwich_stage('*')
# Commit
- proc = subprocess.Popen(commit_cmd.split(),
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
- proc.communicate()
+ author = '{0} <{1}>'.format(self.config['user.name'],
+ self.config['user.email'])
+ self._dulwich_commit(author)
# Sync to reset HEAD
self._sync(revert_tag, args.force)
--
To view, visit https://gerrit.wikimedia.org/r/86807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I888f4ae33e9894f17f0b144ee9610bd8d8e0faa3
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
