Mercurial > cobalt-mk2 / file comparison
comparison: cobalt.py
cobalt.py
- changeset 33
- 2dcf980521a9
- parent 32
- 88899b43810b
- child 34
- 1a1ee9e8bda6
equal
deleted
inserted
replaced
| 32:88899b43810b | 33:2dcf980521a9 |
|---|---|
| 208 | 208 |
| 209 ' Retrieves hg incoming from zandronum repository ' | 209 ' Retrieves hg incoming from zandronum repository ' |
| 210 def get_incoming_data (zanrepo, rev, template): | 210 def get_incoming_data (zanrepo, rev, template): |
| 211 try: | 211 try: |
| 212 if rev != '': | 212 if rev != '': |
| 213 return zanrepo.hg_command ('incoming', '../zanstablecopy', '--quiet', '-r', rev, '--template', template) | 213 return zanrepo.hg_command ('incoming', '--quiet', '-r', rev, '--template', template) |
| 214 else: | 214 else: |
| 215 return zanrepo.hg_command ('incoming', '../zanstablecopy', '--quiet', '--template', template) | 215 return zanrepo.hg_command ('incoming', '--quiet', '--template', template) |
| 216 #fi | 216 #fi |
| 217 except: | 217 except: |
| 218 pass | 218 pass |
| 219 return "" | 219 return "" |
| 220 #enddef | 220 #enddef |
| 416 | 416 |
| 417 commits_to_pull.append (commit_node) | 417 commits_to_pull.append (commit_node) |
| 418 #done | 418 #done |
| 419 | 419 |
| 420 if len (commits_to_pull) > 0: | 420 if len (commits_to_pull) > 0: |
| 421 pull_args = ['pull', '../zanstablecopy'] | 421 pull_args = ['pull'] |
| 422 | 422 |
| 423 for commit in commits_to_pull: | 423 for commit in commits_to_pull: |
| 424 pull_args.append ('-r'); | 424 pull_args.append ('-r'); |
| 425 pull_args.append (commit); | 425 pull_args.append (commit); |
| 426 #done | 426 #done |
