kallithea Changeset - 5deb16cd2802

Changeset - 5deb16cd2802

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-12-08 00:57:18
marcin@python-works.com

fixes #668 cherry picking of changeset should also work now on picking single changesets, and the ones from top

2 files changed with 7 insertions and 2 deletions:

rhodecode/model/pull_request.py

rhodecode/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

rhodecode/model/pull_request.py

➞

Show inline comments

@@ @@ -167,24 +167,30 @@ class PullRequestModel(BaseModel): @@
                 org_repo._repo.lookup(other_ref[1]),
+            ]
             obj = findcommonoutgoing(org_repo._repo,
                         localrepo.locallegacypeer(other_repo._repo.local()),
                         revs,
                         force=True)
             revs = obj.missing
             for cs in map(binascii.hexlify, revs):
                 _cs = org_repo.get_changeset(cs)
                 changesets.append(_cs)
             # in case we have revisions filter out the ones not in given range
             if org_ref[0] == 'rev' and other_ref[0] == 'rev':
                 revs = [x.raw_id for x in changesets]
                 start = org_ref[1]
                 stop = other_ref[1]
                 changesets = changesets[revs.index(start):revs.index(stop) + 1]
         else:
             #no remote compare do it on the same repository
             if alias == 'hg':
                 _revset_predicates = {
                         'branch': 'branch',
                         'book': 'bookmark',
                         'tag': 'tag',
                         'rev': 'id',
+                    }
                 revs = [
                     "ancestors(%s('%s')) and not ancestors(%s('%s'))" % (
@@ @@ -267,14 +273,13 @@ class PullRequestModel(BaseModel): @@
         org_repo_scm = org_repo.scm_instance
         other_repo_scm = other_repo.scm_instance
         alias = org_repo.scm_instance.alias
         discovery_data = [None, None, None]
         if alias == 'hg':
             discovery_data = self._get_discovery(org_repo_scm, org_ref,
                                                other_repo_scm, other_ref)
         cs_ranges = self._get_changesets(alias,
                                          org_repo_scm, org_ref,
                                          other_repo_scm, other_ref,
                                          discovery_data)
         return cs_ranges, discovery_data

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -158,25 +158,25 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
+                            }
+                        }
                         if(YUD.get('open_new_pr')){
                           if(checked_checkboxes.length>0){
                             // modify open pull request to show we have selected cs
                             YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];
                           }else{
                             YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];
+                          }
+                        }
-                        if(checked_checkboxes.length>1){
+                        if(checked_checkboxes.length>0){
                         	var rev_end = checked_checkboxes[0].name;
                         	var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
                         	// now select all checkboxes in the middle.
                         	var checked = false;
                         	for (var i=0; i<checkboxes.length; i++){
                         		var cb = checkboxes[i];
                         		var rev = cb.name;
                         		if (rev == rev_end){
                         			checked = true;
+                        		}

0 comments (0 inline, 0 general)