You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@allura.apache.org by Igor Bondarenko <je...@gmail.com> on 2015/07/01 16:24:56 UTC
[allura:tickets] #7894 Don't update merge request timestamps incorrectly
- **status**: review --> in-progress
- **Comment**:
I'm getting errors like this from the task
~~~~~
Traceback (most recent call last):
File "/home/ibondarenko/ibondarenko-1154/forge/Allura/allura/model/monq_model.py", line 260, in __call__
self.result = func(*self.args, **self.kwargs)
File "/home/ibondarenko/ibondarenko-1154/forge/Allura/allura/tasks/repo_tasks.py", line 174, in can_merge
mr.set_can_merge_cache(result)
File "/home/ibondarenko/ibondarenko-1154/forge/Allura/allura/model/repository.py", line 854, in set_can_merge_cache
with utils.skip_mod_date(self):
File "/usr/lib64/python2.7/contextlib.py", line 17, in __enter__
return self.gen.next()
File "/home/ibondarenko/ibondarenko-1154/forge/Allura/allura/lib/utils.py", line 623, in skip_mod_date
skip_mod_date = getattr(session(model_cls)._get(), 'skip_mod_date', False)
AttributeError: 'ODMSession' object has no attribute '_get'
~~~~~
Also, do we really need `with skip_mod_date` inside both `can_merge` task and `set_can_merge_cache`. It seems to me that skipping it just in `set_can_merge_cache` should be sufficient. Or `repo.can_merge` also modifies merge request objects somehow?
---
** [tickets:#7894] Don't update merge request timestamps incorrectly**
**Status:** in-progress
**Milestone:** unreleased
**Labels:** merge-requests sf-2 sf-current
**Created:** Tue Jun 09, 2015 08:44 PM UTC by Dave Brondsema
**Last Updated:** Mon Jun 29, 2015 08:31 PM UTC
**Owner:** Heith Seewald
Merge request's "updated" timestamp changes when you view it and it calculates if a one-click merge is possible. That shouldn't happen. Make sure no other operations incorrectly update the timestamp either.
---
Sent from forge-allura.apache.org because dev@allura.apache.org is subscribed to https://forge-allura.apache.org/p/allura/tickets/
To unsubscribe from further messages, a project admin can change settings at https://forge-allura.apache.org/p/allura/admin/tickets/options. Or, if this is a mailing list, you can unsubscribe from the mailing list.